[evolution] Updating PunjabiTranslation by A S Alam



commit caee31bac657c69b3dd8ec2d9ebfebd4510a6608
Author: A S Alam <aalam users sf net>
Date:   Thu Feb 4 08:49:00 2010 +0530

    Updating PunjabiTranslation by A S Alam

 po/pa.po |22891 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 12417 insertions(+), 10474 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 133d1ad..5fd3951 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,16 +2,16 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:631
+#: ../shell/main.c:512
 # Punjab Linux Technology <punjablinux netscape net>, 2004.
-# A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009.
+# A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009, 2010.
 # Amanpreet Singh Alam <aalam users sf net>, 2008, 2009.
 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-08-28 13:23+0000\n"
-"PO-Revision-Date: 2009-09-13 11:35+0530\n"
+"POT-Creation-Date: 2010-02-02 18:12+0000\n"
+"PO-Revision-Date: 2010-02-04 08:47+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
@@ -20,314 +20,6 @@ msgstr ""
 "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:178
-msgid "evolution address book"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "ਨਵਾ� ਸੰਪਰ�"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�"
-
-#: ../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] "1ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "��ਲ�ਹ�"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "ਸੰਪਰ� ਲਿਸ�: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "ਸੰਪਰ�:  "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਮਿੰਨ�-�ਾਰਡ"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "�ਸ ਲ� �ਲਾਰਮ ਹ�।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "�ੱ� ਮ��ਿੰ� ਹ�।"
-
-#: ../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:277
-msgid "Calendar Event: It has no summary."
-msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: ��� �ਾਣ�ਾਰ� ਨਹ�� ਹ�।"
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "��ਲੰਡਰ ਵ��ਣ ��ਨਾ"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "ਫ��ਸ ਲਵ�"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "ਨਵ��� ਸਾਰਾ ਦਿਨ ��ਨਾਵਾ�"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "ਨਵ�� ਮ��ਿੰ�"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "�ੱ� 'ਤ� �ਾ�"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "ਮਿਤ� 'ਤ� �ਾ�"
-
-#: ../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 "ਮ���ਦਾ ਸਮ�� ਸ�ਮਾ ਵ��ਣ �ਤ� ��ਣਨ ਲ� �ੱ� ��ਬਲ"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "�ਸ ਵਿੱ� %d ��ਨਾ ਹ�"
-msgstr[1] "�ਸ ਵਿੱ� %d ��ਨਾਵਾ� ਹਨ।"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "�ਸ ਵਿੱ� ��� ��ਨਾ ਨਹ�� ਹ�।"
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "�ੰਮ ਹਫਤਾ �ਲ�: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "ਦਿਨ �ਲ�: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "�ੰਮ ਹਫਤ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਦਿਨਾ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. 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: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:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../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: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"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. 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: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:782
-msgid "Gnome Calendar"
-msgstr "�ਨ�ਮ ��ਲੰਡਰ"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "��� ਪੱ��"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��� ਪੱ��"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "�ੰਪ ਬ�ਨ"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "ਹ�ਰ ��ਨਾਵਾ� ਵ��ਣ ਲ� �ਸ ਨ�ੰ ਦਬਾ�।"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "ਮਹ�ਨਾ �ਲ�: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "ਹਫਤਾ �ਲ�: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ਪ�ਪ�ੱਪ"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "ਪ�ਪ�ੱਪ �ੱ� �ਾ�ਲਡ"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ਸ�ਧ"
-
-#: ../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:169
-msgid "toggle"
-msgstr "ਤਬਦ�ਲ"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "ਸ�ੱਲ ਤਬਦ�ਲ"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "ਫ�ਲਾ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਫ�ਲਾ�"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ਸਮ���"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਸਮ���"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "��ਬਲ ਸ�ੱਲ"
-
-#: ../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:67
-msgid "click"
-msgstr "ਦਬਾ�"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "ਲ��ਬੱਧ"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "��ਲੰਡਰ: %s ਤ�� %s ਤੱ�"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਾ�"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "�ੰਬ� ਬ�ਨ"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "ਡਿਫਾਲ� ����ਵ��"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "ਪ�ਪ�ੱਪ ਮ�ਨ�"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -379,10 +71,6 @@ 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 only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -397,49 +85,40 @@ msgid "Delete address book '{0}'?"
 msgstr "�� �ਡਰ�ੱਸ-ਬ�ੱ� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�।"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ਨ�ੰ {1} ਸੰਭਾਲਣ ਲ� �ਲਤ�: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ।"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�ਣ ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "�ਰ�ੱਪਵਾ��਼ �ਡਰ�ੱਸ-ਬ�ੱ� ਨਿਰਮਾਣ:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ਸਰਵਰ ਤ�� ਸ��ਮਾ �ਾਣਾ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "ਸਰਵਰ ਵਰ�ਨ"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਸਰਵਰ ਨਾਲ ��� ਫ��ਰ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰ ਸ�ਦ� ਹਨ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਲਤ ਢੰ� ਨਾਲ ਬੰਦ ਹ� �� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "�ਿੱਤਰ, �� ਤ�ਸ�� ��ਣਿ� ਹ�, ਵੱਡਾ ਹ�। �� ਤ�ਸ�� �ਸ ਦਾ ��ਾਰ ਤਬਦਲ �ਰ�� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -448,46 +127,46 @@ msgstr ""
 "�ਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪ�ਰਾਣਾ ਵਰ�ਨ ਵਰਤ ਰਿਹਾ ਹ�, �� �ਿ �ਹ �ਾਰਵਾ� ਲ� ਸਹਾ�� ਨਹ�� ਹ� �ਾ� "
 "ਠ�� ਤਰਾ� ਸੰਰ�ਿਤ ਨਹ�� ਹ�, �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� ਨਾਲ ਮੱਦਦ ਲ� ਸੰਪਰ� �ਰ�।"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਸਰਵਰ ਲ� ��� ��� �ਧਾਰ ਨਹ�� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸਰਵਰ �ਪਲੱਬਧ ਨਹ�� ਹ� �ਾ� ਸਰਵਰ ਨਾ� �ਲਤ ਹ� �ਾ� ਤ�ਹਾਡਾ ਨ�ੱ�ਵਰ� ਬੰਦ ਹ� ਰਿਹਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "�ਹ ਸਰਵਰ LDAPv3 ਸ��ਮਾ �ਾਣ�ਾਰ� ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
 
 #  addressbook:load-error title
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "��� �ਰਨ ਵਿੱ� �ਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} ਸੰਭਾਲਣ ਲ� �ਸਫ਼ਲ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "�� ਤ�ਸ�� ਤਬਦ�ਲ��� ਸੰਭਾਲ��� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -495,7 +174,7 @@ msgstr ""
 "ਤ�ਸ�� �ਪਣ� �ੱ� ਸੰਪਰ� ਨ�ੰ �ੱ� �ਿਤਾਬ ਤ�� ਦ��� ਵਿੱ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ ਰਹ� ਹ�, ਪਰ �ਹ ਸਰ�ਤ �ੱਤ� ਸੰਭਵ "
 "ਨਹ�� ਹ�, �� ਤ�ਸ�� �ਸ ਦ� ਬ�ਾ� �ਸ ਦ� �ਾਪ� ਭ��ਣਾ �ਾਹ���?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -504,40 +183,40 @@ msgstr ""
 "ਤ�ਸ�� �ੱ� ਨਾ-ਸਹਾ�� �ਰ�ੱਪਵਾ�� ਸਰਵਰ ਨਾਲ ���ਨ �ਾ ਰਹ� ਹ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ ਨਾਲ ਸਮੱਸਿ� � "
 "ਸ�ਦ� ਹ�। �ੰ�� ਨਤ��ਿ�� ਲ� ਸਰਵਰ ਨ�ੰ ਸਹਾ�� ਵਰ�ਨ ਲ� �ੱਪ�ਰ�ਡ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ਤ�ਹਾਨ�ੰ �ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸੰਪਰ� ਹ�ਾ�ਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ਤ�ਸ�� �ਪਣ� ਸੰਪਰ� ਵਿੱ� ਤਬਦ�ਲ��� ��ਤ��� ਹਨ, �� ਤ�ਸ�� �ਹਨਾ� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ���?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਸੰਪਰ� {0} ਲ� �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ�ਦ� ਹਨ, �ਦ�� ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ� ਨਹ�� ਹ�ੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿਲ(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "ਰੱਦ �ਰ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "ਨਾ ਸੰਭਾਲ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "ਮ��-��ਾਰ(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "�ਹ �ੰ� ਹ� ਵਰਤ��(_U)"
 
@@ -554,1006 +233,395 @@ msgstr "�ਹ �ੰ� ਹ� ਵਰਤ��(_U)"
 #  mail:ask-session-password secondary
 #  mail:filter-load-error secondary
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "ਡਿਫਾਲ� ਸਮ�ਾਲ� �ਡਰ�ੱਸ:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ਡਰ�ੱਸ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "ਸੰਪਰ�(_o)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "ਸਰ��ਫਿ���"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#| msgid "Configure autocomplete here"
-msgid "Configure contacts and autocompletion here"
-msgstr "ਸੰਪਰ� �ਤ� ਸਵ�-ਪ�ਰਨ ਸੰਰ�ਨਾ �ੱਥ� ਦਿ��"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../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:5
-msgid "Evolution Address Book"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
-
-#: ../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:7
-msgid "Evolution Address Book address viewer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਡਰ�ੱਸ ਦਰਸ਼�"
-
-#: ../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:9
-msgid "Evolution Address Book component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� ਭਾ�"
-
-#: ../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:11
-msgid "Evolution folder settings configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��ਿੰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "�ਪਣ� S/MIME ਸਰ��ਫਿ��� �ਥ� ਰੱ��"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../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
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../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 "ਨਿੱ��"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "ਸੰਪਰ�(_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "ਨਵਾ� ਸੰਪਰ� ਬਣਾ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "ਸੰਪਰ� ਲਿਸ�(_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "ਨਵ�� ਸੰਪਰ� ਸ��� ਬਣਾ�"
-
-#: ../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:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�(_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਰੱ�ਣ ਵਿੱ� �ਸਫਲ।"
-
-#: ../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:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "�ਿਸਮ(_T):"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "�ਫਲਾ�ਨ �ਪਰ�ਸ਼ਨ ਲ� ਬ�ੱ� ਸਮੱ�ਰ� �ਾਪ� �ਰ�(_b)"
-
-#: ../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: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:1025
-msgid "Server Information"
-msgstr "ਸਰਵਰ �ਾਣ�ਾਰ�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "ਪ�ਰਮਾਣਿ�ਤਾ"
-
-#: ../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:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "��� �ਾਰ� ਹ�"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../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:1109
-msgid "Migrating..."
-msgstr "ਤਬਦ�ਲ ਹ� ਰਿਹਾ ਹ�..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "'%s' ਨ�ੰ ਤਬਦ�ਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ਸਰਵਰ"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਸੰਪਰ� ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ਮ�ਲਿੰ� ਸ��� ਸੰਪਰ� ਦਾ ਫਾਰਮ�� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦਾ ਫ�ਨ ਨੰਬਰ ਸੰਭਾਲਣਾ ਦਾ ਢੰ� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦ� ਪਾਲਮ ਸਿ�ਰ�ਨਾ��਼ ਤਬਦ�ਲ ਲਾ� ਤ� ਫਾ�ਲ਼ �ਾ�ਾ ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../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:455
-msgid "Rename Folder"
-msgstr "ਫ�ਲਡਰ ਨਾ� ਬਦਲ�"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ�ਦਾ"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�(_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "vCard ਵਾ�� ਸੰਭਾਲ�..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../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: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
-msgid "_Delete"
-msgstr "ਹ�ਾ�(_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../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)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "ਸੰਪਰ� ਸਰ�ਤ ��ਣ�ਾਰ�"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../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: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:500
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "ਪਾਸਵਰਡ ਭਰ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "ਸਵ�-ਪ�ਰਤ� ਲੰਬਾ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "ਮ��ੰਮਲ URI ਸ��� ਲ� EFolderList XML"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "ਮ��ੰਮਲ URI ਸ��� ਲ� EFolderList XML ਹ�।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ �ਾਰਡ �ਤ� ਸ��� �ਲ� �ਤ� ਦਿੱ� ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�, (ਪਿ�ਸਲ ਵਿੱ�)"
-"।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "�ਡਰ�ੱਸ ਨਾਲ ���-ਪ�ਰਾ ਨਾ� ਵ���"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "�ਲ� ਪ�ਨ ਵ��ਾ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "�ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸਵ� ਪ�ਰਨ �ਾਰਵਾ� ਨ�ੰ ਸ਼�ਰ� �ਰ�, �ੱ�ਰਾ� ਦ� �ਿਣਤ� ਹ�।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-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:92
-msgid "Vertical pane position"
-msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr "�� ���ਰ� ਵਿੱ� ���-ਪ�ਰਨ ਸੰਪਰ� ਦ� ਨਾ� ਨਾਲ ਮ�ਲ �ਡਰ�ੱਸ ਵ��ਾ�ਣ ਲ� ਮ�ਬ�ਰ �ਰਨਾ ਹ�।"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-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: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 "�ਡਰ�ਸ ਬ�ੱ� ਵਿੱ� ���"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "੧"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "à©«"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>ਪ�ਰਮਾਣ�ਿਤਾ</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>��� ਹ� ਰਹ� ਹ�</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-#| 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:14
-msgid "B_rowse this book until limit reached"
-msgstr "�ਹ �ਿਤਾਬ ਸ�ਮਾ �ੱਪ� ਤੱ� ਵ���(_r)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ �ਡਰ�ੱਸ ਸਰਵਰ ਤ� ਤ�ਹਾਡ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤ��ਾ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "ਲਾ��ਨ(_g):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-#| msgid "One"
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"�ੱ�\n"
-"ਸਬ"
-
-#: ../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:24
-msgid "Search Filter"
-msgstr "��� ਫਿਲ�ਰ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "��� ਬ�ਸ(_b):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "ਫਿਲ�ਰ ���(_F):"
-
-#: ../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 ""
-"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 ""
-"��� ਫਿਲ�ਰ �ੱ� �ਿਸਮ ਦ��� ���ਮਾ� ਦ� ��� ਲ� ਹਨ, �ਦ�� �ਿ ��� ��ਤ� �ਾਵ�। ���ਰ "
-"�ਸ ਵਿੱ� ਸ�ਧ ਨਾ ��ਤ� �� ਤਾ�,  ਮ�ਲ ��� ਨ�ੰ \"ਵਿ��ਤ�\" �ਿਸਮ ਨ�ੰ ਮੰਨ �� ��� ��ਤ� �ਾਵ���।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "ਸਹਾ�� ��� �ਧਾਰ"
-
-#: ../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 "
-"root of the directory tree."
-msgstr ""
-"��� �ਧਾਰ �ੰਦਰਾ� ਦਾ ਵੱ�ਰਾ ਨਾ� (DN) ਹ�ੰਦਾ ਹ�, �ਿਥ�� �ਿ ਤ�ਸ�� ��� ਸ਼�ਰ� �ਰਦ� ਹ�। ���ਰ ਤ�ਸ�� �ਸ ਨ�ੰ "
-"�ਾਲ� �ੱਡ ਦਿੱਤਾ ਤਾ�, ��� ਰ�� (root) ਡਾ�ਰ���ਰ� ਤ�� ਸ਼�ਰ� ਹ� �ਾਵ���।"
-
-#: ../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:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"�ਹ �ਧਿ�ਤਮ �ੰਦਰਾ� ਹਨ, �� �ਿ ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਸ�ਦ� ਹਨ। �ਹ ਨ�ੰ ਵਧ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ ਨਾਲ "
-"ਤ�ਹਾਡ� �ਡਰ�ੱਸ-ਬ�ੱ� ਹ�ਲ� ਹ� �ਾਵ���।"
-
-#: ../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. "
-msgstr ""
-"�ਹ �ਸ ਸਰਵਰ ਦਾ ਨਾ� ਹ�, �� �ਿ ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��� ਵਿੱ� ਵਿ�ਾ� ਦ� ਰਿਹਾ ਹ�। �ਹ ਸਿਰਫ ਵ��ਣ "
-"ਲ� ਹ�।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "ਡਾ�ਨਲ�ਡ ਸ�ਮਾ(_D):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "ਸੰਭਵ ��� �ਧਾਰ ਲੱਭ�(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "ਲਾ��ਨ ਢੰ�(_L):"
-
-#: ../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:37
-msgid "_Port:"
-msgstr "ਪ�ਰ�(_P):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "��� ਸ�ਮਾ(_S):"
-
-#: ../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:40
-msgid "_Timeout:"
-msgstr "ਸਮਾ�-ਸ�ਮਾ(_T):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "�ਾਰਡ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../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 "ਮਿੰ�"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>�-ਮ�ਲ:</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>�ਰ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>�ੱ�ਪ� ਸ�ਨ�ਹ�</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>�ੰਮ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-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:8
-msgid "<b>Telephone</b>"
-msgstr "<b>��ਲ�ਫ�ਨ</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>ਵ�ੱਬ �ਡਰ�ੱਸ</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "ਵਰ�ਹ� �ੰਢ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>�ੰਮ</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+msgid "Birthday"
+msgstr "�ਨਮ-ਦਿਨ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "���ਾ�ਰ�(_t)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#| msgid "_Calendar:"
+msgid "Calendar:"
+msgstr "��ਲੰਡਰ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
 #: ../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:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "�-ਮ�ਲ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#| msgid "_Free/Busy:"
+msgid "Free/Busy:"
+msgstr "ਵ�ਹਲ�/ਰ���:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "ਪ�ਰਾ ਨਾ�(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "�ਰ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#| msgid "_Home Page:"
+msgid "Home Page:"
+msgstr "ਮ�ੱ� ਸਫ਼ਾ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "�ਿੱਤਰ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#| msgid "<b>Instant Messaging</b>"
+msgid "Instant Messaging"
+msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "�ਾਬ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "ਪੱਤਰ �ਡਰ�ੱਸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#| msgid "Miscelleneous"
+msgid "Miscellaneous"
+msgstr "ਫ���ਲ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "�ਮ ਨਾ�(_k):"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "ਨ��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Other"
+msgstr "ਹ�ਰ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "ਨਿੱ�� �ਾਣ�ਾਰ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "��ਲ�ਫ�ਨ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#| msgid "_Video Chat:"
+msgid "Video Chat:"
+msgstr "ਵਿਡ�� �ੱਲਬਾਤ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#| msgid "<b>Web Addresses</b>"
+msgid "Web Addresses"
+msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#| msgid "_Web Log:"
+msgid "Web Log:"
+msgstr "ਵ�ਬ ਲਾ�:"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:954
+msgid "Work"
+msgstr "�ੰਮ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "�ਡਰ�ੱਸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "ਵਰ�ਹ� �ੰਢ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "ਸਹਾ��(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "�ਨਮ-ਦਿਨ(_B):"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "��ਲੰਡਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "ਸ਼ਹਿਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "�ੰਪਨ�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "ਦ�ਸ਼(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "ਵਿਭਾ�(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "ਫਾ�ਲ ਹ�ਠਾ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "ਮ�ੱ� ਸਫਾ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "ਪ�ਰਬੰਧ�(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "ਦ�ਤਰ(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "_PO ਬਾ�ਸ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "�ਿੱਤਾ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "ਪਤ�/ਪਤਨ�(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "ਸ�ਬਾ/��ਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "�ਾ��ਲ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ਪੱਤਰ ਮਨ�਼�ਰ ਹਨ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "ਵ�ਬ ਲਾ�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "�ਿੱਥ�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "�ਿਪ/ਡਾ� ��ਡ(_Z):"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "ਨਾ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../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:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "ਸ�ਧਯ��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "�ਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "ਯਾਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "�ਡ�-�ਡ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "�ਰ�ੱਪਵਾ��਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 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.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "Error adding contact"
+msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
-#: ../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.c:223
+msgid "Error modifying contact"
+msgstr "ਸੰਪਰ� ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../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:237
+msgid "Error removing contact"
+msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "ਸਰ�ਤ �ਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "ਨਿਯਤ �ਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "ਨਵਾ� ਸੰਪਰ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "ਲਿ�ਣਯ�� ��ਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "ਲ���ਦ� ��ਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "ਤਬਦ�ਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1561,199 +629,196 @@ msgstr ""
 "ਸੰਪਰ� ਡਾ�ਾ �ਲਤ ਹ�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' �ੱ� �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ਾਲ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "�ਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰ� ਤ��-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "ਪ�ਰਾ ਸ�ਧ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "ਪ�ਰਾ ਨਾ�(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "�-ਮ�ਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"�� ਤ�ਸ�� ਸੰਪਰ� ਸ��� (%s)\n"
-"ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:681
+#| msgid "Seychelles"
+msgid "Shell"
+msgstr "ਸ਼�ੱਲ"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ�ਾ�\n"
-"ਹ�ਾ�ਣ��� �ਾਹ�ੰਦ� ਹ�?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:682
+msgid "The EShell singleton"
 msgstr ""
-"�� ਤ�ਸ�� ਸੰਪਰ� (%s) ਨ�ੰ\n"
-"ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"�� ਤ�ਸ�� ਸਭ ਸੰਪਰ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ�\n"
-"ਹ�?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "ਡਾ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"ਸ�ਰ�ਮਾਨ\n"
-"ਸ�ਰ�ਮਤ�\n"
-"ਸ�ਰ�ਮਤ�\n"
-"��ਮਾਰ�\n"
-"ਡਾ."
+#: ../addressbook/gui/contact-editor/fullname.ui.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:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "ਪ�ਰਾ ਨਾ�"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "��ਨ��ਰ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "��ਮਾਰ�"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "ਸ�ਰ�ਮਾਨ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "ਸ�ਰ�ਮਤ�"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "ਸ�ਰ�ਮਤ�"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "ਸ�ਨ��ਰ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "ਪਹਿਲਾ�(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "��ਰ�(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "ਮੱਧ(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "ਪਿ��ਤਰ(_S):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>ਮ��ਬਰ</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰ� ਸ��� ਸੰਪਾਦ�"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../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 "��ਣ�..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#| msgid "_Members"
+msgid "Members"
+msgstr "ਮ��ਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
-msgstr "�ਸ ਸ��� ਤ� ਪੱਤਰ ਭ��ਣ ਦ�ਰਾਨ ਸਿਰਨਾਵ�� �ਹਲ� �ਰ�(_H)"
+msgstr "�ਸ ਲਿਸ� �ੱਤ� ਪੱਤਰ ਭ��ਣ ਦ�ਰਾਨ �ਡਰ�ੱਸ �ਹਲ� �ਰ�(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
-msgstr "ਸ��� ਨਾ�(_L):"
+msgstr "ਲਿਸ� ਨਾ�(_L):"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "��ਣ�(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "ਸ��� ਵਿੱ� ਹ�ਠਾ� ਸੰਪਰ� ਤ�� �-ਮ�ਲ ਲਿ�� �ਾ� ਸ�ੱ��।(_T)"
+msgstr "ਲਿਸ� ਵਿੱ� ਹ�ਠਾ� ਸੰਪਰ� ਤ�� �-ਮ�ਲ ਲਿ�� �ਾ� ਸ�ੱ��।(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
 msgid "Contact List Members"
 msgstr "ਸੰਪਰ� ਸ��� ਮ��ਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
 msgid "_Members"
 msgstr "ਮ��ਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../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:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+msgid "Error adding list"
+msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+msgid "Error modifying list"
+msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+msgid "Error removing list"
+msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "�ਿਤਾਬ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
 msgid "Is New List"
 msgstr "ਨਵ�� ਲਿਸ�"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ਬਦਲਿ� ਸੰਪਰ�:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "ਸੰਪਰ� ��ਰਾ:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "ਡ�ਪਲ���� ਸੰਪਰ� ਹ�ਾ�"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -1761,15 +826,15 @@ msgstr ""
 "ਸੰਪਰ� ਦਾ ਨਾ� �ਾ� �-ਮ�ਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਪਹਿਲਾ� ਹ� ਸ਼ਾਮਿਲ ਹ�। �� ਤ�ਸ�� �ਸ ਨ�ੰ �ਿਸ� ਵ� ਤਰਾ� "
 "ਸ਼ਾਮਿਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "ਨਵਾ� ਸੰਪਰ�:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "�ਸਲ� ਸੰਪਰ�:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1777,70 +842,72 @@ msgstr ""
 "ਸੰਪਰ� ਦਾ ਤਬਦ�ਲ ਨਾ� �ਾ� �-ਮ�ਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਪਹਿਲਾ� ਹ�\n"
 "ਸ਼ਾਮਿਲ ਹ�। �� ਤ�ਸ�� �ਸ ਨ�ੰ �ਿਸ� ਵ� ਤਰਾ� ਸ਼ਾਮਿਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../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:79 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:978
 msgid "Any field contains"
 msgstr "��� ��ਤਰ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Email begins with"
 msgstr "�-ਮ�ਲ �ਸ ਨਾਲ �ਰੰਭ �ਰ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Name contains"
 msgstr "ਨਾ� ਰੱ�ਦਾ ਹ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "��� ਸੰਪਰ� ਨਹ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰ�"
 msgstr[1] "%d ਸੰਪਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-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:537
-msgid "Query"
-msgstr "�ਿ�ਰ�"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:460
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "ਬ�ੱ� �ਲ� ਲ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
+msgid "Query"
+msgstr "�ਿ�ਰ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#| msgid "Search Filter"
+msgid "Search Interrupted"
+msgstr "��� ਰ��� ��"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:603
+#: ../modules/calendar/e-task-shell-content.c:625
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../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
+#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
@@ -1848,112 +915,110 @@ msgstr "ਮਾਡਲ"
 msgid "Error modifying card"
 msgstr "ਸ�ਧਿ� �ਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "�ਸ ਨਾਲ ਸ਼�ਰ� ਹ�ੰਦ� ਨਾ�"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected contacts to the clipboard"
+msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ੱ��"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected contacts to the clipboard"
+msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#| msgid "Paste tasks from the clipboard"
+msgid "Paste contacts from the clipboard"
+msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਸੰਪਰ� ��ਪ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Delete selected contacts"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਾ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#| msgid "Select all contacts"
+msgid "Select all visible contacts"
+msgstr "ਸਭ ਵ��ਾ� ਦਿੰਦ� ਸੰਪਰ� ��ਣ�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
+#| msgid "Select View: %s"
+msgid "Shell View"
+msgstr "ਸ਼�ੱਲ �ਲ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "ਸਰ�ਤ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../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: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:1971
-msgid "Save as vCard..."
-msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ�ਾ� ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../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:1287
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contact lists?"
+msgid "Are you sure you want to delete this contact list?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "ਨਵਾ� ਸੰਪਰ�(_N)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact list (%s)?"
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "�� ਤ�ਸ�� ਸੰਪਰ� ਲਿਸ� (%s)ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete these contacts?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "vCard ਵਾ�� ਸੰਭਾਲ�(_S)...."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete these contacts?"
+msgid "Are you sure you want to delete this contact?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
+#| msgid ""
+#| "Are you sure you want\n"
+#| "to delete contact (%s)?"
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� (%s) ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
+#| msgid ""
+#| "Opening %d contact will open %d new window as well.\n"
+#| "Do you really want to display this contact?"
+#| msgid_plural ""
+#| "Opening %d contacts will open %d new windows as well.\n"
+#| "Do you really want to display all of these contacts?"
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"ਸੰਪਰ� %d ��ਲ�ਹਣ ਨਾਲ %d ਵਿੰਡ��਼ ��ਲ�ਹ �ਾਣ����।\n"
+"�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "ਸ��� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "ਪਰਿੰ� �ਰ�(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਭ���(_v)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "�ੱ��(_t)"
-
-#: ../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:953
-msgid "P_aste"
-msgstr "��ਪ�(_a)"
-
-#. All, unmatched, separator
-#: ../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:1465
+msgid "_Don't Display"
+msgstr "ਨਾ ਵ��ਾ�(_D)"
 
-#: ../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.c:1466
+msgid "Display _All Contacts"
+msgstr "ਸਭ ਸੰਪਰ� ਵ���(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "ਸਹਾ��"
 
@@ -1982,8 +1047,7 @@ msgid "Car Phone"
 msgstr "�ਾਰ ਫ�ਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../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
@@ -1991,7 +1055,7 @@ msgid "Categories"
 msgstr "���ਾ�ਰ���"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "�ੰਪਨ�"
 
@@ -2040,22 +1104,22 @@ msgid "Journal"
 msgstr "�ਰਨਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "ਮ�ਨ��ਰ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "ਮ�ਬਾ�ਲ ਫ�ਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "�ਮ ਨਾ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "ਨ��"
 
@@ -2084,14 +1148,13 @@ msgid "Radio"
 msgstr "ਰ�ਡ��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../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:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "ਸਾਥ�"
 
@@ -2110,6 +1173,7 @@ msgid "Telex"
 msgstr "��ਲ��ਸ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "�ਾ��ਲ"
 
@@ -2124,29 +1188,27 @@ msgstr "ਵ�ਬ ਸਾ��"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/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-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Width"
 msgstr "���ਾ�"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/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-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "��ਾ�"
 
@@ -2171,11 +1233,11 @@ msgstr "���ਸ� ਮਾਡਲ"
 msgid "Max field name length"
 msgstr "ਨਾ� ਦ� �ਧਿ�ਤਮ ਲੰਬਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "�ਾਲਮ ���ਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2185,7 +1247,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -2199,7 +1261,7 @@ msgstr ""
 "\n"
 "�ਾ� �ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2213,7 +1275,7 @@ msgstr ""
 "\n"
 "�ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2223,7 +1285,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ���।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2233,7 +1295,7 @@ msgstr ""
 "\n"
 "�ਸ �ਲ� ਵਿੱ� ਵ��ਾ� ਲ� ��� ਸ��� ਨਹ�� ਹ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "�ਡਪ�ਰ"
 
@@ -2246,7 +1308,7 @@ msgid "Home Email"
 msgstr "�ਰ �-ਮ�ਲ"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "ਹ�ਰ �-ਮ�ਲ"
 
@@ -2258,230 +1320,282 @@ msgstr "��ਣਿ�"
 msgid "Has Cursor"
 msgstr "�ਰਸਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "ਹਮ�ਸ਼ਾ �ਲਾ�ਾਰ� ਵਿੱ� ��ਲ�ਹ�(_O)"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "ਨਵਾ� ਸੰਪਰ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/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] "1ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "��ਲ�ਹ�"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "ਸੰਪਰ� ਲਿਸ�: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "ਸੰਪਰ�:  "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਮਿੰਨ�-�ਾਰਡ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+#| msgid "Copy things to the clipboard."
+msgid "Copy the email address to the clipboard"
+msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
+msgid "_Send New Message To..."
+msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+#| msgid "Convert a mail message to a task."
+msgid "Send a mail message to this address"
+msgstr "�ਸ �ਡਰ�ੱਸ ਨ�ੰ ਮ�ਲ ਸ�ਨ�ਹਾ ਭ���"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(ਨ�ਸ਼ਾ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "ਨ�ਸ਼ਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
-msgstr "ਸ��� ਮ��ਬਰ"
+msgstr "ਲਿਸ� ਮ��ਬਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "ਵਿਭਾ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "�ਿੱਤਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "ਸਥਿਤ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "ਫ�ਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "ਫ��ਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "�ਡਰ�ੱਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "ਮ�ੱ� ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "ਵ�ਬ ਲਾ�"
 
-#: ../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:647
-#: ../calendar/gui/e-calendar-view.c:2581
-msgid "Anniversary"
-msgstr "ਵਰ�ਹ� �ੰਢ"
+#. orange
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:955
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "ਨਿੱ��"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "�ੰਮ �ਾ��ਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "ਮ�ੱ� ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "ਸਫਲਤਾ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "ਪਿੱ�ਾ ਰ��ਿ�"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "ਰਿਪ�ਸ�ਰ� ਬੰਦ ਹ�"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "��� ਸਵ� ਸੰਪਰ� ਸ��� ਪ�ਰਭਾਸ਼ਿਤ ਨਹ��"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "ਸਬੰਧ ਨਹ� ਲੱਭਾ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../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
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2608
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲਾ�਼ਮ� ਹ�"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS �ਪਲੱਬਧ ਨਹ� ਹ�"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "�ੰ� ਦਾ ��� ਸਰ�ਤ ਨਹ��"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਪਲੱਬਧ ਨਹ��"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "ਹ�ਰ �ਲਤ�"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "ਨਾ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2491,7 +1605,7 @@ msgstr ""
 "ਤਿ�ਰ ਨਾ ��ਤ� �� ਹ�ਵ� �ਾ� ਹਾਲ� ਡਾ�ਨਲ�ਡ ਨਾ ਹ�� ਹ�ਵ�। �ਿਰਪਾ �ਰ�� �ਨਲਾ�ਨ ਢੰ� ਨਾਲ �ਾਲ� ਹ�ਣ "
 "�ਪਰੰਤ �ਡਰ�ੱਸ-ਬ�ੱ� ਡਾ�ਨਲ�ਡ �ਰ� ਤਾ� �ਸ ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਸ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2500,7 +1614,7 @@ msgstr ""
 "�ਹ �ਡਰ�ੱਸ-ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��। �ਿਰਪਾ �ਰ�� �ਾ�� �ਰ� �ਿ �ਹ ਮਾਰ� %s ਹ� �ਤ� ਤ�ਹਾਡ� ��ਲ "
 "�ਧਿ�ਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2508,7 +1622,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਵਿੱ� LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹ�� ਹ�। ���ਰ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� LDAP ਮੱਦਦ �ਾਹ�ੰਦ� ਹ�, "
 "ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਪ���� LDAP-enabled �ੰਸ�ਾਲ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2516,11 +1630,11 @@ msgstr ""
 "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ। �ਸ ਦਾ �ਰਥ �ਹ ਹ� �ਿ �ਾ� ਤਾ� ਤ�ਸ�� �ਲਤ URI ਸ਼ਾਮਿਲ ��ਤਾ ਹ� "
 "�ਾ� ਸਰਵਰ ਪਹ�ੰ� ਤ�� ਬਾਹਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "ਵ�ਰਵ� ਸਮ�ਤ �ਲਤ� ਸ�ਨ�ਹਾ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2532,7 +1646,7 @@ msgstr ""
 "�ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਨਤ��ਾ� ਸਮਾ� ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -2544,193 +1658,96 @@ msgstr ""
 "ਵਿੱ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਦਾ ਸਮਾ� ਹ�ਰ ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ���ਰਾ��ਡ �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ���ਰਾ��ਡ ਨ� �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਨ�ਾਰ� ਹ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "�ਹ �ਿ�ਰ� ਨ�ੰ ਸਫਲਤਾਪ�ਰ� ਪ�ਰਾ ਨਹ� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "ਸੰਪਰ� ਸ��� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"ਸੰਪਰ� %d ��ਦ ਹ� %d �ਰ��� ��ਲ ਦ�ਣ��।\n"
-"�� ਤ�ਸ�� �ੰਨ� ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
-msgstr[1] ""
-"ਸੰਪਰ� %d ��ਦ ਹ� %d �ਰ��� ��ਲ ਦ�ਣ��।\n"
-"�� ਤ�ਸ�� �ੰਨ� ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "ਨਾ ਵ��ਾ�(_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "ਸਭ ਸੰਪਰ� ਵ��ਾ�(_A)"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�\n"
-"�� �ਸ �ੱਪਰ ਹ� ਲਿ�ਿ� �ਾਵ�?"
-
-#: ../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: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:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "ਸ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "�� vCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "%s ਲ� vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s ਲ� ਸੰਪਰ� �ਾਣ�ਾਰ�"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਾ��..."
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "�ਾਰਡ ਵ��ਾ�"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "�ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "���ਲ�ੱ� CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮ���ਲਾ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮ���ਲਾ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾ�ਾ �ੰਤਰ ਤਬਦ�ਲ� ਫਾਰਮ�� (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 
@@ -2782,26 +1799,50 @@ msgstr "�ੱ� ���ਪ�ੱ� ਫਾ�ਲ ਵਿੱ� �ਸ�ਰ
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "�ਮਾ�ਡ ਲਾ�ਨ �ਰ��ਮਿੰ� �ਲਤ�, �ਿਰਪਾ �ਰ�� ਵ��ਣ ਲ�--help ਵਰਤ��"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv �ਾ� vcard ਫਾਰਮ�� ਵਰਤ��।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "�ਸਿ�ਰ�ਨਾ��਼ ਮ�ਡ ਵਿੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਹ�ਣ� ਲਾ�ਮ� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮ�ਡ ਵਿੱ�, ��ਾਰ ��ਣ ਦ� ਲ�� ਨਹ�� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ ।\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "ਪਾਸਵਰਡ ਭਰ�"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -2879,99 +1920,104 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "�� ਤ�ਸ�� ਮ�ਲਾ�ਾਤ '{0}' ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
 #: ../calendar/calendar.error.xml.h:17
+#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "�� ਤ�ਸ�� '{0}' ਮ�ਲਾ�ਾਤ ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "�� ਤ�ਸ�� '{0}' ਮ�ਮ� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "�� ਤ�ਸ�� �ਹ '{0}' ਮ�ਲਾ�ਾਤ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "�� ਤ�ਸ�� �ਹ '{0}' ਮ�ਮ� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "�� ਤ�ਸ�� �ਹ '{0}' �ੰਮ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਲਾ�ਾਤ ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ��ਿੰ� ਨ�ੰ ਹ�ਾ� ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਮ� ਨ�ੰ ਹ�ਾ� ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "�� ਤ�ਸ�� �ਹ �ੰਮ ਹ�ਾ� ਬਾਰ� ਤਿ�ਰ ਹ�?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "�� ਤ�ਸ�� ਮ�ਮ� ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "�� ਤ�ਸ�� ਮ�ਲਾ�ਾਤ ਨ�ੰ ਸੰ��ਪ ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "�� ਤ�ਸ�� �ੰਮ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "��ਲੰਡਰ ਰਿਪ��਼�ਰ� �ਫਲਾ�ਨ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ਨਵ�� ��ਨਾ ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "��ਨਾ ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "�� ��ਲੰਡਰ '{0}' ਹ�ਾ�ਣਾ ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "�� ਮ�ਮ� ਸ��� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "�� �ੰਮ ਸ��� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "ਨਾ ਭ���(_n)"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ਡਾ�ਨਲ�ਡ �ਰਨਾ �ਾਰ� ਹ�। �� ਤ�ਸ�� �ਹ ਮ�ਲਾ�ਾਤ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ਡਾ�ਨਲ�ਡ �ਾਰ� ਹ�। �� ਤ�ਸ�� �ੰਮ ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "�ਡ��ਰ ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2979,28 +2025,28 @@ msgstr ""
 "ਸਭ ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ �ਸ �ੰਮ ਬਾਰ� ਸੱਦਾ ਭ��ਿ� �ਿ� ਹ� �ਤ� �ਹਨਾ� ਨ�ੰ �ਹ �ੰਮ ਮਨ�਼�ਰ �ਰਨ ਦਾ "
 "�ਧਿ�ਾਰ ਵ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "�-ਮ�ਲ ਸੱਦਾ ਸਭ ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਭ��� �ਾਵ��� �ਤ� �ਹਨਾ� ਨ�ੰ �ਵਾਬ ਦ�ਣ ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "��ਲੰਡਰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "ਮ�ਮ� ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "�ੰਮ ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "{0} ਵਿੱ� �ਲਤ�"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3008,7 +2054,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਨਾ ਭ��� ਤਾ�, ਹ�ਰ ਭਾ� ਲ�ਣ ਵਾਲ� ਮ��ਿੰ� ਦ� ਰੱਦ ਹ�ਣ ਬਾਰ� �ਾਣ ਨਹ�� "
 "ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -3016,7 +2062,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ ਮ�ਮ� ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -3024,35 +2070,23 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ �ੰਮ ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ�� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਸੰਭਾਲ�"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "ਮ�ਮ� ਸੰਭਾਲ�"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "�ੰਮ ਸੰਭਾਲ�"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -3060,7 +2094,7 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। ਮ�ਲਾ�ਾਤ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ "
 "ਹ� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -3068,91 +2102,96 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। �ੰਮ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ ਹ� "
 "ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਸਰਵਰ ਨਾਲ ��� ਫ��ਰ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰਨ��।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ਮ�ਮ� �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਮ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "��ਲੰਡਰ ਨ�ੰ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "ਮ�ਮ� ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�।"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "�ੰਮ ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "�ਹ ��ਲੰਡਰ ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "�ਹ ਮ�ਮ� ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "�ਹ �ੰਮ ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� �ਸਮਰੱਥ"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਲਾ�ਾਤ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+#| msgid "Would you like to save your changes to this memo?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "�� ਤ�ਸ�� �ਹ ਮ��ਿੰ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਲ� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ���?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�� ਤ�ਸ�� ਸਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਲ� ਸੱਦਾ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਸ��ਿਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "�� ਤ�ਸ�� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -3161,280 +2200,219 @@ msgstr ""
 "ਤ�ਸ�� �ੱ� ਨਾ-ਸਹਾ�� �ਰ�ੱਪਵਾ��਼ (GroupWise) ਸਰਵਰ ਨਾਲ ���ਨ �ਾ ਰਹ� ਹ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ "
 "ਨਾਲ ਸਮੱਸਿ� � ਸ�ਦ� ਹ�। �ੰ�� ਨਤ��ਿ�� ਲ� ਸਰਵਰ ਨ�ੰ ਸਹਾ�� ਵਰ�ਨ ਲ� �ੱਪ�ਰ�ਡ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ����।"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+#| msgid "You have changed this task, but not yet saved it."
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "�ਸ ਮ��ਿੰ� ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡਾ ��ਲੰਡਰ �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ���ਾ, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� �ਰਦ�।"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਮ�ਮ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� �ੰਮ �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "ਤਬਦ�ਲ��� ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ਭ���(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "ਸ��ਨਾ ਭ���(_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "ਬਹ�-ਦਿਨ �ਾਰਵਾ��� ਨ�ੰ ਵੱ� �ਰ�:"
 
-#: ../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
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "ਪਾ�ਲ� ��ਲੰਡਰ �ਾਰ� ਭਾ� ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "ਮ�ਲ ਪਹਿਲ:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../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:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "��ਲੰਡਰ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "�ਪਣਾ ਸਮਾ�-��ਤਰ, ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਦ� ਸੰਰ�ਨਾ ਲ� �ਥ� �ਾ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਤ� �ੰਮ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਸ�ਡਿ�ਲ ਸ�ਨ�ਹਾ ਦਰਸ਼�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ/�ੰਮ ਸੰਪਾਦ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "�ਵ�ਲ਼�ਸ਼ਨ ਦਾ ��ਲੰਡਰ ਭਾ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਮ� ਭਾ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ �ੰਮ ਭਾ�"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-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: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: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: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 "�ੰਮ"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "��ਲੰਡਰ(_C)"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "�ੰਮ(_T)"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਤਾਵਨ� �ਿੱਪਣ� ਸ�ਵਾ"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰ�"
 msgstr[1] "ਮਿੰ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../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"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hour"
 msgid_plural "hours"
-msgstr[0] "�ੰ��"
+msgstr[0] "�ੰ�ਾ"
 msgstr[1] "�ੰ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "ਸ਼�ਰ� ਸਮਾ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "ਸਭ ਮਨਸ��(_A)"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "�ਿ�ਾਣਾ:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "�ੰਤਰਾਲ ਸਮਾ�(_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "ਮਨਸ��(_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../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: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
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1605
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "ਬ��ਾਰ(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
+#: ../plugins/caldav/caldav-source.c:496
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:517
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hours"
+msgstr "�ੰ��"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ਿ�ਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/caldav/caldav-source.c:495
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "ਮਿੰ�"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
 msgid "No summary available."
 msgstr "��� ਸੰ��ਪ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
 msgid "No description available."
 msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
 msgid "No location information available."
 msgstr "��� �ਿ�ਾਣਾ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3446,7 +2424,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ੱ� ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱ��ਿੱ� ਬ�ਸਾ ਹ�\n"
 "ਵ��ਾ ਸ����।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3462,20 +2440,10 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਸ �ਾਰ� ਨ�ੰ �ਲਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 msgid "Do not ask me about this program again."
 msgstr "�ਸ �ਾਰ� ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "ਬ�ਨਬ� ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr "��ਤਾਵਨ� ਨ���ਫਿ��ਸ਼ਨ ਸਰਵਿਸ ਫ���ਰ� ਬਣਾ� �ਾ ਸ�� ਹ�, ਸ਼ਾ�ਦ ਪਹਿਲਾ� ਹ� �ੱਲਦ� ਹ�..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "�ਲਤ ਸਮਾ�"
@@ -3514,7 +2482,7 @@ msgid "Alarm programs"
 msgstr "�ਲਾਰਮ �ਾਰ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ� ਨ�ੰ ਵ��ਾ� �ਾਣ ਦਾ ਸਮਾ� ਸ�ਿੰ�ਾ� ਵਿੱ�।"
 
@@ -3567,7 +2535,6 @@ msgid "Default appointment reminder"
 msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-#| msgid "Default reminder units"
 msgid "Default recurrence count"
 msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
 
@@ -3628,77 +2595,99 @@ msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਦ� ਹਫਤਾ �ਲ� ਵਿੱ� �ੰਤਰਾਲ, ਮਿੰ� ਵਿੱ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "��ਰ� �ਲਾਰਮ ਸਮਾ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "ਲ�ਵਲ, �ਿਸ ਤ�� ਬਾ�ਦ ਸ�ਨ�ਹਾ ਲਾ� '� ਰੱ�ਿ� �ਾਵ��ਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਤਾ�਼ਾ ਵਰਤ� ਦ��� ਸਮਾ�-��ਤਰ ਦ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਪਬਲ���ਸ਼ਨ ਲ� ਸਰਵਰ URL ਦ� ਸ��� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਦਿਨ �ਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਸਮਾ� ਰ��ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#| msgid "_Reply style:"
+msgid "Memo layout style"
+msgstr "ਮ�ਮ� ਲ���� ਸ�ਾ�ਲ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#| msgid "Month view vertical pane position"
+msgid "Memo preview pane position (vertical)"
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਵਰ���ਲ)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, ੦ ਤ�� ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, ੦ ਤ�� ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "�ਿਤਿ�� ਪਾਸ� ਦ� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "ਮਹ�ਨਾ ਦਿੱ� ਲੰਬ�ਾਰ� ਪੱ�� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ �ਾਣਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "�ੰਮ �ਹਲ� �ਰਨ ਦਾ ਪਤਾ �ਰਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -3706,7 +2695,7 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3714,19 +2703,25 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ ��ਲੰਡਰ ਸ��� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ��ਲੰਡਰ ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�।"
 
-#: ../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:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3734,7 +2729,7 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 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."
@@ -3742,102 +2737,109 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#| msgid "Print this calendar"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#| msgid "New memo list"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-#| msgid "New task list"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "�ਲਾਰਮ ਵਲ�� �ੱਲਣ ਵਾਲ� �ਾਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਵਰਤ� ਤਾ�਼ਾ ਦ��� ਸਮਾ� �਼�ਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "�ਲਾਰਮ �ਡ�� ਲ� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� �ੱ�� ਪਿੱ�� �ਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲਾ�ਾਤ �ੰਤ ਸਮਾ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
-msgstr "\"�ਲ�\" ਪ�ਨ ਵ���"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the memo preview pane"
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "\"Preview (�ਲ�)\" ਪੱ�� ਵ���।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#| msgid "Show the \"Preview\" pane"
+msgid "Show the task preview pane"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ�ਣ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤ� �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤਾ �ੰ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (horizontal)"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (vertical)"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਵਰ���ਲ)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
 msgstr "�ੱ� ਦ� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
-msgstr "�ੰਮ ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -3846,7 +2848,7 @@ msgstr ""
 "ਵ�ਹਲਾ/ਰ��ਿ� ਵਾ�� ਵਰਤਣ ਲ਼� URL ��ਪਲ�� ਡਾ�ਾ, %u ਨ�ੰ ਪੱਤਰ �ਡਰ�ੱਸ ਦ� ਯ��਼ਰ ��ਤਰ �ਤ� %d ਨ�ੰ ਡ�ਮ�ਨ ਨਾਲ "
 "ਤਬਦ�ਲ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -3854,88 +2856,105 @@ msgstr ""
 "��ਲੰਡਰ ਵਿੱ� ਵਰਤਣ ਲ� ਮਿਤ� ਤ� ਸਮਾ� ਲ� ਮ�ਲ ਸਮਾ�-��ਤਰ, �ੱ� ਨਾ-�ਨ�ਵਾਦ �ਲਸ�ਨ ਸਮਾ�-��ਤਰ ਡਾ�ਾਬ�ਸ "
 "��ਤਰ, �ਿਵ�� �ਿ \"America/New York\" �ਦਿ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "ਸਮਾ� ਵੰਡ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "ਸਮਾ� �ਦ�� �ਲਾਰਮ �ੱਲਿ�, ਸਮ�� ਵਿੱ�(_t)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "ਸਮਾ�-��ਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 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:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "��ਵ�� �ੰ�ਾ ਸਮਾ� ਫਾਰਮ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ��ਲੰਡਰ ਲ� URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ਮ�ਮ� ਲਿਸ� ਲ� URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") �ਾਸ� ਲ� URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "�ਾਸ� �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-#| msgid "_Use system defaults"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ��ਣ� ਸਮਾ�-��ਤਰ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਸਮਾ�-��ਤਰ ਵਰਤ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ਹਫਤਾ ਸ਼�ਰ� ਹ�ਣ ਦਾ ਦਿਨ, �ਤਵਾਰ (੦) ਤ�� ਸ਼ਨਿ�ੱਰਵਾਰ (੬)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "�ਲਾਰਮ ਵ��ਾ�ਣ ਲ� ਸ��ਨਾ ਪੱ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "�� ਮ�ਲਾ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "�� ਮ�ਲ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3943,273 +2962,86 @@ msgstr ""
 "�� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਿ�� ਨ�ੰ �ੱ�ਠਾ �ਰਨਾ ਹ� ਤਾ� �ਿ ਸ਼ਨਿ�ੱਰਵਾਰ �ਤ� �ਤਵਾਰ ਨ�ੰ �ੱ� ਦਿਨ ਦ� ਤ�ਰ ਤ� "
 "ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "�� ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ��ਨਾ ਦਾ ਸਮਾ� �ੰਤ ਵ��ਾ�ਣਾ ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "�� ��ਲੰਡਰ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ (ਮ���ਦਾ ਸਮ�� ਦ� ਰ��ਾ) �ਿੱ�ਣ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "�� ਮ��ੰਮਲ �ੰਮਾ� ਨ�ੰ �ੰਮ ਦਿੱ� ਵਿੱ� �ਹਲ� ��ਤ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "�� ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� ਹਿਲਾ�ਣਾ ਹ� ਨਾ �ਿ ਮਹ�ਨ� ਨਾਲ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "�� ��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� ੪ �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� �ਿਸਮ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "�� ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "�� ਮਿਤ� �ਲ� ਦ�ਰਾਨ ਹਫਤ� ਦਾ �ੰ� ਵ��ਾ�� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "�ਾਰ�� ਦਿਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
 
-#: ../calendar/gui/cal-editor-utils.c:100
-#| msgid "Invalid contact."
+#: ../calendar/gui/cal-editor-utils.c:102
 msgid "Invalid object"
 msgstr "�ਲਤ �ਬ����"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "ਸੰ��ਪ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "ਵ�ਰਵ� ਵਿੱ� ਸ਼ਾਮਿਲ"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "���ਾ�ਰ� ਹ�"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "�ਿੱਪਣ� ਵਿੱ� ਸ਼ਾਮਿਲ"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "�ਿ�ਾਣਾ ਵਿੱ� ਸ਼ਾਮਿਲ"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "���ਿਵ �ਾਸ�"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "ਮਿ�ਦ ਪ�ੱ���� �ਾਸ�ਾ�"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "ਸਮਾਪਤ �ਾਸ�"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "�����ਮਿੰ� ਨਾਲ �ਾਸ�"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
-
-#: ../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: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 "
-"events."
-msgstr ""
-"�ਹ ��ਣ� ਸਮ�� ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦ�ਵ��ਾ। ���ਰ ਤ�ਸ�� �ਾਰ� ਰਹ� ਤਾ�, �ਹ ��ਨਾਵਾ� "
-"ਮ�� ਪ�ਰਾਪਤ ਨਹ�� ਹ� ਸ�ਣ����।"
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "�ਸ ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਸ�ਧ�"
-
-#: ../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 "ਦਿਨ"
-
-#. Create the Webcal source group
-#: ../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 "ਵ�ੱਬ ਤ�"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "ਮ�ਸਮ"
-
-#. 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: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: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: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:961
-msgid "Failed upgrading calendars."
-msgstr "��ਲੰਡਰ ਦਾ �ੱਪ�ਰ�ਡ �ਸਫਲ"
-
-#: ../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:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ� ਬਣਾ�ਣ ਲ� ��ਲੰਡਰ ਨਹ�� ਹ�"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "��ਲੰਡਰ ਸਰ�ਤ ��ਣ�ਾਰ"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "ਮ�ਲਾ�ਾਤ(_A)"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "ਨਵ�� ਮ��ਿੰ�"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "ਮ��ਿੰ�(_e)"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "ਨਵ�� ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "ਨਵਾ� ��ਲੰਡਰ"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "��ਲੰਡਰ(_n)"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
-
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "ਦਿਨ �ਲ�"
@@ -4251,18 +3083,19 @@ msgstr "���ਾ�ਰ�"
 msgid "Classification"
 msgstr "ਵਰ���ਰਨ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��ਪਤ"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ਵ�ਰਵਾ"
 
@@ -4283,8 +3116,9 @@ msgstr "ਬਾਹਰ"
 
 #: ../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
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Location"
 msgstr "�ਿ�ਾਣਾ"
 
@@ -4293,20 +3127,21 @@ msgstr "�ਿ�ਾਣਾ"
 msgid "Organizer"
 msgstr "ਪ�ਰਬੰਧ�"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../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:359 ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ਸਰਵ�ਨ�"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ਦ�ਹਰਾ�"
 
@@ -4315,7 +3150,7 @@ msgstr "ਦ�ਹਰਾ�"
 #: ../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:357
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "ਸੰ��ਪ"
 
@@ -4344,495 +3179,465 @@ msgstr "ਹ�"
 msgid "is not"
 msgstr "�ਹ ਨਹ��"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "��ਲੰਡਰ ��ਲਣ ਲ� ਤਰ��ਾ ਸਹਾ�� ਨਹ�� ਹ�"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "��ਲੰਡਰ ��ਲਣ ਲ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ"
-
-#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "�ਣ�ਾਣ� �ਲਤ�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "�ਲਾਰਮ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "��ਤਾਵਨ� �ਭਾਰ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ਧ�ਨ� �ਲਾ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "�ਾਰ� �ਲਾ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../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>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>��ਣ</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>ਦ�ਹਰਾ�</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "ਸੰ��ਤ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#| msgid "Alarms"
+msgid "Alarm"
+msgstr "�ਲਾਰਮ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "ਸ�ਧ ਸ�ਨ�ਹਾ(_m)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "ਸੰ��ਤ �ਵਾ� ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "ਸ�ਨ�ਹਾ(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "��ਣ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#| msgid "<b>Repeat</b>"
+msgid "Repeat"
+msgstr "ਦ�ਹਰਾ�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "ਨ�ੰ ਭ���:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "�ਰ��ਮਿੰ�(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "�ਾਰ�(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "�ਲਾਰਮ ਦ�ਹਰਾ�(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "�ਵਾ�(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-#| msgid "before"
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"ਪਹਿਲਾ�\n"
-"ਬਾ�ਦ"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "ਬਾ�ਦ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#| msgid "is before"
+msgid "before"
+msgstr "ਪਹਿਲਾ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "ਦਿਨ"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/caldav/caldav-source.c:497
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:518
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "ਦਿਨ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ੰਤ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 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.ui.h:20
+msgid "hour(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.ui.h:22
+msgid "minute(s)"
+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-dialog.ui.h:24
+#| msgid "location of appointment"
+msgid "start of appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਸ਼�ਰ�"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "�ਾਰਵਾ�/ਤਬਦ�ਲ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "�ਲਾਰਮ"
 
-#: ../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:141
-msgid "Attach file(s)"
-msgstr "ਫਾ�ਲ ����"
-
-#. an empty string is the same as 'None'
-#: ../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: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
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#| msgid "None"
+msgctxt "cal-second-zone"
 msgid "None"
-msgstr "��� ਨਹ�"
+msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "��ਣ�..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#| msgid "Time zone:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "ਸਮਾ� �ਤ� ਮਿਤ�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
-#| msgid "Date:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "��ਵਲ ਮਿਤ�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, no-c-format
+#| msgid ""
+#| "<i>%u and %d will be replaced by user and domain from the email address.</"
+#| "i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u �ਤ� %d ਨ�ੰ �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ��� ਯ��਼ਰ �ਤ� ਡ�ਮ�ਨ ਨਾਲ ਤਬਦ�ਲ ��ਤਾ �ਾਵ��ਾ।"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(ਦਿਨ �ਲ� ਵਿੱ� ਵ���)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"੬੦ ਮਿੰ�\n"
-"੩੦ ਮਿੰ�\n"
-"੧੫ ਮਿੰ�\n"
-"੧੦ ਮਿੰ�\n"
-"੦੫ ਮਿੰ�"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+#| msgid "minutes"
+msgid "05 minutes"
+msgstr "੦੫ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+#| msgid "minutes"
+msgid "10 minutes"
+msgstr "੧੦ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+#| msgid "minutes"
+msgid "15 minutes"
+msgstr "੧੫ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+#| msgid "minutes"
+msgid "30 minutes"
+msgstr "੩੦ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+#| msgid "minutes"
+msgid "60 minutes"
+msgstr "੬੦ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#| msgid "Alarms"
+msgid "Alerts"
+msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u �ਤ� %d ਨ�ੰ �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ��� ਯ��਼ਰ �ਤ� ਡ�ਮ�ਨ ਨਾਲ ਤਬਦ�ਲ ��ਤਾ �ਾਵ��ਾ।<i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#| 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: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>"
-
-#: ../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:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">�ੰਮ ਲਿਸ�</span>"
-
-#: ../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:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">�ੰਮ ਹਫ਼ਤਾ</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "ਮਿਤ�/ਸਮਾ� ਫਾਰਮ��"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+#| msgid "Day"
+msgid "Days"
+msgstr "ਦਿਨ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+#| msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgid "Default Free/Busy Server"
+msgstr "ਡਿਫਾਲ� ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "ਡਿਸਪਲ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#| msgid "Show display alarms in notification tray"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ਸ਼�ੱ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"ਮਿੰ�\n"
-"�ੰ��\n"
-"ਦਿਨ"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "ਸਧਾਰਨ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "Hours"
+msgstr "�ੰ��"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+#| msgid "minutes"
+msgid "Minutes"
+msgstr "ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ਸ�ਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"ਸ�ਮਵਾਰ\n"
-"ਮੰ�ਲਵਾਰ\n"
-"ਬ�ੱਧਵਾਰ\n"
-"ਵ�ਰਵਾਰ\n"
-"ਸ਼�ੱ�ਰਵਾਰ\n"
-"ਸਨਿੱ�ਰਵਾਰ\n"
-"�ਤਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "��� ਨਹ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "ਰੰ� ��ਣ�"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "�ਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "ਮਹ�ਨ� ਨ�ੰ ਹਫ਼ਤ� ਨਾਲ ਹਿਲਾ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ਦ��ਾ ��ਤਰ(_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "�ਲਾਰਮ ਸ��ਨਾ ਲ� �ਲੰਡਰ ��ਣ�"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_o)"
 
-#. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤ� ਦ� ਦਿਨ ਵ��ਾ�(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ��ਾ�(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "�ਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "�ੱ� ਦ� �ੰਮ(_a):"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "ਵ�ਰ(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "�ੰਮ ਲਿਸ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "��ਪਲ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ਵ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "ਸਮਾ�"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "ਸਮਾ�-��ਤਰ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "ਸਮਾ�-ਫਾਰਮ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "ਮੰ�ਲਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#| msgid "Show the second time zone"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ਬ�ੱਧਵਾਰ"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+msgid "Work Week"
+msgstr "�ੰਮ ਹਫਤਾ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "�ਾਰ�� ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_੨੪ �ੰ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਾ-�ੰਤ ਸਮ���(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼�ਰ�(_D):"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "ਸ਼�ੱ�ਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪ�ਰਨ �ੰਮ �ਸ ਬਾ�ਦ �ਹਲ� �ਰ�(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "ਸ�ਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ(_O):"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "ਸ਼ਨਿੱ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤ� �ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲ�ਾਤ ਵ��ਾ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "ਸਮਾ� ਵੰਡ(_T):"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "ਮੰ�ਲ(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "ਬ�ੱਧ(_W)"
 
-#. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "ਹਰ�� ਵਰ�ਹ�-�ੰਢ/�ਨਮਦਿਨ ਤ�� ਪਹਿਲਾ�"
 
-#. 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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
 
@@ -4840,6 +3645,19 @@ msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
 msgid "Type:"
 msgstr "�ਿਸਮ:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "�ਿਸਮ(_T):"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "ਨਾ�(_N):"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ��ਲੰਡਰ ਭਾ� �ਾਪ� �ਰ�(_y)"
@@ -4856,10 +3674,6 @@ msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� ਮ�ਮ� ਸ��� 
 msgid "Colo_r:"
 msgstr "ਰੰ�(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "�ੰਮ ਲਿਸ�"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ�"
@@ -4937,254 +3751,269 @@ msgstr "%s  ਤ�ਸ�� ��� ਤਬਦ�ਲ� ਨਹ�� ��ਤ
 msgid "Validation error: %s"
 msgstr "�ਾ�� �ਲਤ�: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
 msgid " (Due "
 msgstr " (ਬਾ�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
 msgid "Due "
 msgstr "ਬਾ�� "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
-#| msgid "Save attachments"
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
 msgstr "��ਾ� �ੱਪਡ�� ਨਹ�� ਹ� ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮ��ਿੰ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮ�ਲਾ�ਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲ� �ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "�ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮ�ਮ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "ਸੰ��ਪ ਨਹ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "�� �ਸਲ� ���ਮ ਰੱ�ਣ� ਹ�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਬੰਦ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-msgid "Copy selected text to the clipboard"
-msgstr "��ਣਿ� ���ਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+msgid "Copy the selection"
+msgstr "��ਣ� ਦ� ਨ�ਲ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "��ਣ� �ੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
-msgid "Cut selected text to the clipboard"
-msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#| msgid "Cut the selection"
+msgid "Delete the selection"
+msgstr "��ਣ� ਹ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "�ਪਲੱਬਧ ਮੱਦਦ ਵ��ਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
-msgid "Paste text from the clipboard"
-msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� �ਾਪ� �ਰ�"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "�ਲਿੱਪਬ�ਰਡ �ਿਪ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਸੰਭਾਲਣ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "ਵਰ���ਰਨ(_C)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "ਫਾ�ਲ(_F)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "��ਣ(_O)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "ਵ���(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "ਨੱਥ�(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਨੱਥ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "���ਾ�ਰ�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਲ� ���ਾ�ਰ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "ਸਮਾ� ��ਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਮਾ� ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "ਪਬਲਿ�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "ਪਬਲਿ� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ਨਿੱ��(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "ਨਿੱ�� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "��ਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "��ਪਤ ਦ� ਤ�ਰ 'ਤ� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "ਰ�ਲ ��ਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਰ�ਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ RSVP ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ��ਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਹਾਲਤ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "�ਿਸਮ ��ਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਦਰਸ਼� �ਿਸਮ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ਤਾ�਼ਾ ਦਸਤਾਵ��਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "ਨੱਥ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "ਸੰਭਾਲ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "���ਰ �ੱਪਡ�� ��ਤਾ �ਸ ��ਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਰੱਦ �ਰ ਦਿੱਤ��� �ਾਣ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "����ਮ���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "ਮ���ਦਾ ਵਰ�ਨ ਵਰਤਣ ਵਿੱ� �ਸਫਲ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "ਸਰ�ਤ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "ਨਿਯਤ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "ਨਿਯਤ ਸਿਰਫ ਪ�ਨ ਲ� ਹ�"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹ�ਰ ਸਭ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਦ� ਪੱਤਰ-ਬ�ਸ� ਵਿੱ� �ਹ ��ਾ� ਹ�ਾ�ਣ� ਹ�?(_D)"
 
@@ -5236,159 +4065,145 @@ msgstr "�ਹ ਮ�ਮ� �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�
 msgid "The item could not be deleted due to an error"
 msgstr "�ਹ ��ਾ� �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "ਸੰਪਰ�..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਦਿ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਨ�ੰ ਸ�ੱ� �ਾ� ਨਾ-ਸ�ੱ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "ਦ�ਹਰਾ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../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:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "ਭ��ਣ ��ਣ"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "ਸਭ ਦਿਨ ��ਨਾਵਾ�(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਾਰ� ਦਿਨ ਦ��� ��ਨਾਵਾ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "ਸਮਾ� ਰ��� ਵਾ�� ਵ��ਾ�(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "�ਸ ��ਲੰਡਰ ਲ� ਵ�ਹਲਾ / ਰ��ਿ� �ਾਣ�ਾਰ� ਪਤਾ �ਰ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "ਮ�ਲਾ�ਾਤ(_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "�ਵ��� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਿ�, �ਿ���ਿ ��ਣਿ� ��ਲੰਡਰ ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:755
 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
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:827
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ�ਰਬੰਧ�(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ਪ�ਰਤ�ਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼�(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "ਬਿਨਾ� ਸ਼�ਰ��ਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "ਬਿਨਾ� �ੰਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "��ਣ� ਪ�ਰਬੰਧ� ਦਾ ��ਾ��� ਨਹ�� ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�।"
 
-#: ../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:2639
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
@@ -5399,151 +4214,149 @@ msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤ�ਸ�� %s ਦ� ਤ�ਰ �ੱਤ� �ੰਮ �ਰ ਰਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2973
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2979
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, 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:2992
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"ਮ�ਲਾ�ਾਤ ਤ�� 15 ਮਿੰ� ਪਹਿਲਾ�\n"
-"ਮ�ਲਾ�ਾਤ ਤ�� 1 �ੰ�ਾ ਪਹਿਲਾ�\n"
-"ਮ�ਲਾ�ਾਤ ਤ�� 1 ਦਿਨ ਪਹਿਲਾ�"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+#| msgid "None"
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ੧ ਦਿਨ ਪਹਿਲਾ�"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧ �ੰ�ਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧੫ ਮਿੰ�"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "ਦਰਸ਼�(_s)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "ਦਰਸ਼�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "�ਲਾਰਮ ਸ�ਧ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "�ਵ��� ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "ਸੰ��ਪ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ਵ�ਰਵਾ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:364
 msgid "_Location:"
 msgstr "�ਿ�ਾਣਾ(_L):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "ਸਮਾ�(_T):"
 
-#: ../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"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "ਲ�"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#| msgid "until"
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"ਲ�\n"
-"�ਦ�� ਤੱ�"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#| msgid ""
+#| "for\n"
+#| "until"
+msgid "until"
+msgstr "�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ਮ�ਮ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ��ਣਿ� ਮ�ਮ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ਮ�ਮ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "ਵੱਲ"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�(_r):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "�ਰ�ੱਪ(_G):"
 
@@ -5583,21 +4396,21 @@ msgstr "�ਹ �ਤ� ਭਵਿੱ�ਤ ਮ��� ਲ�"
 msgid "All Instances"
 msgstr "ਸਭ ਮ���"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਲ�� ਹ�, �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸ�ਧ ਨਹ�� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "�ਵਰਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
 msgstr "ਮ��-ਹ�ਣ ਦਾ ਸਮਾ� �ਵ��� ਸ਼�ਰ� ਹ�ਣ ਦ� ਸਮ�� ਤ�� ਪਹਿਲਾ� ਹ�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "�ਾਲ�"
 
@@ -5605,7 +4418,7 @@ msgstr "�ਾਲ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "ਪਹਿਲਾ�"
 
@@ -5614,7 +4427,7 @@ msgstr "ਪਹਿਲਾ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "ਦ��ਾ"
 
@@ -5622,7 +4435,7 @@ msgstr "ਦ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "ਤ��ਾ"
 
@@ -5630,7 +4443,7 @@ msgstr "ਤ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "��ਥਾ"
 
@@ -5638,8 +4451,7 @@ msgstr "��ਥਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
-#| msgid "Width"
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fifth"
 msgstr "ਪੰ�ਵਾ�"
 
@@ -5647,13 +4459,13 @@ msgstr "ਪੰ�ਵਾ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "last"
 msgstr "��ਰ�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "ਹ�ਰ ਮਿਤ�"
 
@@ -5661,7 +4473,7 @@ msgstr "ਹ�ਰ ਮਿਤ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 
@@ -5669,7 +4481,7 @@ msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 
@@ -5677,186 +4489,216 @@ msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 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:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 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:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "�ਸ ਤ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ਮ���ਦ��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "�ਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "ਸ�ਧ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "�ਪਵਾਦ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "ਹ�ਾ�ਣ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "ਮਿਤ�/ਸਮਾ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>�ਪਵਾਦ</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>�ਲ�</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-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:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 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:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#| msgid "<b>Exceptions</b>"
+msgid "Exceptions"
+msgstr "���"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#| msgid "_Preview"
+msgid "Preview"
+msgstr "�ਲ�"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਮ�� ਹ�(_u)"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"ਦਿਨ\n"
-"ਹਫ਼ਤ�\n"
-"ਮਹ�ਨ�\n"
-"ਸਾਲ"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "ਹਮ�ਸ਼ਾ"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"ਲ�\n"
-"�ਦ�� ਤੱ�\n"
-"ਹਮ�ਸ਼ਾ"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "ਮਹ�ਨਾ"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "ਹਫਤਾ"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "ਸਾਲ"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "�ਸ �ਵ��� ਲ� ਮ�ਰ� �ਲਾਰਮ ਭ���"
 
 #: ../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
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "ਵ�ਬ ਪ��਼"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">ਫ���ਲ</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ਸਥਿਤ�</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "��ਤਮ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"�ੱ�\n"
-"ਸਧਾਰਨ\n"
-"�ੱ�\n"
-"ਨਾ-ਪ�ਰਭਾਸਿਤ"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2602
+msgid "In Progress"
+msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"ਸ਼�ਰ� ਨਹ��\n"
-"�ਾਰ� ਹ�\n"
-"ਪ�ਰਾ ��ਤਾ\n"
-"ਰੱਦ ��ਤਾ"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "ਨਿ�ਨਤਮ"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "ਸਧਾਰਨ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "ਫ�-ਸਦ� ਪ�ਰਾ(_e):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "ਹਾਲਤ(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. 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/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ਸਥਿਤ�"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ�(_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "ਪਹਿਲ(_P):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "ਵ�ਬ ਸ�ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ਹਾਲਤ ਵ�ਰਵਾ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 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:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "ਭ��ਣ ��ਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "�ੰਮ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "�ੰਮ ਵ�ਰਵਾ"
 
@@ -5865,38 +4707,36 @@ 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
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "ਮਿ�ਦ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱ� �ਾਸ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "ਦਰਸ਼�(_N)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "���ਾ�ਰ�(_i)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "ਮਿ�ਦ(_u):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "ਸਮਾ�-��ਤਰ:"
 
@@ -5976,136 +4816,54 @@ msgstr "%s, %s ਤ�"
 msgid "%s for an unknown trigger type"
 msgstr "�ਣ�ਾਣ ਤਬਦ�ਲ� �ਿਸਮ ਲ�  %s"
 
-#: ../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:127
-#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "ਬਿਨਾ� ਨਾ�"
 
-#: ../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:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../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-preview.c:198
+#| msgid "Categories"
+msgid "Categories:"
+msgstr "���ਾ�ਰ���:"
 
-#: ../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:202
-#: ../calendar/gui/e-itip-control.c:1154
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ਸੰ��ਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�:"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "ਮਿ�ਦ:"
 
-#. write status
 #. Status
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "ਸਥਿਤ�:"
 
-#: ../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
+#: ../calendar/gui/e-cal-component-preview.c:312
 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:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
+msgid "Description:"
+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-component-preview.c:368
+msgid "Web Page:"
+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
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Created"
 msgstr "ਬਣਾ��"
 
@@ -6116,7 +4874,6 @@ msgstr "ਸਮਾਪਤ� ਮਿਤ�"
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
-#| msgid "Modified"
 msgid "Last modified"
 msgstr "��ਰ� ਸ�ਧ"
 
@@ -6126,17 +4883,16 @@ msgid "Start Date"
 msgstr "ਸ਼�ਰ� ਮਿਤ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "ਵ�ਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "ਰ��ਿ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6146,209 +4902,81 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../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:151 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#| msgid "None"
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../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:163
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ਨਹ�"
 
+#: ../calendar/gui/e-cal-model.c:377
+#| msgid "Default Mail Client"
+msgid "Default Client"
+msgstr "ਡਿਫਾਲ� �ਲਾ��"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
+#: ../shell/e-shell.c:836
+#| msgid "Exchange Settings"
+msgid "Shell Settings"
+msgstr "ਸ਼�ੱਲ ਸ��ਿੰ�"
+
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
+#: ../shell/e-shell.c:837
+#| msgid "Autocompletion Settings"
+msgid "Application-wide settings"
+msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
+
 #. This is the default filename used for temporary file creation
-#: ../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: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
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "�ਵਿਰਤ�"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "�ਾਰ� ��ਤ�"
 
-#: ../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:371
-#: ../calendar/gui/e-calendar-view.c:2429
+#: ../calendar/gui/e-cal-model.c:2203
 #, 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:374
-#: ../calendar/gui/e-calendar-view.c:2433
-#, c-format
-msgid "Organizer: %s"
-msgstr "ਪ�ਰਬੰਧ�: %s"
-
-#: ../calendar/gui/e-calendar-table.c:405
-msgid "Start: "
-msgstr "ਸ਼�ਰ�:"
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "Due: "
-msgstr "ਬਾ��:"
-
-#: ../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:608
-msgid "10%"
-msgstr "੧੦%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "20%"
-msgstr "੨੦%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "30%"
-msgstr "੩੦%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "40%"
-msgstr "੪੦%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "50%"
-msgstr "੫੦%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "60%"
-msgstr "੬੦%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "70%"
-msgstr "੭੦%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "80%"
-msgstr "੮੦%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "90%"
-msgstr "੯੦%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "100%"
-msgstr "੧੦੦%"
-
-#: ../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: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: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:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "ਨਵਾ� �ੰਮ(_T)"
-
-#: ../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: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: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: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:1604 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "�ੰਮ �ਾਰ� �ਰ�(_A)"
-
-#: ../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:1606
-msgid "_Mark as Complete"
-msgstr "ਨਿਸ਼ਾਨਾ ਪ�ਰਾ(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "��ਣ� �ੰਮ ਪ�ਰ� ਹ�� ਨਿਰਧਾਰਿਤ �ਰ�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "��ਣ� �ੰਮ ਨਾ-ਪ�ਰ� ਹ��� ਬਣਾ�(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "��ਣ� �ੰਮ ਹ�ਾ�(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "�ੰਮ ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
+msgid "Opening %s"
+msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ਮ��ੰਮਲ"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "�ੰਮ ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "ਮ��ੰਮਲ"
@@ -6363,7 +4991,7 @@ msgstr "ਮਿ�ਦ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
@@ -6371,153 +4999,117 @@ msgstr "ਪਹਿਲ"
 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: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:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ਸਥਿਤ�"
-
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "���ਮਾ� ਭ���"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "���ਮਾ� ਦ� �ਾਪ� �ਾਰ�"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "ਨਵ�� ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "ਨਵ�� ਮ��ਿੰ�(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "ਮ���ਦਾ �ਲ�(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "�ੱ� ��ਣ�(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "ਮਿਤ� ��ਣ�(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "ਪਰਿੰ� �ਰ�(_n)..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "��ਲੰਡਰ ਵਿੱ� ਨ�ਲ(_y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "��ਲੰਡਰ ਵਿੱ� ਭ���(_v)..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "�ਿਸਮ"
 
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "ਪ�ਰਤ�ਨਿਧ ਮ��ਿੰ�(_D)..."
+#: ../calendar/gui/e-calendar-view.c:392
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected events to the clipboard"
+msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
+#: ../calendar/gui/e-calendar-view.c:398
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected events to the clipboard"
+msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)..."
+#: ../calendar/gui/e-calendar-view.c:404
+#| msgid "Paste text from the clipboard"
+msgid "Paste events from the clipboard"
+msgstr "�ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� ��ਪ�"
 
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "�ਵਾਬ(_R)"
+#: ../calendar/gui/e-calendar-view.c:410
+#| msgid "Delete selected memos"
+msgid "Delete selected events"
+msgstr "��ਣ� �ਵ��� ਹ�ਾ�"
 
-#: ../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:1829
-msgid "Make this Occurrence _Movable"
-msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�(_M)"
-
-#: ../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:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
+msgid "Deleting selected objects"
+msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "ਸਾਰ��� ਮ���ਦ���� ਹ�ਾ�(_A)"
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
+msgid "Updating objects"
+msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../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:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../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:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2319
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "�ਰ��"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Needs action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "ਪ�ਰਬੰਧ�: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
+#, c-format
+msgid "Organizer: %s"
+msgstr "ਪ�ਰਬੰਧ�: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1886
 #, 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:102
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 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:105
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 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:113
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6531,12 +5123,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:747
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰ� ਵੰਡ"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 
@@ -6546,48 +5138,73 @@ 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:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:894
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:930
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:814
 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:827
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:816
 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:2309
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾ� (��ੰ�ਲਦਾਰ �ਵਰਤ�)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤ�"
 msgstr[1] "ਹਰ %d ਹਫਤ�"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6595,35 +5212,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:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " �ਤ� "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱ���"
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹ�ਨ�"
 msgstr[1] "ਮਹ�ਨ� ਵਿੱ� %d ਵਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6631,439 +5248,447 @@ 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:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", ਤ� ਸਮਾਪਤ�"
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "ਸ਼�ਰ�"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "ਬ�ਾ��"
 
-#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendar �ਲਤ�"
 
-#: ../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
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "�ਣ�ਾਣਾ ਵਿ��ਤ�"
 
 #  Describe what the user can do
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਤ� ਮ�� ਵਿ�ਾਰ �ਰ� �ਤ� ਮ�ਨ� ਤ�� ਤੱਦ ��� �ਾਰਵਾ� ��ਣ�।"
 
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#| msgid "None"
+msgctxt "cal-itip"
+msgid "None"
+msgstr "��� ਨਹ��"
+
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:1274
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� �� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲੰਡਰ ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1279
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "�ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ �ਿ� ਹ�, ਪਰ ਤ�ਹਾਡ� �ੰਮ ਸ��� ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1363
 #, 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:1362
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "ਮ��ਿੰ� ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "ਮ��ਿੰ� �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "ਮ��ਿੰ� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "ਮ��ਿੰ� ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "�ੰਮ ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "�ੰਮ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ਤਾ�� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "�ੰਮ �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "�ੰਮ ਰੱਦ��ਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "�ਲਤ ਵ�ਹਲਾ/ਰ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "ਸ�ਨ�ਹਾ �ਪਣ� ਸਹ�� ਸਰ�ਪ ਵਿੱ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਨਾ-ਸਹਾ�� ਬ�ਨਤ��� ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥ� ਵਿੱ� �ੱ� �ਾ�� ��ਲੰਡਰ ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��ਲੰਡਰ ��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "��ਾ� �ਲਤ ਹ� �ਤ� �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਿਲ �ਰਨਾ ਹ�?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "�ਲਤ ਹਾਲਤ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1408
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ਦਰਸ਼� ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ��ਾ� ਹ�ਣ �ਪਲੱਬਧ ਨਹ�� ਰਹ� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "��ਾ� ਭ���!\n"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "�ਾਰਵਾ� ��ਣ�"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "�ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "�ਵਾਬ ਦ�ਣ ਵਾਲਿ�� ਦ� ਹਾਲਤ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--ਵੱਲ--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "��ਲੰਡਰ ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "ਮਿਤ�:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "ਪ�ਰਬੰਧ�:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "ਸਰਵਰ ਸ�ਨ�ਹਾ:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "ਪ�ਰਧਾਨ"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "ਲ���ਦ� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "��ਣਵ�� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "ਸਰ�ਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
 msgid "Individual"
 msgstr "�ੱ�ਲਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ਸਮ�ਹ"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:965
 msgid "Resource"
 msgstr "ਸਰ�ਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:966
 msgid "Room"
 msgstr "�ਮਰਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:980
 msgid "Chair"
 msgstr "��ਰਸ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../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
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
 msgid "Required Participant"
 msgstr "ਲ���ਦ� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:982
 msgid "Optional Participant"
 msgstr "��ਣਵ�� ਭਾ� ਲ��ਣ ਵਾਲ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:983
 msgid "Non-Participant"
 msgstr "��� ਭਾ� ਲ�ਣ ਵਾਲਾ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:544
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼�                          "
 
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 msgid "In Process"
 msgstr "�ਾਰਵਾ� �ਧ�ਨ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7072,7 +5697,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7082,67 +5707,67 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤ�� ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "��� �ਾਣ�ਾਰ� ਨਹ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "ਦਰਸ਼�(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "��ਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ �ੰਮ-�ੰ�� ਹ� ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "��ਾਰ ਵੱਡਾ ਵ��ਾ�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ੱਪਡ��(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "ਸਵ�-��ਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� ਸਰ�ਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� �ੱ� ਸਰ�ਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "ਲ���ਦ� ਵਿ��ਤ�(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "ਲ���ਦ� ਲ�� ਤ� �ੱ� ਸਰ�ਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�(_E):"
 
@@ -7170,54 +5795,139 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮ��ਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "��ਣ� ਮ�ਮ� ਹ�ਾ�(_D)"
+#: ../calendar/gui/e-memo-table.c:410
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
+msgid "Memos"
+msgstr "ਮ�ਮ�"
+
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+msgid "* No Summary *"
+msgstr "* ਸੰ��ਪ ਨਹ�� *"
+
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+msgid "Start: "
+msgstr "ਸ਼�ਰ�:"
+
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+msgid "Due: "
+msgstr "ਬਾ��:"
+
+#: ../calendar/gui/e-memo-table.c:706
+#| msgid "Cut selected messages to the clipboard"
+msgid "Cut selected memos to the clipboard"
+msgstr "��ਣ� ਮ�ਮ� ਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
+
+#: ../calendar/gui/e-memo-table.c:712
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy selected memos to the clipboard"
+msgstr "��ਣ� ਮ�ਮ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../calendar/gui/e-memo-table.c:718
+#| msgid "Paste memo from the clipboard"
+msgid "Paste memos from the clipboard"
+msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਮ�ਮ� ��ਪ�"
 
-#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Delete selected memos"
+msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
+
+#: ../calendar/gui/e-memo-table.c:730
+#| msgid "Select all visible messages"
+msgid "Select all visible memos"
+msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਮ�ਮ� ��ਣ�"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"%s ਤ� �ਲਤ�:\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:529
+msgid "0%"
+msgstr "੦%"
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+#: ../calendar/gui/e-task-table.c:530
+msgid "10%"
+msgstr "੧੦%"
 
-#: ../calendar/gui/e-memos.c:897
-#, c-format
-msgid "Opening memos at %s"
-msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
+#: ../calendar/gui/e-task-table.c:531
+msgid "20%"
+msgstr "੨੦%"
 
-#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ..."
+#: ../calendar/gui/e-task-table.c:532
+msgid "30%"
+msgstr "੩੦%"
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+#: ../calendar/gui/e-task-table.c:533
+msgid "40%"
+msgstr "੪੦%"
 
-#: ../calendar/gui/e-tasks.c:1052
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s ਤ� �ੰਮ ��ਲ ਰਿਹਾ ਹ�"
+#: ../calendar/gui/e-task-table.c:534
+msgid "50%"
+msgstr "੫੦%"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "�ੰਮ ਪ�ਰ� �ਰ ਰਿਹਾ ਹ�..."
+#: ../calendar/gui/e-task-table.c:535
+msgid "60%"
+msgstr "੬੦%"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "ਨਿ�ਾਲਾ"
+#: ../calendar/gui/e-task-table.c:536
+msgid "70%"
+msgstr "੭੦%"
 
-#: ../calendar/gui/e-timezone-entry.c:124
+#: ../calendar/gui/e-task-table.c:537
+msgid "80%"
+msgstr "੮੦%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "90%"
+msgstr "੯੦%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "100%"
+msgstr "੧੦੦%"
+
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2006
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "�ੰਮ"
+
+#: ../calendar/gui/e-task-table.c:927
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected tasks to the clipboard"
+msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
+
+#: ../calendar/gui/e-task-table.c:933
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected tasks to the clipboard"
+msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../calendar/gui/e-task-table.c:939
+msgid "Paste tasks from the clipboard"
+msgstr "�ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਾਸ� ��ਪ�"
+
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Delete selected tasks"
+msgstr "��ਣ� �ਾਸ� ਹ�ਾ�"
+
+#: ../calendar/gui/e-task-table.c:951
+#| msgid "Select all visible messages"
+msgid "Select all visible tasks"
+msgstr "ਸਭ ਦਿਸ ਰਹ��� �ਾਸ�ਾ� ��ਣ�"
+
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 
@@ -7227,108 +5937,244 @@ 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:376 ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "�ਲ� ਸ�ਧ(_C)"
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "�ਸ ਲ� �ਲਾਰਮ ਹ�।"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "ਸ�ਧ �ਲ� ਸੰਭਾਲ�(_S)"
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�।"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�(_D)..."
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "�ੱ� ਮ��ਿੰ� ਹ�।"
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "%s �ੱਤ� ਮ�ਲਾ�ਾਤ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�"
+msgid "Calendar Event: Summary is %s."
+msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: %s ਸੰ��ਪ ਹ�।"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: ��� �ਾਣ�ਾਰ� ਨਹ�� ਹ�।"
+
+#: ../calendar/gui/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "��ਲੰਡਰ ਵ��ਣ ��ਨਾ"
+
+#: ../calendar/gui/ea-cal-view-event.c:527
+msgid "Grab Focus"
+msgstr "ਫ��ਸ ਲਵ�"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "ਨਵ��� ਸਾਰਾ ਦਿਨ ��ਨਾਵਾ�"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "ਨਵ�� ਮ��ਿੰ�"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "�ੱ� 'ਤ� �ਾ�"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "ਮਿਤ� 'ਤ� �ਾ�"
+
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
+msgid "a table to view and select the current time range"
+msgstr "ਮ���ਦਾ ਸਮ�� ਸ�ਮਾ ਵ��ਣ �ਤ� ��ਣਨ ਲ� �ੱ� ��ਬਲ"
+
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "%s ਤ� �ੰਮ ਲ�ਡ �ਰ�"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "�ਸ ਵਿੱ� %d ��ਨਾ ਹ�"
+msgstr[1] "�ਸ ਵਿੱ� %d ��ਨਾਵਾ� ਹਨ।"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "�ਸ ਵਿੱ� ��� ��ਨਾ ਨਹ�� ਹ�।"
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
-msgid "Loading memos at %s"
-msgstr "%s �ੱਤ� ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+msgid "Work Week View: %s. %s"
+msgstr "�ੰਮ ਹਫਤਾ �ਲ�: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
-msgid "Opening %s"
-msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+msgid "Day View: %s. %s"
+msgstr "ਦਿਨ �ਲ�: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for a work week"
+msgstr "�ੰਮ ਹਫਤ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
+
+#: ../calendar/gui/ea-day-view.c:199
+msgid "calendar view for one or more days"
+msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਦਿਨਾ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
+
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "�ਨ�ਮ ��ਲੰਡਰ"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:890
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/gnome-cal.c:4012
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "�ੰਪ ਬ�ਨ"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "ਹ�ਰ ��ਨਾਵਾ� ਵ��ਣ ਲ� �ਸ ਨ�ੰ ਦਬਾ�।"
+
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "ਮਹ�ਨਾ �ਲ�: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "ਹਫਤਾ �ਲ�: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
+
+#: ../calendar/gui/gnome-cal.c:2144
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-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:13
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "�ਪਰ�ਲ"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "��ਸਤ"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "ਦਸੰਬਰ"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "ਫਰਵਰ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "�ਨਵਰ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "��ਲਾ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "��ਨ"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "ਮਾਰ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "ਮ�"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "ਨਵੰਬਰ"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "��ਤ�ਬਰ"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "ਮਿਤ� ��ਣ�"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "ਸਤੰਬਰ"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "�ੱ� ��ਣ�(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
 msgid "Event information"
 msgstr "��ਨਾ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
 msgid "Task information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
 msgid "Memo information"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
 msgid "Free/Busy information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:646
 msgid "Calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
@@ -7336,7 +6182,7 @@ msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:680
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
@@ -7345,7 +6191,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:684
+#: ../calendar/gui/itip-utils.c:687
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
@@ -7357,7 +6203,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:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
@@ -7366,7 +6212,7 @@ msgstr "�ਨ�ਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:701
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
@@ -7374,7 +6220,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:711
+#: ../calendar/gui/itip-utils.c:714
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵ�ਨ"
@@ -7382,7 +6228,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:718
+#: ../calendar/gui/itip-utils.c:721
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
@@ -7390,7 +6236,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:725
+#: ../calendar/gui/itip-utils.c:728
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮ��-ਤਾ�ਾ"
@@ -7398,430 +6244,230 @@ 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:732
+#: ../calendar/gui/itip-utils.c:735
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ਲ� ਸ��ਾ�"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:805
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� (%s ਤ�� %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:813
 msgid "iCalendar information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "ਸਮਾ�ਮ ਲ� ਤ�ਸ�� ਦਰਸ਼� ਹ�ਣ� �ਾਹ�ਦ� ਹ�"
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
-
-#: ../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: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:609
-msgid "Failed upgrading memos."
-msgstr "ਮ�ਮ� �ੱਪ�ਰ�ਡ �ਸਫ਼ਲ ਰਿਹਾ ਹ�।"
-
-#: ../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:752
-msgid "There is no calendar available for creating memos"
-msgstr "ਮ�ਮ� ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "ਮ�ਮ� ਸਰ�ਤ ��ਣ�ਾਰ"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "ਨਵਾ� ਮ�ਮ�"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "ਮ�ਮ�(_o)"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ��ਾ� ਬਣਾ�"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ�"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "�ੱ� ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "ਨਵਾ� ਮ�ਮ� ਲਿਸ�"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
-
-#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "ਮ�ਮ� ਪਰਿੰ� �ਰ�"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:833
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� �ਵ�ਲ�ਸ਼ਨ �ੰਮ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਤਬਦ�ਲ ਹ� ��ੱ�� ਹ�।\n"
-"\n"
-"�ਿਰਪਾ �ਰ�� �ਡ�� �ਰ�, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
 
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:835
+msgid "Unable to book a resource, error: "
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�। \n"
-"\n"
-"�ਿਰਪਾ �ਰ�� ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ�, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
 
-#  FIXME: set proper domain/code
-#. FIXME: set proper domain/code
-#: ../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:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "��ਲੰਡਰ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
-
-#  FIXME: domain/code
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
+#: ../calendar/gui/itip-utils.c:988
+msgid "You must be an attendee of the event."
+msgstr "ਸਮਾ�ਮ ਲ� ਤ�ਸ�� ਦਰਸ਼� ਹ�ਣ� �ਾਹ�ਦ� ਹ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "੧ਲਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "੪ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "�ਤ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "ਸ�ਮ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "ਮੰ�ਲ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "ਬ�ੱਧ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "ਵ�ਰ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "ਸ਼�ੱ�ਰ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "ਸ਼ਨਿ�ੱਰ"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2525
 msgid "Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2527
 msgid "Task"
 msgstr "�ਾਸ�"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2552
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2575
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2629
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2644
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2668
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2679
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "ਨਵ�� �ੰਮ ਲਿਸ�(_N)"
-
-#: ../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:602
-msgid "Failed upgrading tasks."
-msgstr "�ੰਮ �ੱਪ�ਰ�ਡ �ਸਫਲ ਹ�।"
-
-#: ../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:748
-msgid "There is no calendar available for creating tasks"
-msgstr "�ੰਮ ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "�ੰਮ ਸਰ�ਤ ��ਣ�ਾਰ"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "ਨਵਾ� �ੰਮ"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "�ੰਮ(_T)"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "ਨਵਾ� �ੰਮ ਦਿ�"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "ਨਵ�� �ੰਮ ਸ��� "
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "�ੰਮ ਲਿਸ�(_k)"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
-
-#: ../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"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"�ਸ �ਾਰਵਾ� ਨਾਲ ਸਾਰ� ��ਣ��� �ਾਰਵਾ��� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ��� �ਾਣ����। ���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� �ਹ "
-"�ੰਮ ਮ�� ਮਿਲ ਨਾ ਸ�ਣ��।\n"
-"\n"
-"�� ਤ�ਸ�� �ਹਨਾ� �ੰਮਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
-
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
-
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "�ੰਮ ਪਰਿੰ� �ਰ�"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7848,8 +6494,8 @@ msgid "Appointments and Meetings"
 msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1820
 msgid "Opening calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -7873,11 +6519,11 @@ msgstr "vCalendar ਫਾ�ਲਾ� (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ਼ਲ ��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
@@ -8433,7 +7079,7 @@ msgid "America/Nassau"
 msgstr "�ਮਰ��ਾ/ਨੱਸਾ�"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "�ਮਰ��ਾ/ਨਿ�ਯਾਰ�"
 
@@ -9433,192 +8079,177 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "ਸੰਪਾਦ� ਤ�� ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "�ੰ� ਸੰਭਾਲ�..."
+
+#: ../composer/e-composer-actions.c:281
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਬੰਦ �ਰ�"
 
-#: ../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:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "ਪਰਿੰ� �ਰ�(_P)..."
 
-#: ../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
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "�ਪਾ� �ਲ�(_v)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "�ੰ� ਸੰਭਾਲ�(_A)..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਨ�ੰ ਵੱ�ਰ� ਨਾ� ਨਾਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�(_D)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
 msgid "S_end"
 msgstr "ਭ���(_e)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ���"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
 
-#: ../composer/e-composer-actions.c:394
-msgid "_Security"
-msgstr "ਸ�ਰੱ�ਿ�(_S)"
-
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP �ੰ��ਰਿਪ�(_E)"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ PGP ਨਾਲ �ੰ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤ�ਤ(_S)"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "�ਪਣ� PGP �� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "ਦਰ�ਾ ਸ�ਨ�ਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "ਸ�ਨ�ਹ� ਦਾ ਦਰ�ਾ ਵਧਾ�"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ�(_q)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "�ਦ�� ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਪ�ਿ� �ਾਵ� ਤਾ� ਪ�ਰਾਪਤ� ਸ��ਨਾ ਲਵ�"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾ�ਨ(_n)"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ਪਣ� S/MIME ਦਸਤ�ਤ ਸਰ��ਫਿ��� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "_Bcc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ BCC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "_Cc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ CC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "ਵੱਲ�� ��ਤਰ(_F)"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ�� ��ਣ�ਾਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "�ਵਾਬ ��ਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਵਾਬ ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-header.c:120
-#| msgid "Sho_w: "
+#: ../composer/e-composer-header.c:129
 msgid "Show"
 msgstr "ਵ���"
 
-#: ../composer/e-composer-header.c:123
-#| msgid "_Hide"
+#: ../composer/e-composer-header.c:137
 msgid "Hide"
 msgstr "�ਹਲ�"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾਪਤ �ਰਤਾ ਭਰ�"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ਹ ਸਿਰਨਾਵ�� ਦਿ�, �� �ਿ ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:47
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -9627,89 +8258,92 @@ msgstr ""
 "�ਡਰ�ੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "ਵਲ��(_o):"
 
-#: ../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
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../composer/e-composer-header-table.c:954
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "�ਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
 
 #  * Post-To
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "ਭ���(_P):"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "ਦਸਤ�ਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "ਭ��ਣ ਲ� ਨਿਯਤ"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-private.c:208
-#| msgid "Save Draft"
+#: ../composer/e-composer-private.c:284
 msgid "Save draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-msg-composer.c:807
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
+
+#: ../composer/e-msg-composer.c:983
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰ� ਸ�ਨ�ਹ� ਲ� ਦਸਤ�ਤ ਨਹ� ��ਤ� �ਾ ਸ�ਦ�: �ਸ ��ਾ��� ਲ� ��� ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ��ਾ��� ਲ� ��� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1379
+#| msgid "Unable to retrieve message from editor"
+msgid "Unable to reconstruct message from autosave file"
+msgstr "���ਸ�ਵ ਫਾ�ਲ ਤ�� ਸ�ਨ�ਹਾ ਫ�ਰ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ"
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3310
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9778,22 +8412,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "���ਮ��ਿ� ਫਾ�ਲ &quot;{0}&quot; ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "ਡਾ�ਰ���ਰ��� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤ��� �ਾ ਸ�ਦ��� ਹਨ।"
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "�� ਤ�ਸ�� ਨਾ ਸਮਾਪਤ ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ਡਾ�ਨਲ�ਡ �ਾਰ� ਹ�। �� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "���ਮ��ਿ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ� �ਿ��ਿ &quot;{1}&quot;"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9801,29 +8431,11 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� ��ਾਨ� ਬੰਦ ਹ� �� ਸ�, �ਦ�� �ਿ ਤ�ਸ�� �ੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ� ਰਹ� ਸ�।ਪੱਤਰ ਮ��-ਪ�ਰਾਪਤ "
 "�ਰਨ ਨਾਲ ਤ�ਹਾਨ�ੰ �ਸ ��ਾ� ਤ�� ਮ�� �ਾਲ� �ਰਨ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�, �ਿੱਥ� �ੱਡਿ� ਸ�।"
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr "ਭ��ਣ ��ਣ ਸਿਰਫ਼ ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼ �ਤ� ਮਾ��ਰ�ਸਾਫ਼� ��ਸ਼���਼ ��ਾ��� ਲ� ਹ� �ਪਲੱਬਧ ਹ�।"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "ਭ��ਣ ��ਣ �ਪਲੱਬਧ ਨਹ�� ਹ�।"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "ਫਾ�ਲ `{0}' ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ� �ਤ� ਸ�ਨ�ਹ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"�ਸ ਡਾ�ਰ���ਰ� ਦ� ਭਾ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਾ� ਤਾ� ਸਾਰ��� ਫਾ�ਲਾ� �ੱ� �ੱ� �ਰ�� ਸ਼ਾਮਿਲ �ਰ� �ਾ� "
-"ਡਾ�ਰ���ਰ� ਦਾ �ੱ� ��ਾ�ਵ ਬਣਾ� ਤ� �ਹਨਾ� ਨ�ੰ ਨੱਥ� �ਰ ਦਿ�।"
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9835,53 +8447,58 @@ msgstr ""
 "�ਿਰਪਾ �ਰ�� �ਹ ਯ��ਨ ਬਣਾ ਲਵ�� �ਿ ਤ�ਹਾਡ� ��ਲ gtkhtml �ਤ� libgtkhtml ਦਾ ਸਹ�� ਵਰ�ਨ �ੰਸ�ਾਲ "
 "ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "�ਡਰ�ੱਸ ��ਣ�ਾਰ �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#  mail-composer:recover-autosave title
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "ਨਾ-ਸਮਾਪਤ ਸ�ਨ�ਹ� ਲੱਭ� ਹਨ"
-
-#  mail-composer:exit-unsaved title
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "��ਤਾਵਨ�: ਸ�ਧਿ� ਸ�ਨ�ਹਾ"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ `{0}' ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "ਪੱਤਰ ਲਿ�ਣ ਤ�� ਪਹਿਲਾ� �ੱ� ��ਾ��� ਸੰਰ�ਿਤ �ਰਨ ਦ� ਲ�� ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "�ਡ��ਿੰ� �ਾਰ� ਰੱ��(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "ਪ�ਰਾਪਤ(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#| msgid "Calendar information"
+msgid "Calendar event notifications"
+msgstr "��ਲੰਡਰ �ਵ��� ਨ���ਫਿ��ਸ਼ਨ"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#| msgid "Evolution Elm importer"
+msgid "Evolution Alarm Notify"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਾਰਮ ਨ���ਫਿ��ਸ਼ਨ"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
+msgid "Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ�ਲ �ਤ� ��ਲੰਡਰ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "ਸਮ�ਹਿ� ਸਰ�ਪ"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ���, ਸੰਪਰ� �ਤ� ਸ਼�ਡਿ�ਲ ਦਾ ਪਰਬੰਧ �ਰ�"
 
@@ -9893,140 +8510,251 @@ msgstr "�ਡਰਸ �ਾਰਡ"
 msgid "calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+#| msgid "Cancelled"
+msgid "%s (cancelled)"
+msgstr "%s (ਰੱਦ �ਰ�)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+#| msgid "%s (%d%% complete)"
+msgid "%s (completed)"
+msgstr "%s (ਸਮਾਪਤ)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+#| msgid "%s (...)"
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% ਸਮਾਪਤ)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
+
+#  setup a dummy error
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "�ਰਬ�"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "ਬਾਲ�ਿ�"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "���ਦਰ� ਯ�ਰਪ�"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "��ਨ"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "ਸਰ�ਲਿ�"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "�ਰ��"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "ਹ�ਬਰਿ�"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "�ਾਪਾਨ�"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "��ਰ��"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "ਥਾ�"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "ਤ�ਰ�ਿਸ਼"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "ਯ�ਨ���ਡ"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "ਪੱ�ਮ� ਯ�ਰਪ"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "ਪੱ�ਮ� ਯ�ਰਪ, ਨਵਾ�"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "ਪ�ਰਾਤਨ"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "ਸਧਾਰਨ"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "ਯ��ਰ�ਨ"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+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
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "�ੱ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "�ੱਲ�ਹ"
 
-#: ../e-util/e-datetime-format.c:202
-#| msgid "Yesterday %l:%M %p"
+#: ../e-util/e-datetime-format.c:204
 msgid "Yesterday"
 msgstr "�ੱਲ�ਹ"
 
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #, 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"
+#: ../e-util/e-datetime-format.c:209
+#, c-format
 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"
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "ਲ���ਲ ਡਿਫਾਲ� ਵਰਤ��"
 
-#: ../e-util/e-datetime-format.c:494
-#| msgid "Format"
+#: ../e-util/e-datetime-format.c:496
 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 "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
-
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
+#: ../e-util/e-file-utils.c:136
+#| msgid "Unknown type"
+msgid "(Unknown Filename)"
+msgstr "(�ਣ�ਾਣ ਫਾ�ਲ ਨਾ�)"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਾਣ�ਾਰ�"
-
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+#| msgid "Pinging %s"
+msgid "Writing \"%s\""
+msgstr "\"%s\" ਲਿ�� �ਾ ਰਹ� ਹ�"
 
-#  setup a dummy error
-#. setup a dummy error
-#: ../e-util/e-error.c:448
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
+#| msgid "Copying `%s' to `%s'"
+msgid "Writing \"%s\" to %s"
+msgstr "`%s' ਨ�ੰ `%s' �ੱਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "ਭਾ�"
+#: ../e-util/e-logger.c:175
+#| msgid "Name of the component being logged"
+msgid "Name of the logger"
+msgstr "ਲਾ�ਰ ਦਾ ਨਾ�"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "ਲਾ� ਰੱ�ਣ ਵਾਲ� ਭਾ� ਦਾ ਨਾ�"
+#: ../e-util/e-module.c:188
+#| msgid "F_ilename:"
+msgid "Filename"
+msgstr "ਫਾ�ਲ-ਨਾ�"
+
+#: ../e-util/e-module.c:189
+#| msgid "Change the name of this folder"
+msgid "The filename of the module"
+msgstr "ਮ�ਡ��ਲ ਦਾ ਫਾ�ਲ ਨਾ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ਡ�ਬੱ� ਲਾ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ��� ਵ���(_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "ਸ�ਿੰ�।"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "ਲਾ� ਸ�ਨ�ਹ�:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "ਲਾ� ਲ�ਵਲ"
 
-#: ../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:292 ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ਸ�ਨ�ਹ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "�ਲਤ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "�ਲਤ���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "��ਤਾਵਨ��� �ਤ� �ਲਤ���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "ਡ�ਬੱ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "�ਲਤ���, ��ਤਾਵਨ��� �ਤ� ਡ�ਬੱ� ਸ�ਨ�ਹ�"
 
-#: ../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:718
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "ਯ�� ��ਤਾ"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
 
@@ -10042,7 +8770,7 @@ msgstr "ਪਰਿ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� 
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਰ �ਾਣ�ਾਰ� ਨਹ�� ਦਿੱਤ� ਹ�।"
 
-#: ../e-util/e-signature.c:690
+#: ../e-util/e-signature.c:699
 msgid "Autogenerated"
 msgstr "ਸਵ�-ਨਿਰਮਤ"
 
@@ -10052,7 +8780,7 @@ msgstr "ਸਵ�-ਨਿਰਮਤ"
 #  mail:no-delete-folder secondary
 #  system:no-save-file secondary
 #  system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "�ਿ���ਿ \"{1}\""
 
@@ -10072,256 +8800,305 @@ msgstr "�� ਤ�ਸ�� �ੱਪਰ ਲਿ�ਣਾ �ਾਹ�ੰਦ
 msgid "File exists \"{0}\"."
 msgstr "ਫਾ�ਲ ਮ���ਦ \"{0}\" ਹ�।"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "�ੱਪਰ ਲ਼ਿ��?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "�ੱਤ� ਲਿ��(_O)"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "ਸਬੰਧ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਮੱਦਦ ਵ��ਾ� ਨਹ�� �ਾ ਸ��।"
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "�ਾਸ(_m)"
+#: ../e-util/gconf-bridge.c:1276
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf �ਲਤ�: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "�ੰਮ(_W)"
+#: ../e-util/gconf-bridge.c:1287
+msgid "All further errors shown only on terminal."
+msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "ਨਿੱ��(_P)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#  forest green
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "�ਰਨ ਲ�(_T)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "ਬਾ�ਦ '�(_L)"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "ਲ�ਬਲ ਨਾ�(_N):"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+msgid "Subject"
+msgstr "ਵਿਸ਼ਾ"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "ਲ�ਬਲ ਸ�ਧ"
+#  pseudo-header
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "ਮ�ਲਰ"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+msgid "-------- Forwarded Message --------"
+msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "ਲ�ਬਲ ਨਾ� �ਾਲ� ਨਹ�� ਹ� ਸ�ਦਾ ਹ�।"
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:567
+msgid "Date"
+msgstr "ਮਿਤ�"
 
-#: ../e-util/e-util-labels.c:367
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr "ਸਰਵਰ �ੱਤ� ਪਹਿਲਾ� ਹ� �ੱ� ਲ�ਬਲ �ਸ ��� ਨਾਲ ਮ���ਦ ਹ�। �ਪਣਾ ਲ�ਬਲ ਨਾ� ਬਦਲ� ��।"
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "ਫ�ਸ"
+
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf �ਲਤ�: %s"
+msgid "%s attachment"
+msgstr "%s ਨੱਥ�"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
+
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
+
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+msgid "Unknown error verifying signature"
+msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message"
+msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "PGP ਸ�ਨ�ਹ� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../filter/filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸ�ਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਸ�ਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸ�ਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸ�ਿੰ�"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਿੰ�"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ �ੰ�ਾ ਪਹਿਲਾ�"
 msgstr[1] "%d �ੰ�ਾ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� ੧ �ੰ�ਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� %d �ੰ��"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾ�"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "��ਣ ਵਾਲ� ੧ ਦਿਨ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਦਿਨ"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� ੧ ਹਫ਼ਤਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� %d ਹਫ਼ਤ�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹ�ਨਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਹ�ਨ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਹ�ਨਾ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਹ�ਨ�"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾ�"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸਾਲ"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤ� ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "ਹ�ਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
-msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
-
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "�ਾ��"
+#: ../filter/e-filter-file.c:184
+#| msgid "Choose a file"
+msgid "Choose a File"
+msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾ�(_u):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "���ਮਾ� ਲੱਭ�, �� �ਿ ਹ�ਠ ਦਿੱਤ� ਸ�ਮਾਵਾ� ਨ�ੰ ਪ�ਰ� �ਰਦ� ਹ�ਵ�"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "���ਰ ਸਭ ਸ�ਮਾ ਮ�ਲ �ਾਣ ਤਾ�"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "��ਾ� ���(_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "�ਵਾਬ"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "�ਵਾਬ ਤ� ਮ�ੱਢਲ�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "��� �ਵਾਬ �ਾ� ਮ�ੱਢਲਾ ਨਹ��"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "ਨਿਯਮ ����ਹ�"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "ਨਿਯਮ ਸ�ਧ"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "�ਲਤ ਨਿਯਮਿਤ ਸਮ��ਾਰਨ &quot;{0}&quot; ਹ�।"
@@ -10345,7 +9122,7 @@ msgstr "ਫਾ�ਲ਼ ਨਾ� ��ੰਮ ਹ�।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "ਨਾ� ��ੰਮ ਹ�।"
 
@@ -10370,19 +9147,15 @@ msgstr "�ਸ ਫਿਲ�ਰ ਲ� ਨਾ� ਦ�ਣਾ �ਾਹ�ਦਾ
 msgid "You must specify a file name."
 msgstr "ਤ�ਹਾਨ�ੰ ਫਾ�ਲ ਨਾ� ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>ਫਿਲ�ਰ ਨਿਯਮ(_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "ਨਾਲ ਮ�ਲ �ਰ�"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "ਪੱਤਰਾ� ਲ� ਫਿਲ�ਰ ਵ��ਾ�:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10390,7 +9163,7 @@ msgstr ""
 "ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨਿਰਧਾਰਿਤ ਮਿਤ� ਦ� ੧੨:੦੦ ਸਵ�ਰ\n"
 "ਨਾਲ �ਾ��� �ਾਵ���।"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10398,7 +9171,7 @@ msgstr ""
 "ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਫਿਲ�ਰ �ਲਾ�ਣ ਦ� ਸ�ਨ�ਹ� ਨਾਲ ਮਿਲਾ�\n"
 "�ਾਵ���।"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10406,242 +9179,951 @@ msgstr ""
 "ਫਿਲ�ਰ ਲ�ਾ�ਣ ਦ� ਦ�ਰਾਨ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨ�ੰ ਮ���ਦਾ ਮਿਤ�\n"
 " ਨਾਲ ਮਿਲਾ�� �ਾਵ��ਾ।"
 
-#: ../filter/filter.glade.h:12
-#| msgid "in the future"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "ਫਿਲ�ਰ ਨਿਯਮ(_F)"
+
+#: ../filter/filter.ui.h:12
+#| msgid ""
+#| "the current time\n"
+#| "the time you specify\n"
+#| "a time relative to the current time"
+msgid "a time relative to the current time"
+msgstr "ਮ���ਦਾ ਸਮ�� ਦ� �ਨ�ਸਾਰ ਸਮਾ�"
+
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "ਪਹਿਲਾ�"
+
+#: ../filter/filter.ui.h:16
+#| msgid ""
+#| "ago\n"
+#| "in the future"
+msgid "in the future"
+msgstr "ਭਵਿੱ� ਵਿੱ�"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "ਮਹ�ਨ�"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "ਸ�ਿੰ�"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "ਮ���ਦਾ ਸਮਾ�"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤਾ ਹ�"
+
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:519
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "ਹਫਤ�"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "ਸਾਲ"
+
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "����ਮ���"
+msgstr[1] "����ਮ���"
+
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
+msgid "Icon View"
+msgstr "���ਾਨ �ਲ�"
+
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
+msgid "List View"
+msgstr "ਲਿਸ� �ਲ�"
+
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:634
+msgid "Focus Tracker"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:739
+#| msgid "Selection Mode"
+msgid "Shell Module"
+msgstr "ਸ਼�ੱਲ ਮ�ਡ��ਲ"
+
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+msgid "The mail shell backend"
+msgstr "ਮ�ਲ ਸ਼�ੱਲ ਬ����ਡ"
+
+#: ../mail/e-mail-browser.c:750
+#| msgid "Deleted"
+msgid "Show Deleted"
+msgstr "ਹ�ਾ� ਵ���"
+
+#: ../mail/e-mail-browser.c:751
+#| msgid "Forwarded messages"
+msgid "Show deleted messages"
+msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� ਵ���"
+
+#: ../mail/e-mail-display.c:66
+#| msgid "_Add to Address Book"
+msgid "_Add to Address Book..."
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਲ(_A)..."
+
+#: ../mail/e-mail-display.c:73
+#| msgid "_To this Address"
+msgid "_To This Address"
+msgstr "�ਹ �ਡਰ�ੱਸ ਨ�ੰ(_T)"
+
+#: ../mail/e-mail-display.c:80
+#| msgid "_From this Address"
+msgid "_From This Address"
+msgstr "�ਹ �ਡਰ�ੱਸ ਤ��(_F)"
+
+#: ../mail/e-mail-display.c:89
+#| msgid "Create _Search Folder"
+msgid "Create Search _Folder"
+msgstr "��� ਫ�ਲਡਰ ਬਣਾ�(_F)"
+
+#: ../mail/e-mail-label-dialog.c:220
+#| msgid "Label _Name:"
+msgid "_Label name:"
+msgstr "ਲ�ਬਲ ਨਾ�(_L):"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "�ਾਸ(_m)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "�ੰਮ(_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "ਨਿੱ��(_P)"
+
+#  forest green
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "�ਰਨ ਲ�(_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "ਬਾ�ਦ '�(_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:515
+msgid "Add Label"
+msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "ਲ�ਬਲ ਸ�ਧ"
+
+#: ../mail/e-mail-label-manager.c:349
+#| msgid ""
+#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgid ""
-"ago\n"
-"in the future"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"ਪਹਿਲਾ�\n"
-"ਭਵਿੱ� ਵਿੱ�"
+"ਨ��: ਲ�ਬਲ ਨਾ� ਵਿੱ� ਹ�ਠਾ� ਲਾ�ਨ ਨ�ੰ ਮ�ਨ� ਵਿੱ� ਨ�ਮ�ਨਿ�\n"
+"ਪ�ਾਣ�ਰਤਾ ਵਾ��।"
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "ਰੰ�"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:908
+msgid "Inbox"
+msgstr "��ਣ-ਬ�ਸਾ"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+msgid "Drafts"
+msgstr "ਡਰਾਫ�"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+msgid "Outbox"
+msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+msgid "Sent"
+msgstr "ਭ���"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "��ਪਲ��"
+
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "�ਾਸ"
+
+#  forest green
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "�ਰਨ-ਲ�"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "ਬਾ�ਦ ਵਿੱ�"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "ਮਾ��ਰ��"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "'%s' ਨ�ੰ ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
+
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "ਨਵਾ� ਫ�ਲਡਰ `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "ਫ�ਲਡਰ `%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "`%s' ਤ� �ਪਲੱਬਧ ਪੱਤਰ-ਬ�ਸਿ�� ਦ� �ਾ�� ਲ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ"
+
+#: ../mail/e-mail-migrate.c:1816
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
+"\n"
+"�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
+
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਪ�ਰਾਣ� ਡਾ�� `%s' ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�� ਡਾ�ਾ ਡਾ�ਰ���ਰ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਡਾ�ਾ `%s' ਦ� �ਾਪ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../filter/filter.glade.h:14
+#: ../mail/e-mail-migrate.c:2913
 msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ਸ�ਿੰ�\n"
-"ਮਿੰ� "
-"�ੰ��\n"
-"ਦਿਨ\n"
-"ਹਫ਼ਤ�\n"
-"ਮਹ�ਨ�\n"
-"ਸਾਲ"
+"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦਾ ਸੰ��ਪ ਫਾਰਮ�� �ਵ�ਲ�ਸ਼ਨ ੨.੨੪ ਬਾ�ਦ SQLite ਲ� ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
+"\n"
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ਹ�ਣ ਤੱ� ਸਬਰ ਰੱ�� ��..."
 
-#: ../filter/filter.glade.h:21
-#| msgid "a time relative to the current time"
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
+
+#: ../mail/e-mail-migrate.c:3008
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "`%s' �ੱਤ� ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../mail/e-mail-migrate.c:3026
+#, c-format
 msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
-"ਮ���ਦਾ ਸਮਾ�\n"
-"ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ ਸਮਾ�\n"
-"ਮ���ਦਾ ਸਮ�� ਦ� �ਨ�ਸਾਰ ਸਮਾ�"
+"ਪ�ਰਾਣ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਪ��ਹਨ ਤ�� �ਸਫਲ, `evolution/config.xmldb' ਮ���ਦ ਨਹ�� ਹ� �ਾ� ਨਿ�ਾਰਾ "
+"ਹ� �� ਹ�।"
 
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "ਨਿਯਮ ����ਹ�"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:580
+#| msgid "Do not ask me again."
+msgid "Do not ask me again"
+msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "ਨਿਯਮ ਸ�ਧ"
+#: ../mail/e-mail-reader.c:194 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "ਨਿਯਮ ਨਾ�"
+#: ../mail/e-mail-reader.c:194 ../mail/em-folder-utils.c:385
+msgid "C_opy"
+msgstr "�ਾਪ� �ਰ�(_o)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "�ੰਪ��਼ਰ ਪਸੰਦ"
+#: ../mail/e-mail-reader.c:568 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "ਮ�ਲ ਪਸੰਦ ਦ� ਸੰਰ�ਨਾ, �ਿਸ ਵਿੱ� ਸ�ਰੱ�ਿ� �ਤ� ਸ�ਨ�ਹਾ ਡਿਸਪਲ�� ਵ� ਸ਼ਾਮਿਲ ਹਨ, �ੱਥ� �ਰ�।"
+#: ../mail/e-mail-reader.c:568 ../mail/em-folder-utils.c:385
+msgid "_Move"
+msgstr "ਭ���(_M)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "ਸ਼ਬਦ-���, ਦਸਤ�ਤ �ਤ� ਸ�ਨ�ਹ ਲ��� ਦ� ਸੰਰ�ਨਾ �ੱਥ� �ਰ�"
+#: ../mail/e-mail-reader.c:794
+#| msgid "Save Message..."
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
+msgstr[1] "ਸ�ਨ�ਹ� ਸੰਭਾਲ�"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:815 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+#| msgid "Message"
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ਸ�ਨ�ਹਾ"
+msgstr[1] "ਸ�ਨ�ਹ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ��� �ੱਥ� ਸੰਰ�ਿਤ �ਰ�"
+#: ../mail/e-mail-reader.c:1073
+msgid "A_dd Sender to Address Book"
+msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�(_d)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "�ਪਣ� ਨ�ੱ�ਵਰ� ��ਨ��ਸ਼ਨ ਸਥਾਪਨ �ੱਥ� ਸੰਰ�ਿਤ �ਰ�"
+#: ../mail/e-mail-reader.c:1075
+#| msgid "Add Sender to Address Book"
+msgid "Add sender to address book"
+msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ"
+#: ../mail/e-mail-reader.c:1080
+msgid "Check for _Junk"
+msgstr "�ੰ� ਲ� �ਾ��(_J)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ��ਾ��� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+#: ../mail/e-mail-reader.c:1082
+msgid "Filter the selected messages for junk status"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਬ��ਾਰ ਸਥਿਤ� ਲ� �ਾ���"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਭਾ�"
+#: ../mail/e-mail-reader.c:1087
+msgid "_Copy to Folder..."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ�(_C)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ"
+#: ../mail/e-mail-reader.c:1089
+msgid "Copy selected messages to another folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+#: ../mail/e-mail-reader.c:1094
+msgid "_Delete Message"
+msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਪਸੰਦ �ੰ�ਰ�ਲ"
+#: ../mail/e-mail-reader.c:1096
+msgid "Mark the selected messages for deletion"
+msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੱ�ਵਰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+#: ../mail/e-mail-reader.c:1101
+msgid "Filter on Mailing _List..."
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� ਫਿਲ�ਰ(_L)..."
 
-#: ../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:620 ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "ਪੱਤਰ"
+#: ../mail/e-mail-reader.c:1103
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "ਪੱਤਰ ��ਾ���"
+#: ../mail/e-mail-reader.c:1108
+msgid "Filter on _Recipients..."
+msgstr "ਸ�ਨ�ਹ��� ਤ� ਫਿਲ�ਰ(_R)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "ਪੱਤਰ ਪਸੰਦ"
+#: ../mail/e-mail-reader.c:1110
+msgid "Create a rule to filter messages to these recipients"
+msgstr "�ਹਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
+#: ../mail/e-mail-reader.c:1115
+msgid "Filter on Se_nder..."
+msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "ਪੱਤਰ(_M)"
+#: ../mail/e-mail-reader.c:1117
+msgid "Create a rule to filter messages from this sender"
+msgstr "�ਹਨਾ� ਭ��ਣ�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../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-mail-reader.c:1122
+msgid "Filter on _Subject..."
+msgstr "ਵਿਸ਼� ਤ� ਫਿਲ�ਰ(_S)..."
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Create a rule to filter messages with this subject"
+msgstr "�ਸ ਵਿਸ਼� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
+
+#: ../mail/e-mail-reader.c:1129
+msgid "A_pply Filters"
+msgstr "ਫਿਲ�ਰ ਲ�ਾ�(_p)"
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Apply filter rules to the selected messages"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ� ਫਿਲ�ਰ ਨਿਯਮ ਲਾ�� �ਰ�"
+
+#: ../mail/e-mail-reader.c:1136
+msgid "_Find in Message..."
+msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Search for text in the body of the displayed message"
+msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
+
+#: ../mail/e-mail-reader.c:1143
+msgid "_Clear Flag"
+msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
+
+#: ../mail/e-mail-reader.c:1145
+#| msgid "Create a new task from the selected message"
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ�� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਹ�ਾ�"
+
+#: ../mail/e-mail-reader.c:1150
+msgid "_Flag Completed"
+msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
+
+#: ../mail/e-mail-reader.c:1152
+#| msgid "Select all messages in the same thread as the selected message"
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾ ਹ�ਣ ਲ� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਸ�ੱ� �ਰ�"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "Follow _Up..."
+msgstr "�ੱ�� ��ਲ�ਹ�(_U)..."
+
+#: ../mail/e-mail-reader.c:1159
+#| msgid "Flag selected messages for follow-up"
+msgid "Flag the selected messages for follow-up"
+msgstr "ਧਿ�ਨ ਰੱ�ਣ ਲ� ��ਣ� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Attached"
+msgstr "����(_A)"
+
+#: ../mail/e-mail-reader.c:1166 ../mail/e-mail-reader.c:1173
+msgid "Forward the selected message to someone as an attachment"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ���� �ਰ�� �ਿਸ� ਨ�ੰ �ੱ�� ਭ���"
+
+#: ../mail/e-mail-reader.c:1171
+#| msgid "_Forward as iCalendar"
+msgid "Forward As _Attached"
+msgstr "���� �ਰ�� �ੱ�� ਭ���(_A)"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "_Inline"
+msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
+
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+msgid "Forward the selected message in the body of a new message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਵ�� ਸ�ਨ�ਹ� ਦ� ਵਿੱ� ਮ�ੱ� ਭਾ� ਵਾ�� �ੱ�� ਭ���"
+
+#: ../mail/e-mail-reader.c:1185
+#| msgid "_Forward style:"
+msgid "Forward As _Inline"
+msgstr "�ਨਲਾ�ਨ ਵਾ�� �ੱ�� ਭ���(_I)"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "_Quoted"
+msgstr "ਹਵਾਲਾ(_Q)"
+
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+msgid "Forward the selected message quoted like a reply"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਹਵਾਲਾ �ੱ� �ਵਾਬ ਦ� ਤਰ�ਹਾ� �ਰ�� ਭ���"
+
+#: ../mail/e-mail-reader.c:1199
+#| msgid "_Forward style:"
+msgid "Forward As _Quoted"
+msgstr "ਹਵਾਲ� ਵਾ�� ਭ���(_Q)"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Load Images"
+msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Force images in HTML mail to be loaded"
+msgstr "HTML ਮ�ਲ ਵਿੱ� ਸ�ਨ�ਹ� ਲ�ਡ �ਰਨ ਲ� ਮ�ਬ�ਰ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Important"
+msgstr "�ਾਸ(_I)"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "Mark the selected messages as important"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Junk"
+msgstr "�ੰ�(_J)"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "Mark the selected messages as junk"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "_Not Junk"
+msgstr "�ੰ� ਨਹ��(_N)"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Mark the selected messages as not being junk"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ�-ਨਹ�� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Read"
+msgstr "ਪ��ਹ�(_R)"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "Mark the selected messages as having been read"
+msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1241
+msgid "Uni_mportant"
+msgstr "ਨਾ-�ਾਸ(_m)"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Mark the selected messages as unimportant"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਾ-�਼ਰ�ਰ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Unread"
+msgstr "ਨਾ-ਪ��ਹ�(_U)"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "Mark the selected messages as not having been read"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਾ-ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1255
+msgid "_Edit as New Message..."
+msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
+
+#: ../mail/e-mail-reader.c:1257
+msgid "Open the selected messages in the composer for editing"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਸ�ਧ ਲ� ਰ��ਤਾ (�ੰਪ��਼ਰ) ਵਿੱ� ��ਲ�ਹ�"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "Compose _New Message"
+msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ��(_N)"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Open a window for composing a mail message"
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� ��ਲ�ਹ�"
+
+#: ../mail/e-mail-reader.c:1269
+msgid "_Open in New Window"
+msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
+
+#: ../mail/e-mail-reader.c:1271
+msgid "Open the selected messages in a new window"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Move to Folder..."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Move selected messages to another folder"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Next Message"
+msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Display the next message"
+msgstr "��ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1290
+msgid "Next _Important Message"
+msgstr "ਨਵਾ� �ਾਸ ਸ�ਨ�ਹਾ(_I)"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Display the next important message"
+msgstr "��ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "Next _Thread"
+msgstr "�ੱ�� ਮਸਲਾ(_T)"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Display the next thread"
+msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਮਸਲਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "Next _Unread Message"
+msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_U)"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Display the next unread message"
+msgstr "��ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "_Previous Message"
+msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Display the previous message"
+msgstr "ਪਿ�ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "Pr_evious Important Message"
+msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Display the previous important message"
+msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "P_revious Unread Message"
+msgstr "ਪਿੱ�� ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ(_r)"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Display the previous unread message"
+msgstr "ਪਿ�ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Print this message"
+msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "Preview the message to be printed"
+msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "Re_direct"
+msgstr "ਵਾਪਸ(_d)"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
+
+#: ../mail/e-mail-reader.c:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "ਸਭ ਨ�ੰ �ਵਾਬ(_A)"
+
+#: ../mail/e-mail-reader.c:1355
+#| msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਲ� �ਵਾਬ ਲਿ��"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Reply to _List"
+msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
+
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/mail/e-mail-attachment-handler.c:148
 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-reader.c:1369
+msgid "Compose a reply to the sender of the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਭ��ਣ ਵਾਲ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../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-reader.c:1374
+#| msgid "Save as..."
+msgid "_Save as mbox..."
+msgstr "mbox ਵਾ�� ਸੰਭਾਲ�(_S)..."
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:607
-#| msgid "Month View"
-msgid "Icon View"
-msgstr "���ਾਨ �ਲ�"
+#: ../mail/e-mail-reader.c:1376
+#| msgid "Save the selected messages as a text file"
+msgid "Save selected messages as an mbox file"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ mbox ਫਾ�ਲ ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:608
-#| msgid "_List View"
-msgid "List View"
-msgstr "ਲਿਸ� �ਲ�"
+#: ../mail/e-mail-reader.c:1381
+msgid "Search Folder from Mailing _List..."
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
 
-#  message-search popup match count string
-#: ../mail/e-mail-search-bar.c:76
-#, c-format
-msgid "Matches: %d"
-msgstr "ਮਿਲਦਾ: %d"
+#: ../mail/e-mail-reader.c:1383
+#| msgid "Create a Search Folder for this mailing list"
+msgid "Create a search folder for this mailing list"
+msgstr "�ਸ ਮ�ਲਿੰ� ਲਿਸ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-search-bar.c:520
-#| msgid "Close this window"
-msgid "Close the find bar"
-msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
+#: ../mail/e-mail-reader.c:1388
+msgid "Search Folder from Recipien_ts..."
+msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "���(_d):"
+#: ../mail/e-mail-reader.c:1390
+#| msgid "Create a Search Folder for these recipients"
+msgid "Create a search folder for these recipients"
+msgstr "�ਹਨਾ� ਸ�ਨ�ਹ��� ਤ�� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-search-bar.c:540
-#| msgid "Always search"
-msgid "Clear the search"
-msgstr "��� ਸਾਫ਼ �ਰ�"
+#: ../mail/e-mail-reader.c:1395
+msgid "Search Folder from Sen_der..."
+msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "ਪਿੱ��(_P)"
+#: ../mail/e-mail-reader.c:1397
+#| msgid "Create a Search Folder for this sender"
+msgid "Create a search folder for this sender"
+msgstr "�ਸ ਭ��ਣ ਵਾਲ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
+#: ../mail/e-mail-reader.c:1402
+msgid "Search Folder from S_ubject..."
+msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "�ੱ��(_N)"
+#: ../mail/e-mail-reader.c:1404
+#| msgid "Create a Search Folder for this subject"
+msgid "Create a search folder for this subject"
+msgstr "�ਸ ਵਿਸ਼� ਲ� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
+#: ../mail/e-mail-reader.c:1409
+msgid "_Message Source"
+msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
-#: ../mail/e-mail-search-bar.c:587
-#| msgid "M_atch case"
-msgid "Mat_ch case"
-msgstr "ਮਿਲਦ� ਸਭ(_c)"
+#: ../mail/e-mail-reader.c:1411
+msgid "Show the raw email source of the message"
+msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
+#: ../mail/e-mail-reader.c:1423
+msgid "_Undelete Message"
+msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr "ਪ��਼ ਦ� �ੱਤ� ਪ�ੱ��, ਹ�ਠਾ� ਤ�� ਫ�ਰ �ਾਰ�"
+#: ../mail/e-mail-reader.c:1425
+msgid "Undelete the selected messages"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "_Normal Size"
+msgstr "�ਮ ��ਾਰ(_N)"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Reset the text to its original size"
+msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1437
+msgid "_Zoom In"
+msgstr "�਼�ਮ �ੰਦਰ(_Z)"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "Increase the text size"
+msgstr "���ਸ� ��ਾਰ ਵਧਾ�"
+
+#: ../mail/e-mail-reader.c:1444
+msgid "Zoom _Out"
+msgstr "�਼�ਮ ਬਾਹਰ(_O)"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "Decrease the text size"
+msgstr "���ਸ� ��ਾਰ ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Create R_ule"
+msgstr "ਨਿਯਮ ਬਣਾ�(_u)"
+
+#: ../mail/e-mail-reader.c:1460
+msgid "Ch_aracter Encoding"
+msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
+
+#: ../mail/e-mail-reader.c:1467
+#| msgid "F_orward As..."
+msgid "F_orward As"
+msgstr "�ੱ�� ਭ��� �ਸ ਵਾ��(_O)"
+
+#: ../mail/e-mail-reader.c:1474
+msgid "_Go To"
+msgstr "�ਾ�(_G)"
+
+#: ../mail/e-mail-reader.c:1481
+#| msgid "Mar_k as"
+msgid "Mar_k As"
+msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
+
+#: ../mail/e-mail-reader.c:1488
+msgid "_Message"
+msgstr "ਸ�ਨ�ਹਾ(_M)"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "_Zoom"
+msgstr "�਼�ਮ(_Z)"
+
+#: ../mail/e-mail-reader.c:1520
+msgid "Mark for Follo_w Up..."
+msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
+
+#: ../mail/e-mail-reader.c:1528
+msgid "Mark as _Important"
+msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
+
+#: ../mail/e-mail-reader.c:1532
+msgid "Mark as _Junk"
+msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
+
+#: ../mail/e-mail-reader.c:1536
+msgid "Mark as _Not Junk"
+msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
+
+#: ../mail/e-mail-reader.c:1540
+msgid "Mar_k as Read"
+msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
+
+#: ../mail/e-mail-reader.c:1544
+#| msgid "Mark as Un_important"
+msgid "Mark as Uni_mportant"
+msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_m)"
+
+#: ../mail/e-mail-reader.c:1548
+msgid "Mark as _Unread"
+msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
+
+#: ../mail/e-mail-reader.c:1584
+msgid "_Caret Mode"
+msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
+
+#: ../mail/e-mail-reader.c:1586
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1592
+msgid "All Message _Headers"
+msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ(_H)"
+
+#: ../mail/e-mail-reader.c:1594
+msgid "Show messages with all email headers"
+msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
+
+#: ../mail/e-mail-reader.c:1813
+msgid "Unable to retrieve message"
+msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
+
+#: ../mail/e-mail-reader.c:1858 ../mail/mail-ops.c:1849
+#, c-format
+#| msgid "Retrieving message %s"
+msgid "Retrieving message '%s'"
+msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#  default charset used in mail view
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2352
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "ਡਿਫਾਲ�"
+
+#: ../mail/e-mail-reader.c:2471
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "�ੱ�� ਭ���(_F)"
+
+#: ../mail/e-mail-reader.c:2472
+msgid "Forward the selected message to someone"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ੱ�� ਭ���"
+
+#: ../mail/e-mail-reader.c:2516 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "ਹ�ਾ�"
+
+#: ../mail/e-mail-reader.c:2520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "�ੱ��"
+
+#: ../mail/e-mail-reader.c:2524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "ਪਿੱ��"
+
+#: ../mail/e-mail-reader.c:2528 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "�ਵਾਬ"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "ਨਿਸ਼ਾਨ ਦ� ਪਿੱ��"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 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
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 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
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -10650,125 +10132,167 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 "\n"
-"�ਿਰਪਾ �ਰ�� ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਪ�ਰ� ਪ� ਲਵ�\n"
-"�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ\n"
+"ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਨਾਲ ਪ��ਹ ਲਵ� ��,\n"
+"�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ,\n"
 "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
 
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "ਫ�ਲਡਰ ��ਣ�"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#| msgid "None"
+msgctxt "mail-signature"
+msgid "None"
+msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "ਹਮ�ਸ਼ਾ"
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨ�ਹ� ਲ� ਪ�ੱ��"
 
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#| msgid "None"
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../mail/em-account-editor.c:2055
+msgid "Mail Configuration"
+msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
+
+#: ../mail/em-account-editor.c:2056
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਸੰਰ�ਨਾ ਸਹਾ�� ਵਲ�� �� ���� ਨ�ੰ\n"
+"\n"
+"ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
+
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2059
+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 "
+"information in email you send."
+msgstr ""
+"ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
+"ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
+
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2062
+msgid "Please configure the following account settings."
+msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� ਸੰਰ�ਨਾ �ਰ� ��।"
+
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
+msgid "Sending Email"
+msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/em-account-editor.c:2065
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
+"ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
+
+#: ../mail/em-account-editor.c:2067
+msgid "Account Management"
+msgstr "��ਾ��� ਪਰਬੰਧ"
+
+#: ../mail/em-account-editor.c:2068
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below. 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."
+msgstr ""
+"�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। �ਹ ਨਾ� ਸਿਰ� \n"
+"ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
+
+#: ../mail/em-account-editor.c:2072
+msgid "Done"
+msgstr "ਸਮਾਪਤ"
+
+#: ../mail/em-account-editor.c:2073
+#| msgid ""
+#| "Congratulations, your mail configuration is complete.\n"
+#| "\n"
+#| "You are now ready to send and receive email \n"
+#| "using Evolution. \n"
+#| "\n"
+#| "Click \"Apply\" to save your settings."
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ਮ�ਬਾਰ�, ਤ�ਸ�� ਪੱਤਰ ਸੰਰ�ਨਾ ਸੰਪ�ਰਨ �ਰ ਲ� ਹ�।\n"
+"\n"
+"ਹ�ਣ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ� ਪੱਤਰ ਭ�� ਤ� ਪ�ਰਾਪਤ �ਰ ਸ�ਦ� ਹ�।\n"
+"\n"
+"�ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
+
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
 
-#: ../mail/em-account-editor.c:2224
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "ਮਿੰ�(_t)"
 
-#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 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:2582 ../mail/em-account-editor.c:2677
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣ"
 
-#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "��ਾ��� ਸੰਪਾਦ�"
 
-#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[ਮ�ਲ]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "��ਾ��� ਨਾ�"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "ਪ�ਰ����ਾਲ"
-
-#: ../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:961
-msgid "Language(s)"
-msgstr "ਭਾਸ਼ਾ"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "�ੱ� ਦਸਤ�ਤ� ਸ�ਰਿਪ� ਸ਼ਾਮਿਲ"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "ਦਸਤ�ਤ"
-
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
-
-#: ../mail/em-composer-utils.c:1585
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
-
-#: ../mail/em-composer-utils.c:1591
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭਿ�, ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਨ�ੰ ਰੱਦ ��ਤਾ �ਿ�।"
-
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1954
 msgid "an unknown sender"
 msgstr "�ਣ�ਾਣਾ ਭ��ਣ ਵਾਲਾ"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10776,13 +10300,21 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵ�� "
 "${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
 
-#: ../mail/em-filter-editor.c:172
-msgid "_Filter Rules"
-msgstr "ਫਿਲ�ਰ ਨਿਯਮ(_F)"
+#: ../mail/em-composer-utils.c:2326
+msgid "Posting destination"
+msgstr "ਭ��ਣ ਲ� ਨਿਯਤ"
+
+#: ../mail/em-composer-utils.c:2327
+msgid "Choose folders to post the message to."
+msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "ਫ�ਲਡਰ ��ਣ�"
 
 #  Automatically generated. Do not edit.
 #. Automatically generated. Do not edit.
@@ -10806,10 +10338,6 @@ msgstr "�ਵਾ�"
 msgid "Completed On"
 msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "ਪ�ਰਾਪਤ� ਮਿਤ�"
@@ -10818,14 +10346,6 @@ msgstr "ਪ�ਰਾਪਤ� ਮਿਤ�"
 msgid "Date sent"
 msgstr "ਭ��ਣ ਮਿਤ�"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../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
-msgid "Delete"
-msgstr "ਹ�ਾ�"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "ਹ�ਾ�"
@@ -10871,14 +10391,9 @@ msgid "Follow Up"
 msgstr "ਪਿੱ�� �ਾ�"
 
 #: ../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 "�ਾਸ"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ਬਾ�ਦ ਹ�"
@@ -10903,8 +10418,7 @@ msgstr "ਸ�ੱ� ਨਹ�� ਹ�"
 msgid "is set"
 msgstr "ਸ�ੱ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "�ੰ�"
 
@@ -10941,14 +10455,9 @@ msgid "Message is not Junk"
 msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਨਹ� ਹ�"
 
 #: ../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:52
 msgid "Pipe to Program"
 msgstr "ਪਰ��ਰਾਮ ਨਾਲ ਸ਼ਾਮਿਲ"
@@ -10957,8 +10466,8 @@ msgstr "ਪਰ��ਰਾਮ ਨਾਲ ਸ਼ਾਮਿਲ"
 msgid "Play Sound"
 msgstr "�ਵਾ� �ਲਾ�"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "ਪ��ਹ�"
 
@@ -11034,75 +10543,19 @@ msgstr "�ਸ ਨਾਲ ਸ਼�ਰ�"
 msgid "Stop Processing"
 msgstr "�ਾਰਵਾ� ਰ���"
 
-#: ../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:1112
-msgid "Subject"
-msgstr "ਵਿਸ਼ਾ"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ਸਥਿਤ� ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "��ਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "ਸਭ ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "ਬਿਨ-ਲ�ਬਲ"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "ਨੱਥ� ਸਮ�ਤ ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "�ਾਸ ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "��ਾ��� ���"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "ਸਭ ��ਾ��� ���"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11128,65 +10581,48 @@ msgstr "���ਾ (%s) ਵਰਤ� ��:"
 msgid "Quota usage"
 msgstr "���ਾ ਵਰਤ��"
 
-#. translators: standard local mailbox names
-#: ../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 "��ਣ-ਬ�ਸਾ"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<ਫ�ਲਡਰ ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "ਬਣਾ�(_r)"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "��� ਫ�ਲਡਰ"
 
 #  UNMATCHED is always last
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "ਡਰਾਫ�"
-
-#: ../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:520 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
-
-#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "ਭ���"
-
-#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" ਵਿੱ� ਫ�ਲਡਰ ਦ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
+
+#: ../mail/em-folder-tree.c:589
+msgid "Folder names cannot contain '/'"
+msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ�ਦਾ"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11201,346 +10637,141 @@ msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 #. * (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:318, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u)"
+#: ../mail/em-folder-tree.c:1071
+#, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1277
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ ਲ��"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫ�ਲਡਰ %s ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫ�ਲਡਰ %s ਦ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ %s ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ %s ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1503
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ੱਪਰ� ਸੰਭਾਲ ਤ�� ਸ�ਨ�ਹਾ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)"
-
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)"
-
-#: ../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:2107
-msgid "Open in _New Window"
-msgstr "ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "ਭ���(_M)..."
-
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "ਮ��-ਤਾ�ਾ(_f)"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
-
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "ਰੱਦ� �ਾਲ�(_E)"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "��� ਫ�ਲਡਰ �ਣ-ਪ��ਹਿ�(_U)"
-
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "`%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../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:302
-msgid "Select folder"
-msgstr "ਫ�ਲਡਰ ��ਣ�"
+#: ../mail/em-folder-utils.c:386
+#| msgid "_Move Folder To..."
+msgid "Move Folder To"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "ਨ�ਲ(_o)"
+#: ../mail/em-folder-utils.c:386
+#| msgid "_Copy Folder To..."
+msgid "Copy Folder To"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:499
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
-msgstr "ਫ�ਲਡਰ `%s' ਬਣਾ�"
+msgstr "ਫ�ਲਡਰ `%s' ਬਣਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:662
+#| msgid "Create folder"
+msgid "Create Folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:663
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
-msgstr "ਨਿਰਧਾਰਿਤ �ਰ� ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
-
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "ਮ�ਲ ਹ�ਾ�ਣਾ ਫ�ਲ�ਹ"
-
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "�ਹ ਪੱਤਰ ਹ�ਾ�ਣ ਲ� ਤ�ਹਾਨ�ੰ ਲ���ਦ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ।"
-
-#. 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:1335 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "ਨਾ-ਹ�ਾ�(_n)"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_i)"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
-
-#: ../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:1355 ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "��� ਨਹ��(_N)"
+msgstr "ਦੱਸ� �ਿ ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
 
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
-
-#: ../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:1368
-msgid "Search Folder based on _Subject"
-msgstr "ਵਿਸ਼� ਤ�� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_S)"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ�� ��� ਫ�ਲਡਰ(_n)"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "ਸਿਰਨਾਵ�� �ੱਤ� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_R)"
-
-#: ../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:1376
-msgid "Filter based on Sub_ject"
-msgstr "ਵਿਸ਼� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_j)"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "ਭ��ਣ ਵਾਲਿ�� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_d)"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "ਸ�ਨ�ਹ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_c)"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_M)"
-
-#  default charset used in mail view
-#. 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: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:2493
-msgid "Unable to retrieve message"
-msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "��� ਫ�ਲਡਰ ਬਣਾ�(_S)"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "�ਸ �ਡਰ�ੱਸ ਤ��(_F)"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "�ਸ �ਡਰ�ੱਸ ਲ�(_T)"
-
-#: ../mail/em-folder-view.c:3191
+#: ../mail/em-folder-utils.c:679
 #, c-format
-msgid "Click to mail %s"
-msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
-
-#: ../mail/em-folder-view.c:3203
-#, c-format
-msgid "Click to call %s"
-msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਨਹ�� ਹ�। �ਸ ਦ� ��� �ਾਰੰ�� ਨਹ�� �ਿ �ਹ ਸ�ਨ�ਹਾ ਸਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "�ਾ�� ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html-display.c:104
 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:562 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� ਹਨ, ਪਰ ਸੰ�ਾਰ ਦ�ਰਾਨ �ਹ ਤਬਦ�ਲ ਹ� �� �ਾਪਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤ�ਤ ਠ�� ਹਨ, ਪਰ ਭ��ਣ ਵਾਲਾ ��ੱ� ਨਹ�� ��ਤਾ"
 
-#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html-display.c:106
 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:564 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤ�ਤ ਮ���ਦ ਹਨ, ਪਰ ਪਬਲਿ� ��ੰ�� ਲ���ਦ� ਹ�"
 
-#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿ� �� ਨਾਲ ਸਬੰਧਿਤ ਨਹ��।"
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "�ਣ-�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਨਹ�� ਹ� �ਸ ਦ� ��� ਭਾ� �ੰ�ਰਨ�ੱ� ਤ� ਸੰ�ਾਰ ਦ�ਰਾਨ ਵ��� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "�ੰ��ਰਿਪ�ਡ, ਹਲ�ਾ"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:115
 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 "
@@ -11549,21 +10780,21 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਹਲ�ਾ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� ਵਿੱ� "
 "�ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ��ਲਣ ��ਾ ਤਾ� ਹ�, ਪਰ �ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:116
 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:574 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "�ੰ��ਰਿਪ�, ਸ�ਤ"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:117
 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 "
@@ -11572,516 +10803,240 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਸ�ਤ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� "
 "ਵਿੱ� �ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ਵ��ਣਾ ��ਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "ਸਰ��ਫਿ��� ਵ���(_V)"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "�ਹ ਸਰ��ਫਿ��� ਵ��ਣਯ�� ਨਹ�� ਹ�"
 
-#: ../mail/em-format-html-display.c:980
-#| msgid "Completed On"
+#: ../mail/em-format-html-display.c:509
+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-display.c:738
 msgid "Completed on"
 msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "ਮਿ�ਦ ਪ�ੱ��:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "ਨ�ੰ"
 
-#: ../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:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "�ਹਲ�(_H)"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "���ਾ� ਦ� ਫਿੱ�(_F)"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "�ਸਲ� ��ਾਰ ਵ���(_O)"
-
-#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� ਵ���(_U)"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� �ਹਲ�(_U)"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "�ਸ ਨਾਲ ��ਲ�ਹ�(_p)"
 
-#: ../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
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸਫ਼ਾ"
 
-#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
+
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "%s ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "�ਣ�ਾਣ ਬਾਹਰ�-ਮ�ੱ� ਭਾ�।"
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "ਨਿ�ਾਰਾ ਬਾਹਰ�-ਭਾ�"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾ�� (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮ�� ਡਾ�ਾ(%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�ਾ (\"%s\" �ਿਸਮ) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
-
-#: ../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: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:1747 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "ਮ�ਲਰ"
-
 #. 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:1910
+#: ../mail/em-format-html.c:2595
 #, 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:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
-
-#: ../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:930 ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
-
-#: ../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:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s ਨੱਥ�"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
-
-#: ../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:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
-
-#: ../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:1772
-msgid "Could not parse PGP message"
-msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP ਸ�ਨ�ਹ� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "ਹਰ ਸਮ��"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "ਹ�ੱਡਰ ਨਾ�:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
-
-#: ../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:465
-msgid "Color"
-msgstr "ਰੰ�"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "���"
-
-#. May be a better text
-#: ../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: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: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:961
-msgid "To Do"
-msgstr "�ਰਨ-ਲ�"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "ਬਾ�ਦ ਵਿੱ�"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "ਤਬਦ�ਲ"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ਨਵਾ� ਫ�ਲਡਰ `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ਫ�ਲਡਰ `%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s' ਤ� �ਪਲੱਬਧ ਪੱਤਰ-ਬ�ਸਿ�� ਦ� �ਾ�� ਲ� �ਸਫਲ: %s"
-
-#: ../mail/em-migrate.c:1789
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
-"\n"
-"�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
-
-#: ../mail/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:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�� ਡਾ�ਾ ਡਾ�ਰ���ਰ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../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:2504 ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦਾ ਸੰ��ਪ ਫਾਰਮ�� �ਵ�ਲ�ਸ਼ਨ ੨.੨੪ ਬਾ�ਦ SQLite ਲ� ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
-"\n"
-"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ਹ�ਣ ਤੱ� ਸਬਰ ਰੱ�� ��..."
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s' �ੱਤ� ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../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' ਮ���ਦ ਨਹ�� ਹ� �ਾ� ਨਿ�ਾਰਾ "
-"ਹ� �� ਹ�।"
-
-#: ../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:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� '� ����(_A)"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ਨਾਲ ��ਲ�ਹ�..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ�� �ਾ� �ਹ ਯ�� ਨਹ�� ਹ�।"
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:623
 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:858
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "ਸਰਵਰ ��ਣ� ��।"
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ"
 
-#: ../mail/em-utils.c:369
-msgid "message"
-msgstr "ਸ�ਨ�ਹਾ"
-
-#: ../mail/em-utils.c:652
-msgid "Save Message..."
-msgstr "...ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
-
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "�ਡਰ�ੱਸ ����ਹ�"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "��� ਫ�ਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
-msgid "Search Folder source"
-msgstr "��� ਫ�ਲਡਰ ਸਰ�ਤ"
+#: ../mail/em-vfolder-rule.c:522
+#| msgid "Folder"
+msgid "Add Folder"
+msgstr "ਫ�ਲਡਰ ਸ਼ਾਮਲ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#| msgid "Default window height"
+msgid "\"Filter Editor\" window height"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ��ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Filter Editor\" window maximize state"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#| msgid "Default window width"
+msgid "\"Filter Editor\" window width"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ���ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#| msgid "Default window height"
+msgid "\"Search Folder Editor\" window height"
+msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ��ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#| msgid "Search Folder based on Mailing _List"
+msgid "\"Search Folder Editor\" window width"
+msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ���ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"ਡਾ� ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "ਸ�ਮਿਤ ਸਾ��਼ ਦਾ ���ਸ� ਭਾ� ਵ��ਾ�ਣ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਮਨ��ਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "���ਮ��ਿ� �ਮ�ਸ਼ਨ ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "���ਮ��ਿ� ਸੰਬੰਧ ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਲ� �ੰ� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "�ੰਪ��਼ਰ ਲ�ਡ/����� ਡਾ�ਰ���ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ਵਿੱ� ���ਾ �ਡਰ�ੱਸ ਵ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "TO/CC/B_CC ਵਿੱ� �ਡਰ�ੱਸ �ਿਣਤ� ਵਿੱ� ਦਿੱਤ� ਨੰਬਰਾ� ਮ�ਤਾਬ� ���ਾ �ਡਰ�ੱਸ ਵ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -12089,11 +11044,11 @@ msgstr ""
 "�ੰ�ਰ�ਲ, �ਿਸ ਤ��਼� ਨਾਲ ਸਥਾਨ� ਬਦਲਾ� ਰਿਮ�� ਮ�ਲ ਸਰਵਰ ਨਾਲ ਸਮ�ਾਲ� ��ਤ� �ਾਣ। �ੰਤਰਾਲ�ੱ��-�ੱ� 30 "
 "ਸ�ਿੰ� ਹ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "�ੰ� ਵਾਸਤ� ��ੱ� �ਰਨ ਵਾਸਤ� �ਸ�ਮ ਹ�ੱਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12101,69 +11056,76 @@ msgstr ""
 "�ੰ� ਲ� ��ੱ� �ਰਨ ਦ� ਦ�ਰਾਨ ਵਰਤਣ ਵਾਸਤ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ। ਸ��� ��ਾ��� \"headername=value\" "
 "ਫਾਰਮ�� ਦ� ਲਾ�ਨ ਦ� ਰ�ਪ '� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ।"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ���ਡਿੰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "ਡਿਫਾਲ� �ੱ�� ਭ��ਣ ਦ� ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
+#: ../mail/evolution-mail.schemas.in.h:32
+#| msgid "Default height of the Composer Window."
+msgid "Default height of the mail browser window."
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ��ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#| msgid "Default width of the Composer Window."
+msgid "Default maximized state of the mail browser window."
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ।"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "ਡਿਫਾਲ� �ਵਾਬ ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "ਥਰਿੱਡ ਫ�ਲ� ਹਾਲਤ ਲ� ਡਿਫਾਲ� ਮ�ੱਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
+#: ../mail/evolution-mail.schemas.in.h:38
+#| msgid "Default width of the Composer Window."
+msgid "Default width of the mail browser window."
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ਦੱਸ� �ਿ �� �ੰ� ਫਿਲ�ਰਿੰ� ਲ� �ਡਰ�ੱਸ ��ਵਲ ਲ��ਲ  �ਡਰ�ੱਸ-ਬ�ੱ� '� ਹ� ���� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ਦੱਸ� �ਿ �� ਭ��ਣ ਵਾਲਾ �ਮ�ਲ �ਡਰ�ੱਸ-ਬ�ੱ� '� ���ਿ� �ਾਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12174,11 +11136,11 @@ msgstr ""
 "ਹ�ਵ��ਾ। �ਹ ਬ�ੱ� ਵਿੱ� ਲੱਭਦਾ ਹ�, �� �ਿ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ਹਨ। �ਸ ਹ�ਲ� ਹ� ਸ�ਦਾ ਹ�, �� ਰਿਮ�� �ਡਰ�ਸ "
 "ਬ�ੱ� (LDAP ਵਾ��) ਨ�ੰ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ��ਤਾ �ਿ� ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ਦੱਸ� �ਿ �ੰ� ਲ� ��ੱ� �ਰਨ ਸਮ�� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਵਰਤ� �ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12187,7 +11149,7 @@ msgstr ""
 "�� �ੰ� ��ੱ� �ਰਨ ਲ� �ਸ�ਮ ਹ�ੱਡਰ ਵਰਤਣ� �ਾਹ�ਦ� ਹਨ। �� �ਹ ��ਣ �ਾਲ� ਰਹ� �ਤ� ਹ�ੱਡਰ ਦ� ਨਿ�ਰਾਨ� "
 "��ਤ ਤਾ� �ਹ �ੰ� ��ੱ� �ਰਨ ਦ� �ਤ� ਵਧਾ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12195,100 +11157,100 @@ msgstr ""
 "�� ਵਰ���ਲ �ਲ� ਵਿੱ� \"ਸ�ਨ�ਹਾ\" �ਾਲਮ ਵਿੱ� \"ਵਲ��\" �ਤ� \"ਵਿਸ਼ਾ\" ਲਾ�ਨਾ� ਲ� �ੱ�� ਫ��� ਵਰਤਣ� "
 "ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "�ੰਪ��਼ਰ ਵਿੱ� ਫਾ�ਲਾ� ਲ�ਡ �ਰਨ/����� �ਰਨ ਵਾਸਤ� ਡਾ�ਰ���ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "ਮ�ਲ ਭਾ� ਫਾ�ਲਾ� ਸੰਭਾਲਣ ਵਾਸਤ� ਡਾ�ਰ��ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ਬਾਹ� ਵਿੱ� ਫ�ਲਡਰ ਨਾ� ਲ� �ੰਡਾ�ਾਰ-ਸਾ��਼ ਯ�� �ਾ� �ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+#| msgid "Could not save signature file."
+msgid "Do not add signature delimiter"
+msgstr "ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ ਨਾ �ਰ�"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ਤ�ਹਾਡ� ਲਿ�ਣ ਦ�ਰਾਨ ਹ� ਸ਼ਬਦਾ� ਤ� ਸ਼ਬਦ-��� �ਲਤ�� �ੱਢ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਫ�ਲਡਰ �ਾਲ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਸਾਫ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਸਮ�� ਸਭ �ੰ� ਫ�ਲਡਰ �ਾਲ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਸਮ�� ਰੱਦ� �ਾਲ� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"HTML ਪੱਤਰ ਵਿੱ� �ਨ�ਮ�� �ਿੱਤਰ ਯ�� �ਰ�। �� ਯ��਼ਰ �ਨ�ਮ�� �ਿੱਤਰਾ� ਨ�ੰ ਪਸੰਦ ਨਹ�� ��ਤ� �ਤ� "
-"ਸਥਿਰ �ਿੱਤਰ ਹ� ਪਸੰਦ �ਰਦ� ਹਨ।"
+"HTML ਪੱਤਰ ਵਿੱ� �ਨ�ਮ�� �ਿੱਤਰ ਯ�� �ਰ�। �� ਯ��਼ਰ �ਨ�ਮ�� �ਿੱਤਰਾ� ਨ�ੰ ਪਸੰਦ ਨਹ�� ��ਤ� �ਤ� ਸਥਿਰ �ਿੱਤਰ "
+"ਹ� ਪਸੰਦ �ਰਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��, ਤਾ� �ਿ ਤ�ਸ�� ਪੱਤਰ ਪ�ਨ ਦ�ਰਾਨ �ਰਸਰ ਵ��ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "ਮ��ਿ� ਸਪ�ਸ ਬਾਰ ਯ�� �ਾ� �ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:50
-#| msgid "It disables/enables the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "�ਦ�� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਿਸ਼ਾਨਬੱਧ ��ਤਾ �ਾਵ� ਤਾ� ਪ�ੱ�ਣ ਨ�ੰ ਯ��/�ਯ�� �ਰਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "�ੱ�� ��� ਫ��ਰ �ਿਸਮ ਨ�ੰ ਯ�� �ਾ� �ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "ਸ਼�ਰ� ਸਮ�� ��� ਫ�ਲਡਰ ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "ਬਾਹਰ� ��� ਫ��ਰ ਨ�ੰ ਯ�� �ਰ�, �� �ਿ ਫ�ਲਡਰ ਨਾ� ਦ� ��� ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "�ਸ ਨ�ੰ ਯ�� �ਰਨ ਨਾਲ ਸਪ�ਸ ਬਾਰ ਸਵਿੱ� ਸ�ਨ�ਹਾ �ਲ�, ਸ�ਨ�ਹਾ ਸ��� �ਤ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਰ�ਲ �ਰ���। "
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "ਰ�ਡਰ ਸ�ਨ�ਹਾ ���ਸ� ਭਾ� ਨ�ੰ ਸ�ਮਿਤ ��ਾਰ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��/�ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "���ਲ�ੱ�/��ਮ�ਲ ਢੰ� ਨਾਲ ਫਾ�ਲ ਨਾ� �ੰ��ਡ �ਰ�"
 
-#: ../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."
+#: ../mail/evolution-mail.schemas.in.h:67
 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, "
@@ -12299,19 +11261,19 @@ msgstr ""
 "UTF-8 �ੱ�ਰ ਨਾਲ ਭ��� ਫਾ�ਲ ਨਾ� ਵਿੱ� ਭ��ਿ� ਹ�, �ਿ���ਿ �ਹ RFC ੨੨੩੧ ਦ� ਮ�ਤਾਬ� ਨਹ��, ਬਲ�ਿ RFC "
 "੨੦੪੭ ਸ���ਡਰਡ ਨ�ੰ ਮੰਨਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫ�ਲਡਰ �ਲ� �ਹਲ� �ਰ� �ਤ� ��ਣ ਹ�ਾ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12319,13 +11281,7 @@ msgstr ""
 "���ਰ ਯ��਼ਰ ਨ� ੧੦ �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
 "�ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../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:65
+#: ../mail/evolution-mail.schemas.in.h:72
 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 "
@@ -12334,15 +11290,73 @@ msgstr ""
 "�ੱ� �ਾਸ MIME �ਿਸਮ ਲ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਦਰਸ਼� ਸ਼ਾਮਿਲ ਨਹ�� ਹ�, �ਿਸ� MIME �ਿਸਮ ਨ�ੰ �ਸ ਸ��� ਵਿੱ� "
 "�ਪਲੱਬਧ ਹ�ਣ ਲ� �ਸ ਨ�ੰ �ਨ�ਮ ਦ� MIME �ਿਸਮ ਡਾ�ਾਬ�ਸ ਦ� ਬ�ਨਬ�-ਭਾ� ਦਰਸ਼� ਵਿੱ� �ਪਲੱਬਧ ਹ�ਣਾ ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"��� ਫ�ਲਡਰ �ਡ��ਰ ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:75
 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:67
+#: ../mail/evolution-mail.schemas.in.h:76
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� "
+"��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ "
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� \"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-"
+"ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:77
+#| msgid ""
+#| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#| "updates when the user maximizes or unmaximizes the window. Note, this "
+#| "particular value is not used by Evolution since the \"Send and Receive "
+#| "Mail\" window cannot be maximized. This key exists only as an "
+#| "implementation detail."
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� "
+"��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ "
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� \"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-"
+"ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12350,28 +11364,42 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� "
-"��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ "
-"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� \"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" ਵਿੰਡ� ਵੱਧ�-"
-"ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
+"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� ��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� "
+"ਨ�ੰ "
+"ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
+"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ "
+"�ਰ��ਾ ਤਾ� ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:80
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ�ਰ��ਾ ਤਾ� ਮ�ੱਲ "
-"�ੱਪਡ�� ਹ�ਵ��ਾ।"
+"\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ "
+"�ਰ��ਾ ਤਾ� ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"ਲ�ਾਤਾਰ ਪਰ��� �ਯ��/ਯ�� �ਰਦਾ ਹ�, �� �ਫਲਾ�ਨ ਸਿ�ਰ� (sync) �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਾਣ ਲ� ਲਾ�਼ਮ� "
-"ਹ�ਵ�।"
+"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ "
+"�ਰ��ਾ ਤਾ� ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -12380,31 +11408,36 @@ msgstr ""
 "�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ "
 "ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "��ਰ� ਵਾਰ �ੰ� ਨ�ੰ �ਾਲ� ��ਤਾ ਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "��ਰ� ਵਾਰ ਰੱਦ �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+#| msgid "Lay_out"
+msgid "Layout style"
+msgstr "ਲ���� ਸ�ਾ�ਲ"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "ਲ�ਬਲ ਸ��� �ਤ� ਸੰਬੰਧਿਤ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬ�ਨਬ� ਭਾ� ਦਰਸ਼� ਦ� �ਾ�� ਲ� MIME �ਿਸਮ ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "ਮਨ�਼�ਰ ਲਾ�ਸ��ਸਾ� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "��ਾ��� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12412,15 +11445,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ��ਲ �ਪਲੱਬਧ ��ਾ���ਾ� ਦ� ਲਿਸ�। �ਸ ਸ��� ਵਿੱ� ਲਾ�ਨਾ� ਸਬ-ਡਾ�ਰ���ਰ��� /apps/"
 "evolution/mail/accounts ਦ� �ਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰਾ� ਦ� ਸ��� �ਤ� �� �ਹ ਵਰਤ� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-��� ��ੱ� �ਰਨ ਲ� ਡਿ�ਸ਼ਨਰ� ਭਾਸ਼ਾ ��ਡ ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -12428,15 +11461,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ਲ� ਪ�ਾਣ ਦ� ਲ�ਬਲ ਸ��� ਹ�। �ਹ ਸ��� �ਹ ਸਾਰ� ਰੰ� ਰੱ�ਦ� ਹ�, �� �ਿ HTML "
 "ਹ��ਸਾ �ੰ��ਡਿੰ� ਲ� ਵਰਤ� �ਾਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰ�����ਲਾ� ਨਾ� ਦ� ਲਿਸ�, �ਿਹਨਾ� ਦਾ ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ ��ਤਾ �ਿ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸ�ਨ�ਹ� ਲ� HTTP ਤ�� �ਿੱਤਰ ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 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 "
@@ -12446,103 +11479,105 @@ msgstr ""
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ ਤਾ� ਹ� �ਰ�, ���ਰ ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਵ� \"2\" -  ਨ�ੱ� ਤ�� ਹਮ�ਸ਼ਾ "
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+#| msgid "Uniform row height"
+msgid "Mail browser height"
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ��ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵੱਧ�-ਵੱਧ"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#| msgid "Email begins with"
+msgid "Mail browser width"
+msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ���ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ��ਾ�"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�"
-
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ਼�ਲ� (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਨ�ੰ �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ �ਰਨ �ੱਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਸਮਾ� ਦਿਨਾ� ਵਿੱ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� �ੰਤਰਾਲ ਦਿਨਾ� ਵਿੱ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਸਿਰਨਾਵ��� ਦ� �ਿਣਤ�"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "�ਾਲ� ਵਿਸ਼� ਤ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�ਦ�� ਯ��਼ਰ ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵਿਸ਼� ਤ�� ਸ�ਨ�ਹਾ ਭ��ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਤਾ� ਪ�ੱ��।"
 
-#: ../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:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱ��, �ਦ�� ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ� ਹ�ਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "�ਦ�� ਯ��਼ਰ ਹ�ਾ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "���ਰ ਸਿਰਫ Bcc ��ਤਰ ਹ� ਭਰਿ� ਹ�ਵ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� ੧੦ ਸ�ਨ�ਹ� ��ਲਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12550,146 +11585,163 @@ msgstr ""
 "�ਦ�� ਯ��਼ਰ HTML ਸ�ਨ�ਹ�, �ਹਨਾ� ਯ��਼ਰ ਨ�ੰ ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�, �� �ਿ �ਹ ਪ�ਰਾਪਤ ਹ� ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� "
 "ਹਨ, ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵੱਲ �ਾ� Cc ਪ�ਰਾਪਤ�ਰਤਾ ਦ� ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�ਦ�� ਯ��਼ਰ ਨਾ-�ਾਹਿ�� HTML ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "�ਦ�� �� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰਨ� ਹ�ਣ ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 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"
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "�ਵਾਬਾ� ਦ� ਹ�ਠਾ� �ਰਸਰ ਰੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "���ਸ� ਵਿੱ��� �ਮ�ਸ਼ਨ ਦ� ਪ�ਾਣ �ਰ�� �ਿੱਤਰਾ� ਨਾਲ ਬਦਲ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "���ਸ� ਵਿੱ� ਲਿੰ�ਾ� ਦ� �ਾ�� �ਰ� �ਤ� ਤਬਦ�ਲ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "� ਰਹ��� ਮ�ਲਾ� ਲ� �ੰ� ��ਸ� �ਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਫ��� ਦ� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸ��ਰ�ਨਾ��਼ �ੰਤਰਾਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "�ਦ�� ਮ�ਲ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "�ਦ�� ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਵਿੱ� ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 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"
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+#| msgid "Collapse all message threads"
+msgid "Show all message headers"
+msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show all the headers when viewing a messages."
+msgstr "ਸ�ਨ�ਹਾ ਵ��ਣ ਦ�ਰਾਨ ਸਭ ਹ�ੱਡਰ ਵ���।"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਸ�ਨ�ਹ� �ਨ�ਮ�ਸ਼ਨ ਵ��� ਹ� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��� (ਵਿੰਨ� ਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:134
-#| msgid "_Show image animations"
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:153
 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\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
-"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
+"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:154
 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\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
-"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
+"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:155
 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
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
-"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
+"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12697,7 +11749,7 @@ msgstr ""
 "�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12705,71 +11757,86 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਵਿੱ� ਵੱ�ਰ� �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ਸ�ਨ�ਹਾ ਪ��ਹਨ ਪ��ਨ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "ਲਾ�ਨ ਵਿੱ� ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਭਾਸ਼ਾਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "�ਰਮ�ਨਲ ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "���ਸ� ਸ�ਨ�ਹਾ ਭਾ� ਸ�ਮਾ"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "�ੰ� ਹ�ੱ� ਲ� ਡਿਫਾਲ� ਪਲੱ��ਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "��ਰ� ਵਾਰ �ੰ� �ਾਲ ��ਤਾ �ਿ� ਸ�, �ੰਨ�ਹ� ਦਿਨ ਪਹਿਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "�ਾਫ� ਦਿਨ ਪਹਿਲਾ� ਰੱਦ� �ਾਲ� ��ਤ� ਸ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਰਮ�ਨਲ ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� ਵ�ਰ�ਬਲ ���� ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:175
 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:159
+#: ../mail/evolution-mail.schemas.in.h:176
 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."
@@ -12777,7 +11844,7 @@ msgstr ""
 "�ਹ ���ਸ� ਭਾ� ਦਾ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਤਹਿ �ਰਦਾ ਹ�, �ਿਸ ਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਮ�ਤਾਬ� ਫਾਰਮ�� ��ਤਾ �ਾ ਸ�ਦਾ "
 "ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -12786,7 +11853,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ ਹ�, ਭਾਵ�� �ਿ �� ਪਲੱ��ਨ ਯ�� ਹਨ। �� ਡਿਫਾਲ� ਦਿੱਤ� ਪਲੱ��ਨ �ਯ�� ਹ� ਤਾ� �ਹ "
 "ਹ�ਰ �ਪਲੱਬਧ ਪਲੱ��ਨ �ਾਲ� ਨਹ�� �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:178
 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."
@@ -12794,7 +11861,7 @@ msgstr ""
 "�ਹ �� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� �ਤ� ਪ��ਹਨ ਬਾ�ਦ \"�ਲਤ\" ਲ� ਰ�-ਸ�ੱ� ��ਤਾ ਹ�। ਸ��� ਵਿੱ��ਹ ਮ�ਲ �ਣ-"
 "��ਣ� ਹ� �ਤ� �ਸ ਫ�ਲਡਰ ਲ� �ਲ� ਹ�ਾ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -12805,7 +11872,7 @@ msgstr ""
 "XML ਢਾ��� ਦਾ ਫਾਰਮ�� ਹ� &lt; �ਾ��ਲ ਯ��&gt; - ਸ�ੱ� �ਰ�, ���ਰ ਮ�ਲ �ਲ� ਵਿੱ� ਤ�ਸ�� ਹ�ੱਡਰ ਵ��ਣਾ "
 "�ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:180
 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 "
@@ -12814,11 +11881,11 @@ msgstr ""
 "�ਹ ��ਣ lookup_addressbook ��ੰ�� ਨਾਲ ਸਬੰਧਿਤ ਹ� �ਤ� �ਸ ਨ�ੰ ਲ��ਲ �ਡਰ�ੱਸ ਵਿੱ� �ਡਰ�ੱਸ ਦ� ��� ਲ� "
 "ਵਰਤਿ� �ਾ�ਦਾ ਹ�, �ਦ�� �ਿ �ੰ� ਫਿਲ�ਰ ਤ�� �ਣ�ਾਣ ਸੰਪਰ� ਨ�ੰ �ੱਡ ��ਤਾ �ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ਹ ��ਣ ਲ�ਣ ਦ� ਸਪ�ਡ ਸ�ਧਾਰਨ ਲ� ਮੱਦਦ �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12826,7 +11893,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� ਸ�ਨ�ਹਾ ਸ��� �ਲ� ਵਿੱ� �ਡਰ�ੱਸਾ� ਦ� �ਿਣਤ� ਸ�ੱ� �ਰਦ� ਹ�, �ਿਸ ਤ�� ਬਾ�ਦ �ੱ� '...' "
 "ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12834,7 +11901,7 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਡਿਫਾਲ� ਰ�ਪ ਵਿੱ� ਥਰਿੱਡ ਫ�ਲਿ� ਹ�ਵ� �ਾ� ਸਮ��ਿ� ਹ���। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-"
 "�ਾਲ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:184
 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 "
@@ -12843,93 +11910,81 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਥਰਿੱਡਾ� ਨ�ੰ ਹਰ�� ਥਰਿੱਡ ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਿ�� ਮ�ਤਾਬ� ਲ��ਬੱਧ ��ਤਾ �ਾਵ�, "
 "ਨਾ �ਿ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਮ�ਤਾਬ�। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-ਸ�ਾਰ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Thread the message list."
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ।"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Thread the message-list"
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ"
-
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼� ਤ� �ਧਾਰਿਤ ਸ�ਨ�ਹਾ-ਸ��� ਦਾ ਥਰਿੱਡ ਬਣਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-���"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-��� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "ਮ�ਲ ��ਾ��� ਲ਼� UID ਲਾ�ਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "�ਦ�� �ਨ-ਲਾ�ਨ ਸਪ�ਲਿੰ� ਦ� ਵਰਤ�� ਹ�ਵ� ਤਾ� �ਲਤ ਸ਼ਬਦ ਲ� ਹ�ਠਾ� ਲਾ�ਨ ਲ� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ�� (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦ�ਦਾ ਫ��� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਸ�ਮ ਫ��� ਵਰਤ�� ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "ਨਾਲ-ਨਾਲ �ਾ� ਫ�ਲਿ� �ਾ�ਾ ਵਰਤ��"
-
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:196
 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:183
+#: ../mail/evolution-mail.schemas.in.h:197
 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:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "�ਸਥਿਰ ���ਾ� ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�� ਮ�ਲ ਰ�ਪ ਵਿੱ� ਹਰ�� ਸ�ਨ�ਹ� ਨਾਲ �ਵਾਬ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� �ਾਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�� ਬਾਹ�  ਵਿੱ� �ੰਡਾ�ਾਰ ਫ�ਲਡਰ ਨਾ� ਫ��ਰ �ਯ�� �ਰਨਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12937,22 +11992,28 @@ msgstr ""
 "�� ਮਾਮਲਿ�� ਨ�ੰ ਵਿਸ਼� ਮ�ਤਾਬ� ��ਤਾ �ਾਵ� �ਾ� ਨਾ, �ਦ�� �ਿ ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਵਾਬ �ਾ� ਹਵਾਲਾ ��ਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�� ਮਾਮਲ� ਨ�ੰ �ਸ ਮਾਮਲ� ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਾ ਮ�ਤਾਬ� ਲ��ਬੱਧ �ਰਨਾ ਹ�"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ�।"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "�ਲਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:603
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "ਪੱਤਰ"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ਯਾਤ�ਾਰ"
@@ -12961,722 +12022,546 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ਯਾਤ�ਾਰ"
 msgid "Import mail from Elm."
 msgstr "Elm ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫ�ਲਡਰ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "�ਾ�� �ਾਰ� ਹ� %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "ਪਾ�ਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ�"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ਯਾਤ�ਾਰ"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "Pine ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ਨ�ੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤ�� ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "ਵਿਸ਼ਾ ਹ� %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ਪੱਤਰ ਲਿਸ�"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] " %d ��ਣਿ�, "
-msgstr[1] " %d ��ਣ�, "
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d ਹ�ਾ��"
-msgstr[1] "%d ਹ�ਾ�"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d �ੰ�"
-msgstr[1] "%d �ੰ�"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d ਡਰਾਫ�"
-msgstr[1] "%d ਡਰਾਫ�"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d ਭ��ਿ�"
-msgstr[1] "%d ਭ���"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d ਨਾ-ਭ��ਿ�"
-msgstr[1] "%d ਨਾ-ਭ���"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d �ਣ-ਰ�ਡ, "
-msgstr[1] "%d �ਣ-ਰ�ਡ, "
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d ��ੱਲ"
-msgstr[1] "%d ��ੱਲ"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "ਪੱਤਰ ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਨ�ੰ �ੱਪਡ�� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।"
-
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
 
-#: ../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:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>ਭ��ਣ ਵਾਲ� ਦ� ਫ���</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>ਦਸਤ�ਤ(_n)</b>"
-
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>�ਾਪ ਪ�ਸ�ਿੰ� ��ਣ</b> (ਸਿਫਾਰਸ਼� ਨਹ�� ਹ�)"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>ਭਾਸ਼ਾਵਾ�(_L)</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">��ਾ��� �ਾਣ�ਾਰ�</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">ਪ�ਰਮਾਣ�ਿਤਾ</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">ਸ�ਨ�ਹ� ਲਿ�ਣ�</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">ਸੰਰ�ਨਾ</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">ਮ�ਲ ਵਿਵਹਾਰ</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">ਪੱਤਰ ਹ�ਾ�</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਹ�ੱਡਰ ਵ���(_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">ਲ�ਬਲ</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">�ਿੱਤਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਵ��ਾ�</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਫ��</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਰਸ�ਦ</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">��ਣਵ�� �ਾਣ�ਾਰ�</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">��ਣ</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">�ਾਫ� ਵਧ�� ਨਿੱ��ਤਵ (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">�ਪ� ਫ��</span>"
+#: ../mail/mail-config.ui.h:3
+#| msgid "No Information"
+msgid "Account Information"
+msgstr "��ਾ��� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ਪਰਾ�ਸ� ਸ��ਿੰ�</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">ਲ���ਦ� �ਾਣ�ਾਰ�</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">ਸ�ਰੱ�ਿ�ਤ MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">ਸ�ਰੱ�ਿ�</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">ਭ��� ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ਸਰਵਰ ਸੰਰ�ਨਾ</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">ਪਰਮਾਣ�ਿਤਾ �ਾ�ਪ(_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "��ਾ��� ਪਰਬੰਧ"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "ਨਵ�� ਦਸਤ�ਤ ਸ਼ਾਮਿਲ �ਰ�(_w)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "ਸ��ਰਿਪ� ����(_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�ਸ ��ਾ��� ਵਿੱ��� ਭ��ਣ ਵਾਲ� ਸ�ਨਹਿ�� ਤ� ਹਮ�ਸ਼ਾ ਦਸਤ�ਤ �ਰ�(_w)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "���ਰਿਪਸ਼ਨ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ��ਦ �ੰ��ਰਿਪ� �ਰ�(_f)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ �ਾਰਬਨ �ਾਪ� ਭ��� �ਾਵ�(CC):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ��ਵ�� �ਾਪ� ਭ��� �ਾਵ�(_BCC):"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "���ਰਿਪਸ਼ਨ �ਰਨ ਸਮ�� ਮ�ਰ� ��-ਰਿੰ� �ੱਤ� ਭਰ�ਸਾ ਰੱ��(_t)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "���ਰਿਪ�ਡ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ਮ�ਨ�ੰ ਹਮ�ਸ਼ਾ �ੰ��ਰਿਪ� �ਰ�(_m)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
-#: ../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.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "ਪ�ਰਮਾਣਿ�ਤਾ"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "�ਮ�ਸ਼ਨ �ਿੱਤਰ ���ਮ��ਿ� ਸ਼ਾਮਿਲ �ਰ�(_e)"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "ਬਾਲ�ਿ� (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "ਬਾਲ�ਿ� (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "�ੱ�ਰ ਸਮ�ਹ(_h):"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "�ੰ� ਲ� �ਸ�ਮ ਹ�ੱਡਰ ��ੱ� �ਰ�(_s)"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_m)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "I �ਿਸਮ ਲ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ� �ਾ�� �ਰ�"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "ਸਾ�(_a)"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "ਸਾ�(_r)"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "�ਲਤ ਸ਼ਬਦ-��� �ੱ�ਰਾ� ਦਾ ਰੰ�(_m):"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:25
+#| msgid "Compose Message"
+msgid "Composing Messages"
+msgstr "ਸ�ਨ�ਹਾ ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ਸੰਰ�ਨਾ"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "ਫ�ਲਡਰ ਦ� ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼�� �ਰ�(_w)"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ਮ�ਬਾਰ�, ਤ�ਸ�� ਪੱਤਰ ਸੰਰ�ਨਾ ਸੰਪ�ਰਨ �ਰ ਲ� ਹ�।\n"
-"\n"
-"ਹ�ਣ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ� ਪੱਤਰ ਭ�� ਤ� ਪ�ਰਾਪਤ �ਰ\n"
-"ਸ�ਦ� ਹ�।\n"
-"\n"
-"�ਿਰਪਾ �ਰ�� �ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
+#: ../mail/mail-config.ui.h:29
+#| msgid "Default Priority:"
+msgid "Default Behavior"
+msgstr "ਡਿਫਾਲ� ਰਵੱ��"
 
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "ਮ�ਲ(_f)"
-
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "ਮ�ਲ �ੱ�ਰ ���ਡਿੰ�(_n):"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:32
+#| msgid "Delete"
+msgid "Delete Mail"
+msgstr "ਮ�ਲ ਹ�ਾ�"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਮ�ਲ ਹ�ਾ�(_x)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਡਿ���ਲ ਸਾ�ਨ �ਰ� (ਡਿਫਾਲ�)(_s)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:36
+#| msgid "All Message _Headers"
+msgid "Displayed Message _Headers"
+msgstr "ਵ��ਾ� ਸ�ਨ�ਹਾ ਹ�ੱਡਰ(_H)"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ਮ�ਲ ਵਿੱ� ���ਸ� ਸਮੱ�ਰ� ਫਾਰਮ�� ਨਾ �ਰ�, �� ���ਸ� ਸਾ��਼ ਵੱਧ �ਾਵ�(_z)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�� ਭ��ਣ ਵਾਲਾ ਮ�ਰ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ�ਵ� ਤਾ� ਸ�ਨ�ਹਾ �ੰ� ਨਾ ਬਣਾ�(_k)"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "ਸਮਾਪਤ"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "��� ਨਾ �ਰ�"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫ� ਫ�ਲਡਰ(_F):"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "�-ਮ�ਲ ��ਾ���"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ(_A):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਫ�ਲਡਰ ਬੰਦ �ਰ ਦਿ�(_x)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "ਮ��ਿ� ਸਪ�ਸਬਾਰ ਯ��(_p)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��(_r)"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ���(_p):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ(ਮ�ਲ ਹ�)(_g)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ���ਾ�(_x):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "ਸਥਿਰ ���ਾ� ਫ���(_e):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "ਫ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱ� ਫਾਰਮ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "ਪ�ਰਾ ਨਾ�(_E):"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾ�ਸ�:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲ� ਨ�ੰ �ਭਾਰ�(_q)"
 
-#: ../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.ui.h:59
+msgid "Inline"
+msgstr "ਲਾ�ਨ '�"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲ�ਬਲ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ��ਬਲ"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
+#: ../mail/mail-config.ui.h:65
+#| msgid "_Load Images"
+msgid "Loading Images"
+msgstr "�ਿੱਤਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "ਮ�ਲ ਹ�ੱਡਰ ��ਬਲ"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "ਮ�ਲ-ਬਾ�ਸ �ਿ�ਾਣਾ"
 
-#: ../mail/mail-config.glade.h:110
-msgid "Message Composer"
-msgstr "ਸ�ਨ�ਹਾ ਲ���"
+#: ../mail/mail-config.ui.h:68
+#| msgid "Messages"
+msgid "Message Display"
+msgstr "ਸ�ਨ�ਹਾ �ਲ�"
+
+#: ../mail/mail-config.ui.h:69
+#| msgid "Message contains"
+msgid "Message Fonts"
+msgstr "ਸ�ਨ�ਹਾ ਫ���"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:70
+#| msgid "Message Retract"
+msgid "Message Receipts"
+msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ�ਰਤਾ"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "�ਸ ਲ� ��� ਪਰਾ�ਸ� ਨਹ��(_P):"
 
-#: ../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:113
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ਸ��ਨਾ: �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਪਹਿਲ�� ਵਾਰ ਲਾ��ਨ ਨਹ�� �ਰਦ�, ਤ�ਹਾਡ� ��ਲ�� ਪਾਸਵਰਡ ਪ��ਿ� ਨਹ�� �ਾਵ��ਾ"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "��ਣ ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਵ��ਾ, �� ਰਲਦਾ �ਸ�ਮ �ੰ� ਹ�ੱਡਰ ���ਿ� �ਾਵ�।"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#| msgid "Personal Information"
+msgid "Optional Information"
+msgstr "��ਣਵ�� �ਾਣ�ਾਰ�"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "ਸੰ�ਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../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. This "
-"name will be used for display purposes only."
-msgstr ""
-"�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। "
-"�ਹ ਨਾ� ਸਿਰ� ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
-
-#: ../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."
-msgstr ""
-"�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
-"ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
-
-#: ../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 "
-"information in email you send."
-msgstr ""
-"ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
-"ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "ਪ�ਰ�:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� ਵ� ਸ�ਨ�ਹ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�ਵ�, �� �ਿ Bcc ਪ�ਰਾਪਤ�ਰਨ ਵਾਲਿ�� ਲ� ਹ�ਵ�(_o)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:83
+#| msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "ਪ�ਰਿੱ�� ��ੱਡ ਪਰਾ�ਵ�ਸ� (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:85
+#| msgid "Print Memos"
+msgid "Printed Fonts"
+msgstr "ਪਰਿੰ� ��ਤ� ਫ���"
+
+#: ../mail/mail-config.ui.h:86
+#| msgid "Junk Settings"
+msgid "Proxy Settings"
+msgstr "ਪਰਾ�ਸ� ਸ��ਿੰ�"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "ਹਵਾਲਾ"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_m)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_p)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:92
+#| msgid "Server Information"
+msgid "Required Information"
+msgstr "ਲ���ਦ� �ਾਣ�ਾਰ�"
+
+#: ../mail/mail-config.ui.h:94
+#| msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgid "SSL is not supported in this build of Evolution"
+msgstr " SSL ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਲ� ਸਹਿਯ�� ਨਹ��"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਤਸਵ�ਰ ਦ� ��� ਸਿਰਫ਼ ਲ��ਲ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ� �ਰ�(_e)"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "��ਣ�(_e)..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "ਸ�ਨ�ਹਾ ਰਸ�ਦ ਭ���(_e):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "ਸ���ਡਰਡ ਫ���(_t):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "ਪਰਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/mail-config.ui.h:107
+#| msgid "<b>Sender Photograph</b>"
+msgid "Sender Photograph"
+msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ���"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "ਭ��� ਸ�ਨ�ਹ� ਫ�ਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:110
+#| msgid "Sent Messages"
+msgid "Sent and Draft Messages"
+msgstr "ਭ��� �ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../mail/mail-config.glade.h:142
-#| msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:112
+#| msgid "Server Information"
+msgid "Server Configuration"
+msgstr "ਸਰਵਰ ਸੰਰ�ਨਾ"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:114
+#| msgid "Signatures"
+msgid "Sig_natures"
+msgstr "ਦਸਤ�ਤ(_n)"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ(_n):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "ਦਸਤ�ਤ(_u):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "ਦਸਤ�ਤ ��ਬਲ"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "�ਦ�� �ਵਾਬ ਦ�ਣਾ ਹ�ਵ� ਤਾ� ਹ�ਠਾ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�(_t)"
 
-#: ../mail/mail-config.glade.h:149
-#| msgid "T_ype: "
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "�ਿਸਮ(_y):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾ� ਦ� ਲਿਸ�, ਸਿਰਫ �ਹਨਾ� ਨ�ੰ ਵ��ਾ�ਦ� ਹ�, �ਿਨਾ� ਲ� ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:123
 #| 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."
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
-"�ਸ ਸ��ਰਿਪ� ਦ� ���ਪ�ੱ� ਤ�ਹਾਡ� ਦਸਤ�ਤ ਵਿੱ� ਵਰਤ� �ਾਵ���।\n"
-"ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ �ਵ���।"
+"�ਸ ਸ��ਰਿਪ� ਦ� ���ਪ�ੱ� ਤ�ਹਾਡ� ਦਸਤ�ਤ ਵਿੱ� ਵਰਤ�\n"
+"�ਾਵ���।ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ\n"
+" �ਵ���।"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13684,217 +12569,250 @@ msgstr ""
 "ਨਾ� ਲਿ��, �ਿਸ ਨਾਲ ਤ�ਸ�� �ਸ ��ਾ��� ਨ�ੰ ਸੰਬ�ਧਨ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।\n"
 "�ਦਾਹਰਨ ਲ�: \"�ੰਮ�ਾਰ�\" �ਾ� \"ਨਿੱ��\""
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "ਯ��਼ਰ ਨਾ�(_e):"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਵਰਤ��(_n)"
 
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
 #: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ਯ��਼ਰ ਨਾ�(_n):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "�ਸਥਿਰ-���ਾ�(_a):"
 
-#: ../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."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਸੰਰ�ਨਾ ਸਹਾ�� ਵਲ�� �� ���� ਨ�ੰ\n"
-"\n"
-"ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "ਦਸਤ�ਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ ਹਮ�ਸ਼ਾ ਪ�ਰਾਪਤ �ਰ�(_A)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "ਪਰਮਾਣਿ�ਤਾ �ਾ�ਪ(_A)"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਲ� ਸਿੱਧਾ ��ਨ��ਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮ��ਿੰ� ਬ�ਨਤ� �ੱਤ� ਦਸਤ�਼ਤ ਨਾ �ਰ� (���ਲ�ੱ� �ਨ���ਲਤਾ ਲ�) (_D)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "�ਵਾਬ ਦ�ਣ ਸਮ�� ਦਸਤ�ਤ �ਸਲ�� ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ��(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:140
+#| msgid "Language"
+msgid "_Languages"
+msgstr "ਭਾਸ਼ਾ(_L)"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰ�ਾ� ਤ�� �� ਸ�ਨ�ਹਿ�� '� �ਿੱਤਰ ਲ�ਡ �ਰ�(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਹ� ਵ���(_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਮ�ਲ ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ�ਿ� ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ �ਦ� ਵ� ਲ�ਡ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "ਮਾਰ�(_P):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸ�ਨ�ਹਾ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ��ਣ ਸਮ�� ਪ�ੱ��, �� �ਿ ਨਹ�� �ਾਹ�ੰਦ� ਹਨ (_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ��ਣ ਸਮ�� ਪ�ੱ��(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "ਸ��ਰਿਪ�(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ�(_S):"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "��ਣ�(_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "ਸਰਵਰ(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "�ਿੱਤਰ ਸ��ਵਤਾ ਵ��ਾ�(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�ਮ�ਲ �ਲ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���(_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹ�ੱਡਰ ਨ�ੰ ਸ�ੰ���(_S) "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ਹ�ਰ �ਾਰ� ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#| msgid "am"
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "�ਡਰ�ੱਸ"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#| msgid "by"
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "ਰੰ�"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "ਵ�ਰਵਾ"
 
-#: ../mail/mail-config.glade.h:197
-msgid "seconds"
-msgstr "ਸ�ਿੰ�"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "     "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>��� ਫ�ਲਡਰ ਸਰ�ਤ</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">ਡਿ���ਲ ਦਸਤ�ਤ</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">���ਰਿਪਸ਼ਨ</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "ਸਭ ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "ਸਭ ਸਥਾਨ� �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "ਸਭ ਸਥਾਨ� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "�ਾਲ"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ਮ��ੰਮਲ(_m)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "ਨਿਸ਼ਾਨ ਦ� ਪਿੱ��"
+#: ../mail/mail-dialogs.ui.h:7
+#| msgid "Edit Signature"
+msgid "Digital Signature"
+msgstr "ਡਿ�਼�ਲ ਦਸਤ�ਤ"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "�ੱ�� ਨਾ ਭ���"
+
+#: ../mail/mail-dialogs.ui.h:9
+#| msgid "Encrypt"
+msgid "Encryption"
+msgstr "�ੰ��ਰਿਪਸ਼ਨ"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "ਫ�ਲਡਰ ਮ��ਬਰ�"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "ਸਹਾ��"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "ਤ�ਹਾਡ� �ਾਣ�ਾਰ� ਲ�"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "�ੱ��"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "��� �ਵਾਬ ਲ���ਦਾ ਨਹ�� ਹ�"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "ਸਭ ਨ�ੰ �ਵਾਬ"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "ਮ��-�ਾ��"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "ਸਰਵਰ(_e):"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+#| msgid "Search Folder source"
+msgid "Search Folder Sources"
+msgstr "��� ਫ�ਲਡਰ ਸਰ�ਤ"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "ਸ�ਰੱ�ਿ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "�ਾਸ ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13902,42 +12820,42 @@ msgstr ""
 "ਸ�ਨ�ਹ�, �� �ਿ ਤ�ਸ�� ਪਿੱ�ਾ �ਰਨ ਲ� ��ਣ� ਸਨ, ਹ�ਠਾ� ਦਿੱਤ� �ਾ ਰਹ� ਹਨ।\n"
 "�ਿਰਪਾ �ਰ�� \"ਨਿਸ਼ਾਨ\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "ਦ�ਣਯ��(_D):"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ� %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲ� �ਾ ਰਹ� ਹਨ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� �ਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13946,123 +12864,136 @@ msgstr ""
 "%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s\n"
 "ਲ��ਲ`Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ਸਥਾਨ� `Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸ�ਨ�ਹ� %2$d ਵਿੱ��� %1$d ਭ��ਣ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
-msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
+#: ../mail/mail-ops.c:905
+#, c-format
+#| msgid "Saving message to folder"
+msgid "Saving message to folder '%s'"
+msgstr "ਸ�ਨ�ਹਾ '%s' ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/mail-ops.c:982
+#, c-format
+#| msgid "Moving messages to %s"
+msgid "Moving messages to '%s'"
+msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
-msgstr "%s ਵਿੱ� ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
+#| msgid "Copying messages to %s"
+msgid "Copying messages to '%s'"
+msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:1091
 #, c-format
-msgid "Copying messages to %s"
-msgstr "%s ਵਿੱ� ਸ�ਨ�ਹ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
+#| msgid "Scanning folders in \"%s\""
+msgid "Scanning folders in '%s'"
+msgstr "'%s' ਵਿੱ� ਫ�ਲਡਰ �ਾ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "�ੱ�� ਭ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
-msgstr "ਫ�ਲਡਰ %s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Opening folder %s"
+msgid "Opening folder '%s'"
+msgstr "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1277
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "%s ਫ�ਲਡਰ ���ਾ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
+#| msgid "Retrieving quota information for folder %s"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "'%s' ਫ�ਲਡਰ ਲ� ���ਾ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-ops.c:1346
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
-msgstr "ਸ��ਰ %s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Opening store %s"
+msgid "Opening store '%s'"
+msgstr "ਸ��ਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
-msgstr "ਫ�ਲਡਰ %s ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Removing folder %s"
+msgid "Removing folder '%s'"
+msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "��ਾ��� '%s' ਸ�ੰ��ਿ� �ਾ ਰਿਹਾ ਹ� �ਤ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "��ਾ��� '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
-msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+#: ../mail/mail-ops.c:1685
+#, c-format
+#| msgid "Refreshing folder"
+msgid "Refreshing folder '%s'"
+msgstr "'%s' ਫ�ਲਡਰ ਤਾ�਼ਾ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
-msgid "Expunging folder"
-msgstr "ਨਿ�ਾਲਾ ਫ�ਲਡਰ"
+#: ../mail/mail-ops.c:1725
+#, c-format
+#| msgid "Expunging folder"
+msgid "Expunging folder '%s'"
+msgstr "'%s' ਨਿ�ਾਲਾ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱ� ਰੱਦ� �ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
-msgstr "ਸਥਾਨ� ਫ�ਲਡਰ"
+msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
-msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14071,11 +13002,11 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "ਨੱਥ� ਸੰਭਾਲ�"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14084,134 +13015,131 @@ msgstr ""
 "���ਪ�ੱ� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "%s ਨਾਲ�� ��ਨ��ਸ਼ਨ �ਤਮ ��ਤਾ �ਾ�ਦਾ ਹ�"
+#| msgid "Disconnecting from %s"
+msgid "Disconnecting from '%s'"
+msgstr "'%s' ਨਾਲ�� ��ਨ��ਸ਼ਨ �ਤਮ ��ਤਾ �ਾ�ਦਾ ਹ�"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "%s ਨਾਲ ਮ�� ���ਿ� �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Reconnecting to %s"
+msgid "Reconnecting to '%s'"
+msgstr "'%s' ਨਾਲ ਮ�� ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
-msgstr "ਸ�ਵਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
+msgstr "ਸਰਵਿਸ �ਾ��� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "ਰੱਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭ��� �ਤ� ਲਵ�"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "�ੱਪਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "�ਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "ਯ��਼ਰ ਨ� �ਾਰਵਾ� ਰੱਦ ��ਤ�।"
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "ਸੰਭਾਲ� ਤ� ਬੰਦ �ਰ�(_S)"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "ਦਸਤ�ਤ ਸ�ਧ"
+#: ../mail/mail-session.c:663
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭਿ�, ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਨ�ੰ ਰੱਦ ��ਤਾ �ਿ�।"
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ�`%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "�ਲਤ ਫ�ਲਡਰ: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "��� ਫ�ਲਡਰ ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਸ�ਧ"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1265
 msgid "New Search Folder"
 msgstr "ਨਵਾ� ��� ਫ�ਲਡਰ"
 
@@ -14295,75 +13223,85 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "�� ਤ�ਸ�� ਸ�ਨ�ਹ� ਨ�ੰ HTML ਫਾਰਮ�� ਵਿੱ� ਭ��ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
 #: ../mail/mail.error.xml.h:16
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ �ਲਤ �ਡਰ�ੱਸ ਨ�ੰ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../mail/mail.error.xml.h:17
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ �ਲਤ �ਡਰ�ੱਸ ਨਾਲ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ ਸਿਰਫ BCC ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "�� ਤ�ਸ�� ਪੱਤਰ ਨ�ੰ ਵਿਸ਼� ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "�ਿ���ਿ \"{0}\""
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "�ਿ���ਿ \"{2}\"।"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "�ਾਲ� ਦਸਤ�ਤ"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "��� ਫ�ਲਡਰ \"{0}\" ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ \"{1}\" ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "ਫ�ਲਡਰ \"{0}\" ਨਹ�� ਬਣ ਸ�ਿ�।"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "�ਰ�� ਸੰਭਾਲ ਡਾ�ਰ���ਰ� ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�ਰ�� ਸੰਭਾਲ ਡਾ�ਰ���ਰ� ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�, �ਿ��ਿ \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "\"{0}\" ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ਸਿਸ�ਮ ਫ�ਲਡਰ \"{0}\" ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "��� ਫ�ਲਡਰ \"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ਹ ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ਫ�ਲਡਰ \"{0}\" ਨ�ੰ \"{1}\" ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "ਸਰ�ਤ \"{1}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "ਸਰ�ਤ\"{2}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "ਨਿਯਤ \"{2}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -14371,35 +13309,35 @@ msgstr ""
 "ਲਾ�ਸ��ਸ ਫਾ�ਲ \"{0}\" ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ੰਸ�ਾਲ�ਸ਼ਨ ਸਮੱਸਿ� ਹ�। ਤ�ਸ�� �ਹ �ਪਲੱਬਧ "
 "�ਰਤਾ ਨ�ੰ ਵਰਤਣ ਦ� ਤੱਦ ਤੱ� ਯ�� ਨਹ�� ਹ� ਸ�ਦ�, �ਦ ਤੱ� ਲਾ�ਸ��ਸ ਨਾਲ ਸਹਿਮਤ ਨਹ�� ਹ�ੰਦ�।"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਦਾ ਨਾ� \"{1}\" ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ਸਿਸ�ਮ ਫ�ਲਡਰ \"{0}\"; ਦਾ ਨਾ� ਤਬਦ�ਲ �ਾ� ਭ��ਿ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "��ਾ��� ਲ� ਤਬਦ�ਲ��� ਸੰਭਾਲ��� ਨਹ�� �ਾ ਸ�ਦ��� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ਡਾ�ਰ���ਰ� \"{0}\" ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "ਫਾ�ਲ \"{0}\" ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ਦਸਤ�ਤ ਸ��ਰਿਪ� \"{0}\" ਸ�� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "�ੰ� ��ੱ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14407,99 +13345,83 @@ msgstr ""
 "�ਾ�� �ਰ� �ਿ ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਸਹ�� ਤਰਾ� ਭਰਿ� ਹ�। �ਹ ਯਾਦ ਰੱ�� �ਿ ਪਾਸਵਰਡ �ੱ�ਰ ਪ�ਰਤ� ਸੰਵ�ਦਨਸ਼�ਲ "
 "ਹ�, ਤ�ਸ�� ਸ਼ਾ�ਦ �ਪਣਾ ��ਪਸ ਲਾੱ� �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "ਦਸਤ�ਤ� ਫਾ�ਲ ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "\"{0}\" ਹ�ਾ�ਣਾ ਹ�?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "��ਾ��� ਹ�ਾ�?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "\"{0}\" ��� ਫ�ਲਡਰ ਵਿੱ��� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "��� ਫ�ਲਡਰ ਵਿੱ��� ਸ�ਨ�ਹ� ਹ�ਾ�"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "�� ਤਬਦ�ਲ��� ਰੱਦ �ਰਨ��� ਹਨ?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "ਨਾ ਹ�ਾ�(_e)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "ਨਾ ਹ�ਾ�"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "�ਯ�� ਨਾ �ਰ�"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਸਥਾਨ� ਸਮ�ਾਲ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "�� ਤ�ਸ�� ਤਬਦ�ਲ��� ਸੰਭਾਲਣ��� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "ਪਾਸਵਰਡ ਭਰ�।"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "ਫਿਲ�ਰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�।"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "�ਾਰਵਾ� �ਰਨ ਦ�ਰਾਨ �ਲਤ�।"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "{0} ਦ�ਰਾਨ �ਲਤ�।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਸ �ੱਪਰ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਹ ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� ਤ�ਸ�� �ਹਨਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮ��-ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ਸਭ ਪਰਾ�ਸ� ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14507,11 +13429,11 @@ msgstr ""
 "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� �ਤ� ਸਭ ਪਰਾ�ਸ� �ਾਣ�ਾਰ� ਨ�ੰ\n"
 "ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14519,19 +13441,23 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਬੰਦ �ਰ ਦਿੱਤਾ, ਤਾ� �ਹ ਸ�ਨ�ਹ� �ਦ�� ਤੱ� ਭ��� ਨਹ�� �ਾਣ��, �ਦ�� ਤੱ� �� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� "
 "��ਤਾ �ਾਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "�ਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਲਤ"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:68
+msgid "Mail Deletion Failed"
+msgstr "ਮ�ਲ ਹ�ਾ�ਣਾ ਫ�ਲ�ਹ"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲ�ਰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� ��ਤ� �� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14542,37 +13468,33 @@ msgstr ""
 "���ਰ ਸ਼ਾਮਿਲ ��ਤਾ ਹ�, ਤਾ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਤਾ �ਾਹਿਰ ਹ� �ਾਣ��। �ਸ ਤ�� ਬੱ�ਣ ਲ� ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� "
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ�� ਬਣਾ�"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "ਫ�ਲਡਰ ��ੰਮ ਹ�।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "��� ਸਰ�ਤ ਨਹ�� ��ਣਿ�।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "�ੱ�� ਸਮ�� �ੰਨ� ਸ�ਨ�ਹ� ��ਲਣ ਲ� ਲੰਮਾ ਸਮਾ� ਲੱ� ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr "�ਿਰਪਾ �ਰ�� ਵੱਲ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲ ਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ �ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14582,64 +13504,60 @@ msgstr ""
 "ਲ� ਸੰਭਵ ਵ� ਹ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "�ਸ ਦਸਤ�ਤ ਲ� ਵਿਲੱ�ਣ ਨਾ� ਦਿ� ��।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "�ਿਰਪਾ �ਰ�� �ਡ���।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ਪ�ਰਾਣ� ਪੱਤਰ ਫ�ਲਡਰ \"{0}\" ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� ਸਮੱਸਿ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "�ਿ�ਰਿੰ� ਸਰਵਰ"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ�ਾ� ਦ� ਸ��� ਲ� ਸਰਵਰ ਨ�ੰ ਬ�ਨਤ� ��ਤ� �� ਹ�।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "ਪ�ਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰ \"{0}\" �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "�ੰ� ਰਿਪ�ਰ� ਲ� ਫ�ਲ�ਹ"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "�ੰ� ਨਹ�� ਫ�ਲ�ਹ ਹ�ਣ ਦ� ਰਿਪ�ਰ� ਦਿ�"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "��� ਫ�ਲਡਰਾ� ਨ�ੰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "ਰਸ�ਦ ਭ���"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "ਸ��ਰ�ਨਾ��਼"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਫ�ਲਡਰ ਲ��ਲ� ਸਿ�ਰ�ਨਾ��਼ �ਰਨ� ਹਨ?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14647,7 +13565,7 @@ msgstr ""
 "ਸਿਸ�ਮ ਫ�ਲਡਰ �ਵ�ਲ�ਸ਼ਨ ਦ� �ੰਮ �ਰਨ ਲ� ਲਾ�ਮ� ਹਨ �ਤ� �ਹਨਾ� ਨ�ੰ ਤਬਦ�ਲ, ਨਾ�-ਤਬਦ�ਲ �ਾ� ਹ�ਾ�ਣਾ "
 "ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14663,7 +13581,7 @@ msgstr ""
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
 #  mail:vfolder-updated secondary
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14677,7 +13595,7 @@ msgstr ""
 "    \"{1}\"\n"
 "�ਤ� �ੱਪਡ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14691,6 +13609,18 @@ msgstr ""
 "    \"{1}&\"\n"
 "�ਤ� �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�।"
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
 #  mail:signature-notscript secondary
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -14766,6 +13696,10 @@ msgstr ""
 "�ਾਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "�ਹ ਪੱਤਰ ਹ�ਾ�ਣ ਲ� ਤ�ਹਾਨ�ੰ ਲ���ਦ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ।"
+
 #  mail:account-incomplete secondary
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
@@ -14812,6 +13746,11 @@ msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 msgid "_Do not Synchronize"
 msgstr "ਸ��ਰ�ਨਾ��਼ ਨਾ �ਰ�(_D)"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:930
+msgid "_Empty Trash"
+msgstr "ਰੱਦ� �ਾਲ�(_E)"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "ਸ�ੰ���(_E)"
@@ -14820,90 +13759,98 @@ msgstr "ਸ�ੰ���(_E)"
 msgid "_Open Messages"
 msgstr "ਸ�ਨ�ਹ� ��ਲ�ਹ�(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "ਨਾ-ਵ���"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "ਵ���"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "�ਵਾਬ ਦਿੱਤ�"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "�ੱ�� ਭ��ਿ�"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹ� ਨਾ-ਵ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "ਨਿ�ਨਤਮ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "�ੱ�"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "ਸਭ ਤ�� ਵੱਧ"
 
-#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "�ੱ� %l:%M %p"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "�ੱਲ�ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+msgid "Shell Backend"
+msgstr "ਸ�ੱਲ ਬ����ਡ"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
 msgid "Generating message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4720
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "��� ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ��� ਮ�ਤਾਬ� ਨਹ�� ਹ�। �ਾ� ਤਾ� ��� -> ��� ਮ�ਨ� ���ਮ ਰਾਹ�� ਸਾਫ਼ �ਰ� �ਾ� ਬਦਲ� ��।"
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4722
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਵਲ ਲ��ਵ�� ਸ�ਨ�ਹ� ਹ� ਹਨ। �ਹਨਾ� ਨ�ੰ ਵ��ਣ ਲ� ਵ���->ਲ��ਵ�� ਸ�ਨ�ਹ� ਵਰਤ��।"
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4724
 msgid "There are no messages in this folder."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -14932,7 +13879,6 @@ msgid "Sent Messages"
 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 "��ਾਰ"
@@ -14941,77 +13887,2314 @@ msgstr "��ਾਰ"
 msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ���ਾ ��ਤਾ"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "�ਾਲ"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "�ੱ�� ਨਾ ਭ���"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "ਸਹਾ��"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "ਤ�ਹਾਡ� �ਾਣ�ਾਰ� ਲ�"
-
-#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "�ੱ��"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "��� �ਵਾਬ ਲ���ਦਾ ਨਹ�� ਹ�"
-
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "�ਵਾਬ"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "ਸਭ ਨ�ੰ �ਵਾਬ"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "ਮ��-�ਾ��"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Body contains"
 msgstr "ਪੱਤਰ '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "Message contains"
 msgstr "ਸ�ਨ�ਹ� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "Recipients contain"
 msgstr "ਸ�ਨ�ਹ��� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "Sender contains"
 msgstr "ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
 msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:6
-#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "ਵਿਸ਼ਾ �ਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� '� ਹ�"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
+"SSL ਲ� ਸਹਾ�� ਹ���।"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
+"TLS ਲ� ਸਹਾ�� ਹ���।"
+
+#: ../modules/addressbook/addressbook-config.c:210
+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 ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �ਸਦਾ �ਰਥ ਹ� ਤ�ਹਾਡਾ "
+"��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
+
+#: ../modules/addressbook/addressbook-config.c:592
+#| msgid "Birthdays & Anniversaries"
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ ��ਲੰਡਰ(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "�ਫਲਾ�ਨ �ਪਰ�ਸ਼ਨ ਲ� ਬ�ੱ� ਸਮੱ�ਰ� �ਾਪ� �ਰ�(_b)"
+
+#: ../modules/addressbook/addressbook-config.c:736
+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 ਸਰਵਰ ਦ� �ਹ ਪ�ਰ� ਹ�, �ਿਸ ਤ� �ਵ�ਲ�ਸ਼ਨ ���ਨ ਦ� ��ਸ਼ਿਸ �ਰ ਰਿਹਾ ਹ�। �ੱ� ਸ���ਡਰਡ ਪ�ਰ�ਾ� "
+"ਦ� ਸ��� �ਪਲੱਬਧ ਹ�। �ਪਣ� ਸਿਸ�ਮ ਪ�ਰਬੰਧ� ਨ�ੰ ਪ�ੱ�� �ਿ �ਿਹ�� ਪ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ� ਹ�।"
+
+#: ../modules/addressbook/addressbook-config.c:810
+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 ਸਰਵਰ ਲ� ਬ�ਪ�ਾਣ ਪਹ�ੰ� ਲ���ਦ� ਹ�ਵ���।"
+
+#: ../modules/addressbook/addressbook-config.c:885
+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\" ਨਾਲ "
+"ਤ�ਹਾਡ� �ਧਾਰ ਤ�� �ੱ� ਪੱਧਰ ਤੱ� �ਾ�� ��ਤ� �ਾਵ���।"
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "ਸਰਵਰ �ਾਣ�ਾਰ�"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "ਵ�ਰਵਾ"
+
+#: ../modules/addressbook/addressbook-config.c:997
+msgid "Searching"
+msgstr "��� �ਾਰ� ਹ�"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "ਸਵ�-ਪ�ਰਤ� ਲੰਬਾ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#| msgid "Contact List"
+msgid "Contact layout style"
+msgstr "ਸੰਪਰ� ਲ���� ਸ�ਾ�ਲ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#| msgid "Month view vertical pane position"
+msgid "Contact preview pane position (vertical)"
+msgstr "ਸੰਪਰ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਵਰ���ਲ)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "ਮ��ੰਮਲ URI ਸ��� ਲ� EFolderList XML"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "ਮ��ੰਮਲ URI ਸ��� ਲ� EFolderList XML ਹ�।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "�ਡਰ�ੱਸ ਨਾਲ ���-ਪ�ਰਾ ਨਾ� ਵ���"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "�ਲ� ਪ�ਨ ਵ��ਾ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "�ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸਵ� ਪ�ਰਨ �ਾਰਵਾ� ਨ�ੰ ਸ਼�ਰ� �ਰ�, �ੱ�ਰਾ� ਦ� �ਿਣਤ� ਹ�।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "��ਣ� ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI ਹ�।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "�� ���ਰ� ਵਿੱ� ���-ਪ�ਰਨ ਸੰਪਰ� ਦ� ਨਾ� ਨਾਲ ਮ�ਲ �ਡਰ�ੱਸ ਵ��ਾ�ਣ ਲ� ਮ�ਬ�ਰ �ਰਨਾ ਹ�।"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "�� �ਲ� ਪ�ਨ ਵ��ਾ�ਣ� ਹ�"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "��ਬਲ �ਾਲਮ:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "ਸਵ�-ਪ�ਰਤ�"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸਾ� ਵ���"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "ਸੰਪਰ�(_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:763
+msgid "Create a new contact"
+msgstr "ਨਵਾ� ਸੰਪਰ� ਬਣਾ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "ਸੰਪਰ� ਲਿਸ�(_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
+msgid "Create a new contact list"
+msgstr "ਨਵ�� ਸੰਪਰ� ਸ��� ਬਣਾ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�(_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:693
+msgid "Create a new address book"
+msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "ਸੰਪਰ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
+#| msgid "Source"
+msgid "Source List"
+msgstr "ਸਰ�ਤ ਲਿਸ�"
+
+#: ../modules/addressbook/e-book-shell-backend.c:597
+#| msgid "Couldn't get list of address books"
+msgid "The registry of address books"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਰ�ਿਸ�ਰ�"
+
+#: ../modules/addressbook/e-book-shell-content.c:364
+#| msgid "_Current View"
+msgid "Current View"
+msgstr "ਮ���ਦਾ �ਲ�"
+
+#: ../modules/addressbook/e-book-shell-content.c:365
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:374
+#| msgid "New Contact"
+msgid "Previewed Contact"
+msgstr "�ਲ� ਵਿ�ਲਾ ਸੰਪਰ�"
+
+#: ../modules/addressbook/e-book-shell-content.c:375
+#| msgid "Whether to show the preview pane."
+msgid "The contact being shown in the preview pane"
+msgstr "�ਲ� ਬਾਹ� ਵਿੱ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਸੰਪਰ�"
+
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:613
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:688
+#| msgid "Sidebar is visible"
+msgid "Preview is Visible"
+msgstr "�ਲ� ਵਿ�ਾ� ਦਿੰਦ� ਹ�"
+
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:614
+#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/mail/e-mail-shell-content.c:689
+#| msgid "Whether to show the preview pane."
+msgid "Whether the preview pane is visible"
+msgstr "�� �ਲ� ਬਾਹ� ਵ��ਾ� ਦ�ਵ�"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP ਸਰਵਰ"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਸੰਪਰ� ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�।\n"
+"\n"
+"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"ਮ�ਲਿੰ� ਸ��� ਸੰਪਰ� ਦਾ ਫਾਰਮ�� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
+"\n"
+"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਦਾ ਫ�ਨ ਨੰਬਰ ਸੰਭਾਲਣਾ ਦਾ ਢੰ� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�\n"
+"\n"
+"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਦ� ਪਾਲਮ ਸਿ�ਰ�ਨਾ��਼ ਤਬਦ�ਲ ਲਾ� ਤ� ਫਾ�ਲ਼ �ਾ�ਾ ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
+"\n"
+"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
+#: ../modules/calendar/e-memo-shell-sidebar.c:687
+#: ../modules/calendar/e-task-shell-sidebar.c:687
+#| msgid "Memo Source Selector"
+msgid "Source Selector Widget"
+msgstr "ਸਰ�ਤ ��ਣ�ਾਰ� ਵਿਦ��ੱ�"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
+#, fuzzy
+#| msgid "Couldn't get list of address books"
+msgid "This widget displays groups of address books"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� ਸ��� ਨ�ੰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ��"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#| msgid "Save as vCard..."
+msgid "Save as vCard"
+msgstr "vCard ਵਾ�� ਸੰਭਾਲ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
+msgid "Co_py All Contacts To..."
+msgstr "ਸਭ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� �ਾਪ� (_p)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:672
+#, fuzzy
+#| msgid "Copy the contacts of the selected folder into another folder"
+msgid "Copy the contacts of the selected address book to another"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਭਾ�ਾ� ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#| msgid "Del_ete Address Book"
+msgid "D_elete Address Book"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�(_e)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:679
+#| msgid "Delete the selected folder"
+msgid "Delete the selected address book"
+msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:684
+msgid "Mo_ve All Contacts To..."
+msgstr "ਸਭ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ���(_v)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:686
+#, fuzzy
+#| msgid "Move the contacts of the selected folder into another folder"
+msgid "Move the contacts of the selected address book to another"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:691
+msgid "_New Address Book"
+msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:698
+msgid "Address _Book Properties"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ (_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:700
+#, fuzzy
+#| msgid "Change the properties of the selected folder"
+msgid "Show properties of the selected address book"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਤਬਦ�ਲ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "_Rename..."
+msgstr "ਨਾ� ਤਬਦ�ਲ(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected address book"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:712
+#, fuzzy
+#| msgid "S_ave Address Book As VCard"
+msgid "S_ave Address Book as vCard"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� VC_ard ਵਾ�� ਸੰਭਾਲ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#, fuzzy
+#| msgid "Save the contacts of the selected folder as VCard"
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ VCard ਵਾ�� ਸੰਭਾਲ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#, fuzzy
+#| msgid "Stop Loading"
+msgid "Stop loading"
+msgstr "ਲ�ਡ �ਰਨ ਨ�ੰ ਰ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:726
+#| msgid "_Copy Contact to..."
+msgid "_Copy Contact To..."
+msgstr "ਸੰਪਰ�ਾ� �ੱਥ� �ਾਪ� �ਰ�(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#| msgid "Copy selected contacts to another folder"
+msgid "Copy selected contacts to another address book"
+msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:733
+msgid "_Delete Contact"
+msgstr "ਸੰਪਰ� ਹ�ਾ�(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#| msgid "_Forward Contact..."
+msgid "_Find in Contact..."
+msgstr "ਸੰਪਰ� ਵਿੱ� ���(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed contact"
+msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:747
+msgid "_Forward Contact..."
+msgstr "ਸੰਪਰ� ਨ�ੰ �ੱ�� ਭ���(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
+msgid "Send selected contacts to another person"
+msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਵਿ��ਤ� ਨ�ੰ ਭ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:754
+#| msgid "_Move Contact to..."
+msgid "_Move Contact To..."
+msgstr "ਸੰਪਰ� �ੱਥ� ਭ���(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:756
+#, fuzzy
+#| msgid "Move selected contacts to another folder"
+msgid "Move selected contacts to another address book"
+msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+msgid "_New Contact..."
+msgstr "ਨਵਾ� ਸੰਪਰ�(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:768
+msgid "New Contact _List..."
+msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
+#| msgctxt "New"
+#| msgid "_Contact"
+msgid "_Open Contact"
+msgstr "ਸੰਪਰ� ��ਲ�ਹ�(_O)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:777
+msgid "View the current contact"
+msgstr "ਮ���ਦਾ ਸੰਪਰ� ਵ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:782
+msgid "_Send Message to Contact..."
+msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
+msgid "Send a message to the selected contacts"
+msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Actions"
+msgstr "�ਾਰਵਾ�(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "_Preview"
+msgstr "�ਲ�(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:833
+msgid "_Delete"
+msgstr "ਹ�ਾ�(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Properties"
+msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "_Save as vCard..."
+msgstr "vCard ਵਾ�� ਸੰਭਾਲ�(_S)...."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Contact _Preview"
+msgstr "ਸੰਪਰ� �ਲ�(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show contact preview window"
+msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ��ਾ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/calendar/e-memo-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+msgid "_Classic View"
+msgstr "��ਸਾਲ� �ਲ�(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#| msgid "Show message preview below the message list"
+msgid "Show contact preview below the contact list"
+msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਹ�ਠਾ� ਸੰਪਰ� �ਲ� ਵ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "_Vertical View"
+msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#, fuzzy
+#| msgid "Show contact preview window"
+msgid "Show contact preview alongside the contact list"
+msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ��ਾ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+msgid "Any Category"
+msgstr "��� ���ਾ�ਰ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:961
+msgid "Unmatched"
+msgstr "ਨਾ-ਮਿਲਦਾ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
+msgstr "ਤ�ਨ��� ���"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
+#| msgid "Print selected contacts"
+msgid "Print all shown contacts"
+msgstr "ਸਭ ਦਿ�ਾ� ਦਿੰਦ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#, fuzzy
+#| msgid "Previews the contacts to be printed"
+msgid "Preview the contacts to be printed"
+msgstr "ਪਰਿੰ� �ਾਣ ਵਾਲ� ਸੰਪਰ�ਾ� ਦ� �ਲ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+msgid "Print selected contacts"
+msgstr "��ਣ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
+msgid "Save as vCard..."
+msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#, fuzzy
+#| msgid "Save selected contacts as a VCard"
+msgid "Save selected contacts as a vCard"
+msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+#| msgid "Send _Message to Contacts"
+msgid "_Send Message to Contacts"
+msgstr "ਸੰਪਰ�ਾ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#| msgid "Send _Message to List"
+msgid "_Send Message to List"
+msgstr "ਲਿਸ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#| msgid "Send _Message to Contact"
+msgid "_Send Message to Contact"
+msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "�� vCards"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s ਲ� vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s ਲ� ਸੰਪਰ� �ਾਣ�ਾਰ�"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+msgid "1"
+msgstr "੧"
+
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr "੩੨੬੮"
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "੩੮੯"
+
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "à©«"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr "੬੩੬"
+
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr "�ਣ�ਾਣ"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "B_rowse this book until limit reached"
+msgstr "�ਹ �ਿਤਾਬ ਸ�ਮਾ �ੱਪ� ਤੱ� ਵ���(_r)"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "ਲਾ��ਨ(_g):"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
+#| msgid "Online"
+msgid "One"
+msgstr "�ੱ�"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "��� ਫਿਲ�ਰ"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "��� ਬ�ਸ(_b):"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "ਫਿਲ�ਰ ���(_F):"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"��� ਫਿਲ�ਰ �ੱ� �ਿਸਮ ਦ��� ���ਮਾ� ਦ� ��� ਲ� ਹਨ, �ਦ�� �ਿ ��� ��ਤ� �ਾਵ�। ���ਰ �ਸ ਵਿੱ� ਸ�ਧ ਨਾ "
+"��ਤ� �� ਤਾ�,  ਮ�ਲ ��� ਨ�ੰ \"ਵਿ��ਤ�\" �ਿਸਮ ਨ�ੰ ਮੰਨ �� ��� ��ਤ� �ਾਵ���।"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Sub"
+msgstr "�ਧ�ਨ"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "ਸਹਾ�� ��� �ਧਾਰ"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+#| msgid "Distinguished name"
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "ਡਾ�ਨਲ�ਡ ਸ�ਮਾ(_D):"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "ਸੰਭਵ ��� �ਧਾਰ ਲੱਭ�(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "ਲਾ��ਨ ਢੰ�(_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "ਪ�ਰ�(_P):"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "��� ਸ�ਮਾ(_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "ਸਮਾ�-ਸ�ਮਾ(_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "�ਾਰਡ"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "�ੰਪ�ਰ�(_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "��ਲੰਡਰ ��ਣ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "�ੰਮ ਲਿਸ� ��ਣ�"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "��ਲੰਡਰ ਵਿੱ� �ੰਪ�ਰ� �ਰ�(_m)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "�ੰਮ �ੰਪ�ਰ�(_m)"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "ਵ�ੱਬ ਤ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "ਮ�ਸਮ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "ਮ�ਲਾ�ਾਤ(_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+msgid "Create a new appointment"
+msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "ਮ��ਿੰ�(_e)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "��ਲੰਡਰ(_n)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+msgid "Create a new calendar"
+msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
+msgid "Calendar and Tasks"
+msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:778
+#| msgid "Primary calendar"
+msgid "The registry of calendars"
+msgstr "��ਲੰਡਰਾ� ਲ� ਰ�ਿਸ�ਰ�"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�। \n"
+"\n"
+"�ਿਰਪਾ �ਰ�� ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ�, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#  FIXME: set proper domain/code
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "evolution/config.xmldb ਤ�� ਪ�ਰਾਣ� ਸ��ਿੰ� ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
+
+#  FIXME: domain/code
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "��ਲੰਡਰ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
+#, c-format
+#| msgid ""
+#| "Error on %s:\n"
+#| " %s"
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s �ੱਤ� �ਲਤ�\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#| msgid "Loading Calendar"
+msgid "Loading calendars"
+msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:527
+#| msgid "Calendar Source Selector"
+msgid "Calendar Selector"
+msgstr "��ਲੰਡਰ ��ਣ�ਾਰ "
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:741
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:742
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:751
+#| msgid "Default Mail Client"
+msgid "Default Calendar Client"
+msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ �ਲਾ��"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:752
+msgid "Default client for calendar operations"
+msgstr "��ਲੰਡਰ �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:762
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:949
+#, fuzzy, c-format
+#| msgid "Opening calendar"
+msgid "Opening calendar at %s"
+msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+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 "
+"events."
+msgstr ""
+"�ਹ ��ਣ� ਸਮ�� ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦ�ਵ��ਾ। ���ਰ ਤ�ਸ�� �ਾਰ� ਰਹ� ਤਾ�, �ਹ ��ਨਾਵਾ� "
+"ਮ�� ਪ�ਰਾਪਤ ਨਹ�� ਹ� ਸ�ਣ����।"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "�ਸ ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਸ�ਧ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
+#| msgid "Copying items"
+msgid "Copying Items"
+msgstr "���ਮਾ� ਦ� �ਾਪ� �ਾਰ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
+#| msgid "Moving items"
+msgid "Moving Items"
+msgstr "���ਮਾ� ਭ����� �ਾ ਰਹ��� ਹਨ"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+#| msgid "Sent"
+msgid "event"
+msgstr "�ਵ���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:632
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "Save as iCalendar"
+msgstr "��ਲੰਡਰ ��ਣ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
+msgid "_Copy..."
+msgstr "ਨ�ਲ(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "D_elete Calendar"
+msgstr "��ਲੰਡਰ ��ਣ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#, fuzzy
+#| msgid "Delete the selected folder"
+msgid "Delete the selected calendar"
+msgstr "��ਣਿ� ਫ�ਲਡਰ ਹ�ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#, fuzzy
+#| msgid "Go back"
+msgid "Go Back"
+msgstr "ਪਿੱ�� �ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#, fuzzy
+#| msgid "Go forward"
+msgid "Go Forward"
+msgstr "�ੱ�� �ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+msgid "Select _Today"
+msgstr "�ੱ� ��ਣ�(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+msgid "Select today"
+msgstr "�ੱ� ��ਣ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+msgid "Select _Date"
+msgstr "ਮਿਤ� ��ਣ�(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+msgid "Select a specific date"
+msgstr "�ਾਸ ਮਿਤ� ��ਣ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+msgid "_New Calendar"
+msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "Purg_e"
+msgstr "ਨਿ���(_e)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+msgid "Purge old appointments and meetings"
+msgstr "ਪ�ਰਾਣ� ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�ਾ� ਵਿੱ� ਸ�ਧ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "Re_fresh"
+msgstr "ਮ��-ਤਾ�ਾ(_f)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Refresh the selected calendar"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected calendar"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#| msgid "Show _only this Calendar"
+msgid "Show _Only This Calendar"
+msgstr "ਸਿਰਫ਼ �ਹ ��ਲੰਡਰ ਹ� ਵ���(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+msgid "Cop_y to Calendar..."
+msgstr "��ਲੰਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+msgid "_Delegate Meeting..."
+msgstr "ਡ�ਲ���� ਮ��ਿੰ�(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#| msgid "Delete the appointment"
+msgid "_Delete Appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਹ�ਾ�(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#| msgid "Delete the appointment"
+msgid "Delete selected appointments"
+msgstr "��ਣ� ਮ�ਲਾ�ਾਤ ਹ�ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#| msgid "Delete this _Occurrence"
+msgid "Delete This _Occurrence"
+msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete this occurrence"
+msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#| msgid "Delete _All Occurrences"
+msgid "Delete All Occ_urrences"
+msgstr "ਸਾਰ��� ਮ���ਦ���� ਹ�ਾ�(_u)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Delete all occurrences"
+msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#| msgid "New All Day _Event"
+msgid "New All Day _Event..."
+msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ���(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#, fuzzy
+#| msgid "Create a new all-day appointment"
+msgid "Create a new all day event"
+msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_Forward as iCalendar..."
+msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#| msgid "New _Meeting"
+msgid "New _Meeting..."
+msgstr "ਨਵ�� ਮ��ਿੰ�(_M)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting"
+msgstr "ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "Mo_ve to Calendar..."
+msgstr "��ਲੰਡਰ ਵਿੱ� ਭ���(_v)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+msgid "New _Appointment..."
+msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+msgid "Make this Occurrence _Movable"
+msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+msgid "_Open Appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ��ਲ�ਹ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "View the current appointment"
+msgstr "ਮ���ਦਾ ਮ�ਲਾ�ਾਤ ਦ���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+msgid "_Reply"
+msgstr "�ਵਾਬ(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#, fuzzy
+#| msgid "Save as vCard..."
+msgid "Save as iCalendar..."
+msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Schedule Meeting..."
+msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#, fuzzy
+#| msgid "Purge old appointments and meetings"
+msgid "Converts an appointment to a meeting"
+msgstr "ਪ�ਰਾਣ� ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�ਾ� ਵਿੱ� ਸ�ਧ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#, fuzzy
+#| msgid "New _Appointment..."
+msgid "Conv_ert to Appointment..."
+msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#, fuzzy
+#| msgid "%s at the end of the appointment"
+msgid "Converts a meeting to an appointment"
+msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ੰਤ %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+msgid "Day"
+msgstr "ਦਿਨ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+msgid "Show one day"
+msgstr "�ੱ� ਦਿਨ ਵ��ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+msgid "List"
+msgstr "ਸ���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+msgid "Show as list"
+msgstr "ਸ��� ਦ� ਤਰਾ� ਵ���"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+msgid "Month"
+msgstr "ਮਹ�ਨਾ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+msgid "Show one month"
+msgstr "�ੱ� ਮਹ�ਨਾ ਵ��ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+msgid "Week"
+msgstr "ਹਫਤਾ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+msgid "Show one week"
+msgstr "�ੱ� ਹ�ਤਾ ਵ��ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#, fuzzy
+#| msgid "Show one week"
+msgid "Show one work week"
+msgstr "�ੱ� ਹ�ਤਾ ਵ��ਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+msgid "Active Appointments"
+msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+msgid "Next 7 Days' Appointments"
+msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Description contains"
+msgstr "ਵ�ਰਵ� ਵਿੱ� ਸ਼ਾਮਿਲ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-task-shell-view-actions.c:992
+msgid "Summary contains"
+msgstr "ਸੰ��ਪ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+msgid "Print this calendar"
+msgstr "�ਹ ��ਲੰਡਰ ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#, fuzzy
+#| msgid "Previews the calendar to be printed"
+msgid "Preview the calendar to be printed"
+msgstr "ਪਰਿੰ� �ਰਨ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+msgid "Go To"
+msgstr "�ਾ�"
+
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:505
+#| msgid "Memo"
+msgid "memo"
+msgstr "ਮ�ਮ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#| msgid "New memo"
+msgid "New _Memo"
+msgstr "ਨਵਾ� ਮ�ਮ�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Create a new memo"
+msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ��ਾ� ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
+msgid "_Open Memo"
+msgstr "ਮ�ਮ� ��ਲ�ਹ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "View the selected memo"
+msgstr "��ਣ� ਮ�ਮ� ਵ���"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "Open _Web Page"
+msgstr "ਵ�ੱਬ ਸਫਾ ��ਲ�(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#| msgid "View the selected memo"
+msgid "Print the selected memo"
+msgstr "��ਣਿ� ਮ�ਮ� ਪਰਿੰ� �ਰ�"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:630
+#| msgid "Task"
+msgid "task"
+msgstr "�ਾਸ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:692
+msgid "_Assign Task"
+msgstr "�ੰਮ �ਾਰ� �ਰ�(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_Mark as Complete"
+msgstr "ਨਿਸ਼ਾਨਾ ਪ�ਰਾ(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Mark selected tasks as complete"
+msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+#, fuzzy
+#| msgid "Mark selected tasks as complete"
+msgid "Mark selected tasks as incomplete"
+msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "New _Task"
+msgstr "ਨਵਾ� �ੰਮ(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Create a new task"
+msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+msgid "_Open Task"
+msgstr "�ੰਮ ��ਲ�ਹ�(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "View the selected task"
+msgstr "��ਣ� �ਾਰ� ਵ���"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-task-shell-view-actions.c:1033
+#| msgid "_Forward as iCalendar..."
+msgid "_Save as iCalendar..."
+msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#| msgid "View the selected task"
+msgid "Print the selected task"
+msgstr "��ਣ� �ਾਸ� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "ਮ�ਮ�(_o)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#| msgctxt "New"
+#| msgid "_Shared memo"
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+#| msgid "Create a shared new memo"
+msgid "Create a new shared memo"
+msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#| msgid "Memo List"
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "Create a new memo list"
+msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
+
+#: ../modules/calendar/e-memo-shell-backend.c:588
+#, fuzzy
+#| msgid "Primary memo list"
+msgid "The registry of memo lists"
+msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
+
+#: ../modules/calendar/e-memo-shell-content.c:604
+#| msgid "Table model"
+msgid "The memo table model"
+msgstr "ਮ�ਮ� ��ਬਲ ਮਾਡਲ"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
+msgid "Loading memos"
+msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:492
+#| msgid "Memo Source Selector"
+msgid "Memo List Selector"
+msgstr "ਮ�ਮ� ਲਿਸ� ��ਣ�ਾਰ"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:677
+#| msgid "Default Mail Client"
+msgid "Default Memo Client"
+msgstr "ਡਿਫਾਲ� ਮ�ਮ� �ਲਾ��"
+
+#  mail:async-error-nodescribe primary
+#: ../modules/calendar/e-memo-shell-sidebar.c:678
+#, fuzzy
+#| msgid "Cannot perform the operation."
+msgid "Default client for memo operations"
+msgstr "�ਾਰਵਾ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:688
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:867
+#, c-format
+msgid "Opening memos at %s"
+msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "ਮ�ਮ� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#| msgid "_Delete Message"
+msgid "_Delete Memo"
+msgstr "ਮ�ਮ� ਹ�ਾ�(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#| msgid "_Find in Message..."
+msgid "_Find in Memo..."
+msgstr "ਮ�ਮ� '� ���(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed memo"
+msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#, fuzzy
+#| msgid "_New Memo List"
+msgid "D_elete Memo List"
+msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Delete the selected memo list"
+msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+msgid "_New Memo List"
+msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Refresh the selected memo list"
+msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected memo list"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#, fuzzy
+#| msgid "Show _only this Memo List"
+msgid "Show _Only This Memo List"
+msgstr "��ਵਲ ਮ�ਮ� ਲਿਸ� ਹ� ਵ���(_o)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+#| msgid "_Preview"
+msgid "Memo _Preview"
+msgstr "ਮ�ਮ� �ਲ�(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show memo preview pane"
+msgstr "�ਲ� ਪ�ਨ ਵ��ਾ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview below the memo list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show memo preview alongside the memo list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+msgid "Print the list of memos"
+msgstr "ਮ�ਮ� ਦ� ਸ��� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#, fuzzy
+#| msgid "Previews the list of memos to be printed"
+msgid "Preview the list of memos to be printed"
+msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਮ�ਮ� ਦ� ਸ��� ਦ� �ਲ�"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:414
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d ਮ�ਮ�"
+msgstr[1] "%d ਮ�ਮ�"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-task-shell-view-private.c:567
+#, c-format
+#| msgid ", %d selected"
+#| msgid_plural ", %d selected"
+msgid "%d selected"
+msgstr "%d ��ਣਿ�"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+#| msgid "_Delete Message"
+msgid "Delete Memos"
+msgstr "ਮ�ਮ� ਹ�ਾ�"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+#| msgid "Delegate To"
+msgid "Delete Memo"
+msgstr "ਮ�ਮ� ਹ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "�ੰਮ(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#| msgid "Task List"
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "�ਾਸ� ਲਿਸ�(_k)"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "Create a new task list"
+msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
+
+#: ../modules/calendar/e-task-shell-backend.c:598
+#, fuzzy
+#| msgid "Primary task list"
+msgid "The registry of task lists"
+msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
+
+#: ../modules/calendar/e-task-shell-content.c:626
+#| msgid "Table model"
+msgid "The task table model"
+msgstr "�ਾਸ� ��ਬਲ ਮਾਡਲ"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� �ਵ�ਲ�ਸ਼ਨ �ੰਮ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਤਬਦ�ਲ ਹ� ��ੱ�� ਹ�।\n"
+"\n"
+"�ਿਰਪਾ �ਰ�� �ਡ�� �ਰ�, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
+
+#  FIXME: domain/code
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:216
+msgid "Loading tasks"
+msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:492
+#| msgid "Task Source Selector"
+msgid "Task List Selector"
+msgstr "�ਾਸ� ਲਿਸ� ��ਣ�ਾਰ"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:677
+#| msgid "Default Mail Client"
+msgid "Default Task Client"
+msgstr "ਡਿਫਾਲ� �ਾਸ� �ਲਾ��"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:678
+#, fuzzy
+#| msgid "Default value for thread expand state"
+msgid "Default client for task operations"
+msgstr "ਥਰਿੱਡ ਫ�ਲ� ਹਾਲਤ ਲ� ਡਿਫਾਲ� ਮ�ੱਲ"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:688
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:867
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s ਤ� �ੰਮ ��ਲ ਰਿਹਾ ਹ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+msgid "Print Tasks"
+msgstr "�ੰਮ ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:574
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"�ਸ �ਾਰਵਾ� ਨਾਲ ਸਾਰ� ��ਣ��� �ਾਰਵਾ��� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ��� �ਾਣ����। ���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� �ਹ "
+"�ੰਮ ਮ�� ਮਿਲ ਨਾ ਸ�ਣ��।\n"
+"\n"
+"�� ਤ�ਸ�� �ਹਨਾ� �ੰਮਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+#| msgid "_Delete"
+msgid "_Delete Task"
+msgstr "�ਾਸ� ਹ�ਾ�(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+#| msgid "_Find in Message..."
+msgid "_Find in Task..."
+msgstr "�ਾਸ� '� ���(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed task"
+msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:720
+#| msgid "_Copy..."
+msgid "Copy..."
+msgstr "�ਾਪ�..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+#, fuzzy
+#| msgid "Select a Task List"
+msgid "D_elete Task List"
+msgstr "�ੰਮ ਲਿਸ� ��ਣ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+#, fuzzy
+#| msgid "Delete selected tasks"
+msgid "Delete the selected task list"
+msgstr "��ਣ� �ੰਮ� ਹ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+msgid "_New Task List"
+msgstr "ਨਵ�� �ਾਸ� ਲਿਸ�(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#| msgid "Delete selected tasks"
+msgid "Refresh the selected task list"
+msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Rename the selected task list"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+#, fuzzy
+#| msgid "Show _only this Task List"
+msgid "Show _Only This Task List"
+msgstr "ਸਿਰਫ਼ �ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:776
+#, fuzzy
+#| msgid "_Mark as Incomplete"
+msgid "Mar_k as Incomplete"
+msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "Delete completed tasks"
+msgstr "ਸਮਾਪਤ �ੰਮ ਹ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+msgid "Task _Preview"
+msgstr "�ੰਮ �ਲ�(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:883
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show task preview pane"
+msgstr "�ਲ� ਪ�ਨ ਵ��ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview below the task list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show task preview alongside the task list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+msgid "Active Tasks"
+msgstr "���ਿਵ �ਾਸ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Completed Tasks"
+msgstr "ਸਮਾਪਤ �ਾਸ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:940
+msgid "Next 7 Days' Tasks"
+msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:947
+msgid "Overdue Tasks"
+msgstr "ਮਿ�ਦ ਪ�ੱ���� �ਾਸ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:954
+msgid "Tasks with Attachments"
+msgstr "�����ਮਿੰ� ਨਾਲ �ਾਸ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+msgid "Print the list of tasks"
+msgstr "�ੰਮ ਸ��� ਪਰਿੰ� �ਰ�"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#, fuzzy
+#| msgid "Previews the list of tasks to be printed"
+msgid "Preview the list of tasks to be printed"
+msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਰ� ਸ��� ਦ� �ਲ�"
+
+#: ../modules/calendar/e-task-shell-view-private.c:461
+msgid "Expunging"
+msgstr "ਨਿ�ਾਲਾ"
+
+#: ../modules/calendar/e-task-shell-view-private.c:563
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d �ੰਮ"
+msgstr[1] "%d �ੰਮ"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+#| msgid "Completed Tasks"
+msgid "Delete Tasks"
+msgstr "�ਾਸ� ਹ�ਾ�"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+#| msgid "Delegate To"
+msgid "Delete Task"
+msgstr "�ਾਸ� ਹ�ਾ�"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d ਸ�ਨ�ਹ� ���� ��ਤ�"
+
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+#| msgid "None"
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "ਪੱਤਰ ��ਾ���"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "ਪੱਤਰ ਪਸੰਦ"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "�ੰਪ��਼ਰ ਪਸੰਦ"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+msgid "Network Preferences"
+msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
+
+#: ../modules/mail/e-mail-shell-content.c:678
+#| msgid "_Group By Threads"
+msgid "Group by Threads"
+msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ"
+
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:923
+#: ../modules/mail/e-mail-shell-view.c:526
+#| msgid "Disable Account"
+msgid "_Disable Account"
+msgstr "��ਾ��� �ਯ��(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:925
+#| msgid "Disable Account"
+msgid "Disable this account"
+msgstr "�ਹ ��ਾ��� �ਯ��"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:932
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ��� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:937
+msgid "C_reate Search Folder From Search..."
+msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:944
+msgid "_Download Messages for Offline Usage"
+msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:946
+#, fuzzy
+#| msgid "Download messages of accounts/folders marked for offline"
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "�ਫਲਾ�ਨ ਲ� ਮਾਰ� ��ਤ� ��ਾ���/ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:951
+msgid "Fl_ush Outbox"
+msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:958
+msgid "_Copy Folder To..."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:960
+msgid "Copy the selected folder into another folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:967
+msgid "Permanently remove this folder"
+msgstr "�ਹ ਫ�ਲਡਰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:972
+msgid "E_xpunge"
+msgstr "ਮਿ�ਾ�(_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� �ਸ ਫ�ਲਡਰ ਵਿੱ��� ਹ�ਾ ਦਿ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:979
+msgid "Mar_k All Messages as Read"
+msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�(_K)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
+msgid "Mark all messages in the folder as read"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:986
+msgid "_Move Folder To..."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:988
+msgid "Move the selected folder into another folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:993
+msgid "_New..."
+msgstr "ਨਵਾ�(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:995
+msgid "Create a new folder for storing mail"
+msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
+msgid "Change the properties of this folder"
+msgstr "�ਸ ਫ�ਲਡਰ ਦ��� ਵਿਸ਼�ਸਤਾਵਾ� ਬਦਲ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
+msgid "Refresh the folder"
+msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1016
+msgid "Change the name of this folder"
+msgstr "�ਸ ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
+msgid "Select Message _Thread"
+msgstr "ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਵ��ਾ�(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1023
+msgid "Select all messages in the same thread as the selected message"
+msgstr "�ੱ�� ਮਸਲ� ਦ� ਸਾਰ� ਸ�ਨ�ਹ� ��ਣ� ਸ�ਨ�ਹ� ਬਣਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
+msgid "Select Message S_ubthread"
+msgstr "ਸ�ਨ�ਹਾ ਸਬ-ਥਰਿੱਡ ��ਣ�(_u)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
+msgid "Select all replies to the currently selected message"
+msgstr "ਮ���ਦਾ ਸ�ਨ�ਹ� ਲ� ਸਭ �ਵਾਬ ��ਣ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
+msgid "_Unsubscribe"
+msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#, fuzzy
+#| msgid "Rename the selected folder"
+msgid "Unsubscribe from the selected folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "Empty _Trash"
+msgstr "ਰੱਦ� �ਾਲ�(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#, fuzzy
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ��� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
+msgid "_New Label"
+msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#| msgid "None"
+msgid "N_one"
+msgstr "��� ਨਹ��(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
+msgid "Hide _Read Messages"
+msgstr "ਪ�� ਸ�ਨ�ਹ� �ਹਲ�(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
+msgid "Temporarily hide all messages that have already been read"
+msgstr "ਸਾਰ� ਪ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
+msgid "Hide S_elected Messages"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ਹਲ�(_e)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
+msgid "Temporarily hide the selected messages"
+msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1077
+msgid "Show Hidde_n Messages"
+msgstr "ਲ��ਵ�� ਸ�ਨ�ਹ� ਵ��ਾ�(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
+msgid "Show messages that have been temporarily hidden"
+msgstr "�ਰ�� ਤ�ਰ ਤ� �ਹਲ� ਸ�ਨ�ਹ� ਵ��ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
+msgid "Cancel the current mail operation"
+msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
+msgid "Collapse All _Threads"
+msgstr "ਸਭ ਥਰਿੱਡ ਸਮ���(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
+msgid "Collapse all message threads"
+msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਸਮ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
+msgid "E_xpand All Threads"
+msgstr "ਸਭ ਥਰਿੱਡ ਫ�ਲਾ�(_x)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
+msgid "Expand all message threads"
+msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਫ�ਲਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
+msgid "_Message Filters"
+msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+msgid "Create or edit rules for filtering new mail"
+msgstr "ਨਵ�� ਮ�ਲ ਨ�ੰ ਫਿਲ�ਰ �ਰਨ ਲ� ਨਿਯਮ ਬਣਾ� �ਾ� ਸ�ਧ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
+msgid "Search F_olders"
+msgstr "ਫ�ਲਡਰ ���(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#, fuzzy
+#| msgid "Create or edit Search Folder definitions"
+msgid "Create or edit search folder definitions"
+msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
+msgid "_Subscriptions..."
+msgstr "ਮ��ਬਰ�(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
+msgid "F_older"
+msgstr "ਫ�ਲਡਰ(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid "_Label"
+msgstr "ਲ�ਬਲ(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
+msgid "_New Folder..."
+msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "Hide _Deleted Messages"
+msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� �ਹਲ�(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਰ��ਾ ਵ��ਾ�ਣ ਦ� ਬ�ਾ� �ਹਲ� �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+msgid "Show Message _Preview"
+msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#, fuzzy
+#| msgid "Show message preview window"
+msgid "Show message preview pane"
+msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ��ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
+msgid "_Group By Threads"
+msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#, fuzzy
+#| msgid "Threaded Message list"
+msgid "Threaded message list"
+msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
+msgid "Show message preview below the message list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid "Show message preview alongside the message list"
+msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
+msgid "All Messages"
+msgstr "ਸਭ ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
+msgid "Important Messages"
+msgstr "�ਾਸ ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+msgid "Last 5 Days' Messages"
+msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
+msgid "Messages Not Junk"
+msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+msgid "Messages with Attachments"
+msgstr "ਨੱਥ� ਸਮ�ਤ ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
+msgid "No Label"
+msgstr "ਬਿਨ-ਲ�ਬਲ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
+msgid "Read Messages"
+msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
+msgid "Recent Messages"
+msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid "Unread Messages"
+msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+#| msgid "Subject or Addresses contains"
+msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
+msgid "All Accounts"
+msgstr "ਸਭ ��ਾ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
+msgid "Current Account"
+msgstr "ਮ���ਦਾ ��ਾ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
+msgid "Current Folder"
+msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
+
+#: ../modules/mail/e-mail-shell-view-private.c:836
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] " %d ��ਣਿ�, "
+msgstr[1] " %d ��ਣ�, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:847
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d ਹ�ਾ��"
+msgstr[1] "%d ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:853
+#: ../modules/mail/e-mail-shell-view-private.c:860
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d �ੰ�"
+msgstr[1] "%d �ੰ�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:866
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d ਡਰਾਫ�"
+msgstr[1] "%d ਡਰਾਫ�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:872
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d ਨਾ-ਭ��ਿ�"
+msgstr[1] "%d ਨਾ-ਭ���"
+
+#: ../modules/mail/e-mail-shell-view-private.c:878
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d ਭ��ਿ�"
+msgstr[1] "%d ਭ���"
+
+#: ../modules/mail/e-mail-shell-view-private.c:890
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d �ਣ-ਰ�ਡ, "
+msgstr[1] "%d �ਣ-ਰ�ਡ, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:893
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d ��ੱਲ"
+msgstr[1] "%d ��ੱਲ"
+
+#: ../modules/mail/e-mail-shell-view.c:524
+msgid "Proxy _Logout"
+msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "ਭਾਸ਼ਾ"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "ਹਰ ਸਮ��"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "ਹ�ੱਡਰ ਨਾ�:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
+
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "ਹ�ੱਡਰ"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "ਮ�ੱਲ ਰੱ�ਦਾ ਹ�"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਹ� �ਤ� ਬਾ�ਨਰ� �ੰਸ�ਾਲ ਹ�।"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#, c-format
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�। ��ੱ� �ਰ� �� �ਿ ਪ���� �ੰਸ�ਾਲ ਹ�।"
+
+#: ../modules/mail/em-mailer-prefs.c:766
+#| msgid "No Junk plugin available"
+msgid "No junk plugin available"
+msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1151
+#| msgid "Table column:"
+msgid "_Table column:"
+msgstr "��ਬਲ �ਾਲਮ(_ T):"
+
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1153
+#| msgid "Date header:"
+msgid "_Date header:"
+msgstr "ਮਿਤ� ਹ�ੱਡਰ(_D):"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+#, fuzzy
+#| msgid "Show _Original Size"
+msgid "Show _original header value"
+msgstr "�ਸਲ� ��ਾਰ ਵ���(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "ਹ�ਲ� ਪਾ�ਥਨ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "ਪਾ�ਥਨ ਪਲੱ��ਨ ਲ�ਡਰ ��ਸ�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "ਪਾ�ਥਨ ��ਸ� ਪਲੱ��ਨ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "ਪਾ�ਥਨ �-ਪਲੱ��ਨ ਲ�ਡਰ ਲ� ��ਸ� ਪਲੱ��ਨ।"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-#| msgid "List local address book folders"
 msgid "Add local address books to Evolution."
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
@@ -15031,21 +16214,12 @@ msgid ""
 "body."
 msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "�����ਮ��� ਰ�ਮਾ�ਡਰ"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-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 ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -15053,59 +16227,61 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ��� ਸ਼ਬਦ ਲੱਭ� ਹਨ, �� �ਿ ਦਰਸਾ��ਦ� ਹਨ �ਿ ਸ�ਨ�ਹ� ਵਿੱ� ����ਮ��� ਹ�ਣ� �ਾਹ�ਦ� ਹ�, ਪਰ �ਹ "
 "ਲੱਭ� ਨਹ�� ਹ�।"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��� �����ਮ��� ਨਹ�� ਹ�"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "����ਮ��� ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "ਸ�ਨ�ਹਾ ਸ�ਧ(_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "�����ਮ��� ਰ�ਮਾ�ਡਰ"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ਤ�ਹਾਨ�ੰ ਯਾਦ �ਰਵਾ�ਦਾ ਹ� �ਿ ਤ�ਸ�� ਮ�ਲ ਸ�ਨ�ਹ� ਵਿੱ� ��� ����ਮ��� �ਰਨ� ਭ�ੱਲ ਤਾ� ਨਹ�� ��।"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#| msgid "Audio inline plugin"
-msgid "Audio Inline"
-msgstr "�ਡ�� �ਨ-ਲਾ�ਨ"
+#| msgid "Inline"
+msgid "Inline Audio"
+msgstr "ਲਾ�ਨ '� �ਡ��"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
+#, fuzzy
+#| msgid "Play audio attachments directly from Evolution."
+msgid "Play audio attachments directly in mail messages."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਤ�� �ਡ�� ����ਮ��� ਸਿੱਧ��� �ਲਾ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "�ਵ�ਲ�ਸਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "ਬ���ੱਪ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "ਮ��-ਪ�ਰਾਪਤ �ਰਨ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-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."
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� "
-"�ਦਿ ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
+"ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� �ਦਿ "
+"ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
@@ -15119,6 +16295,30 @@ msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ��ਾ
 msgid "Choose a file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਫਾ�ਲ ��ਣ�"
 
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "ਬ���ੱਪ ਸ��ਿੰ�(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਮ��-ਪ�ਰਾਪਤ"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+#, fuzzy
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਮ��-ਪ�ਰਾਪਤ"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "ਬ���ੱਪ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
@@ -15182,53 +16382,51 @@ msgstr "�ਰ�਼� ਬ���ੱਪ ਫਾ�ਲਾ� ਹ�ਾ���
 msgid "Ensuring local sources"
 msgstr "ਲ��ਲ ਸਰ�ਤ ਯ��ਨ� ਬਣਾ� �ਾ ਰਹ� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਲ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, 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:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr "�ਦ�� �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਡਾ�� ਦਾ ਬ���ੱਪ ਲ� ਰਹ� ਹ� ਤਾ� �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਦ�� ਤੱ� ਤ�ਹਾਡ� ਡਾ�� ਨ�ੰ ਰ�-ਸ��ਰ �ਰਦ� ਹ�, �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "�ਹ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਡਾ�� ਦ� ਮਾਤਰਾ ਮ�ਤਾਬ� ��� ਸਮਾ� ਲ� ਸ�ਦਾ ਹ�।"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#| msgid "Backup and restore plugin"
 msgid "Backup and Restore"
 msgstr "ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Backup and restore your Evolution data and settings."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
@@ -15280,48 +16478,35 @@ msgstr ""
 "ਪਹਿਲਾ� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ��਼ ਨ�ੰ ਪਹਿਲਾ� ਬੰਦ �ਰ ਦਿੱਤਾ ਹ�। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਰ�ਸ��ਰ ਦ� ਬਾ�ਦ "
 "���ਮ��ਿ� ਹ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�, ਤਾ� �ਹ ਬ�ਨ �ਾਲ� �ਰ�।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਮ��-ਪ�ਰਾਪਤ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "ਬ���ੱਪ ਸ��ਿੰ�(_B)..."
-
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
-#| msgid "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "ਪੱਤਰ ਭ��ਣ ਸਮ�� ��ਦ ਹ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ���ਰ� ਬਣਾ ਲਵ�(_A)"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�ਾ� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ� ਸੰਪਰ�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਨਿਯਮਤ ਤ�ਰ �ੱਤ� ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਨਾਲ ਸੰਪਰ� �ਾਣ�ਾਰ� �ਤ� �ਿੱਤਰਾ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰਦ� ਰਹ�"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "ਬੱਡ� ਲਿਸ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_b)"
 
@@ -15330,10 +16515,6 @@ 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"
@@ -15347,28 +16528,33 @@ msgstr ""
 "�ਾਣ�ਾਰ� �ਪਣ� �ਪ ਹ� ਭਰ ਦਿੱਤ� �ਾਵ���। ਤ�ਹਾਡ� ਬੱਡ� ਸ��� ਤ�� IM ਸੰਪਰ� �ਾਣ�ਾਰ� ਭਰ ਦਿੱਤ� "
 "�ਾਵ���।"
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ਸਵ�ਪ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦ� ਰਿਹਾ, �ਿਲ (kill) ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ ਦ�ਲ ਦ� �ਡ�� �ਾਰ�, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ਬ���ਫਿਲ�ਰ ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ ਹ�, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "ਮ�ਲ ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ '� ਬਦਲ�(_U)"
 
@@ -15384,7 +16570,6 @@ msgstr ""
 "ਸ�ਨ�ਹ� ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ UTF-੮ ਤ�� ਯ�ਨ�ਫਾ� ਸਪਮ/ਹਮ ���ਨ ਵਿੱ� ਬਦਲ�, �� �ਿ ਵੱ�ਰ� �ੱ�ਰ ਸ�ੱ� ਤ�� ��ਦ� ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#| msgid "Bogofilter junk plugin"
 msgid "Bogofilter Junk Filter"
 msgstr "Bogofilter �ੰ� ਫਿਲ�ਰ"
 
@@ -15393,69 +16578,192 @@ 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 "Filter junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "�ਣ�ਾਣ� �ਲਤ�"
+
+#  FIXME: domain/code
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+#, fuzzy
+#| msgid "Failed to update delegates:"
+msgid "Failed to parse server response."
+msgstr "ਪ�ਰਤ�ਨਿਧ �ੱਪਡ�� �ਰਨ ਲ� ਫ�ਲ ਹ��� ਹ�।"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+#, fuzzy
+#| msgid "Ends"
+msgid "Events"
+msgstr "ਸਮਾਪਤ"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+#, fuzzy
+#| msgid "New calendar"
+msgid "User's calendars"
+msgstr "ਨਵਾ� ��ਲੰਡਰ"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ।"
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr ""
+"\n"
+"\n"
+"ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
+
+#  FIXME: domain/code
+#: ../plugins/caldav/caldav-browse-server.c:666
+#, fuzzy
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "��� ਵ� ��ਲੰਡਰ ਲੱਭਣ ਲ� �ਸਫ਼ਲ ਹ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"���ਪ�ੱ� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s:\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+#, fuzzy
+#| msgid "Local Calendars"
+msgid "List of available calendars:"
+msgstr "ਲ��ਲ ��ਲੰਡਰ"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+#, fuzzy
+#| msgid "Hula Support"
+msgid "Supports"
+msgstr "ਹ�ਲਾ ਸਹਿਯ��"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, fuzzy, c-format
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create thread: %s"
+msgstr "ਪਾ�ਪ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/caldav/caldav-source.c:402
 #: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:426
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤ��"
 
+#: ../plugins/caldav/caldav-source.c:468
+msgid "Brows_e server for a calendar"
+msgstr ""
+
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/caldav/caldav-source.c:480
 #: ../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/calendar-weather/calendar-weather.c:501
 #: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 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 "Add CalDAV support to Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� CalDAV ਸਹਿਯ�� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-#| 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 "��ਲ�ਹਣ ਸਮ��"
 
@@ -15464,7 +16772,6 @@ msgid "On file change"
 msgstr "ਫਾ�ਲ ਬਦਲਣ ਸਮ��"
 
 #: ../plugins/calendar-file/calendar-file.c:281
-#| msgid "Personal"
 msgid "Periodically"
 msgstr "ਨਿਯਮਤ"
 
@@ -15493,59 +16800,67 @@ msgid "Add web calendars to Evolution."
 msgstr "ਵ�ੱਬ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-#| msgid "Calendars"
 msgid "Web Calendars"
 msgstr "ਵ�ੱਬ ��ਲੰਡਰ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: ਮ��ਹ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "ਮ�ਸਮ: ��ਿ� ਦਿਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "�ੱ� �ਿ�ਾਣਾ ��ਣ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:379
+#, fuzzy
+#| msgid "None"
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "��� ਨਹ�"
+
+#: ../plugins/calendar-weather/calendar-weather.c:599
 msgid "_Units:"
 msgstr "��ਾ�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮ��ਰਿ� (ਸ��ਲਸ��ਸ, ਸ��ਮ�, �ਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:607
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "�ੰਪ�ਰਿਲ (ਫਾਰਨਹ���, �ੰ� �ਦਿ)"
 
@@ -15557,15 +16872,28 @@ msgstr "ਮ�ਸਮ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� 
 msgid "Weather Calendars"
 msgstr "ਮ�ਸਮ ��ਲੰਡਰ"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-#| msgid "Copy tool"
-msgid "Copy Tool"
-msgstr "��ਲ �ਾਪ� �ਰ�"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+#, fuzzy
+#| msgid "Contacts: "
+msgid "Contacts map"
+msgstr "ਸੰਪਰ�: "
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#| msgid "Copy selected messages to the clipboard"
-msgid "Copy things to the clipboard."
-msgstr "���਼ਾ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�।"
+#: ../plugins/contacts-map/contacts-map.c:56
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Show a map of all the contacts"
+msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+#| msgid "No contacts"
+msgid "Map for contacts"
+msgstr "��� ਸੰਪਰ� ਨਹ��"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -15576,12 +16904,10 @@ msgid "Every time Evolution starts, check whether or not it is the default maile
 msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਡਿਫਾਲ� ਮ�ਲਰ ਹ� �ਾ� ਨਹ��।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-#| 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 "
 msgid "Default Mail Client"
 msgstr "ਡਿਫਾਲ� ਮ�ਲ �ਲਾ��"
 
@@ -15589,24 +16915,25 @@ msgstr "ਡਿਫਾਲ� ਮ�ਲ �ਲਾ��"
 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:627
-msgid "Evolution"
-msgstr "�ਵ�ਲ�ਸ਼ਨ"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:119
+#, fuzzy
+#| msgid "Show autocompleted name with an address"
+msgid "A_utocomplete with this address book"
+msgstr "�ਡਰ�ੱਸ ਨਾਲ ���-ਪ�ਰਾ ਨਾ� ਵ���"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "ਡਿਫਾਲ� �ਾਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "ਡਿਫਾਲ� ਮ�ਮ� ਲਿਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
@@ -15618,41 +16945,55 @@ msgstr "ਡਿਫਾਲ� ਸਰ�ਤ"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "ਤ�ਹਾਡ� ਪਸੰਦ�ਦਾ ਦਾ �ਡਰ�ੱਸ ਬ�ੱ� �ਤ� ��ਲੰਡਰ ਨ�ੰ ਡਿਫਾਲ� ਬਣਾ�।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਦ� ਲਿਸ�"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"��ੰ�� �ਸ�ਮ ਹ�ੱਡਰਾ� ਦ� ਲਿਸ� ਦਿੰਦ� ਹ�, �� �ਿ ਤ�ਸ�� ਬਾਹਰ ਭ�� ਰਹ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸ਼ਾਮਲ �ਰ ਸ�ਦ� ਹ�। "
+"�ੱ� ਹ�ੱਡਰ �ਾ� ਹ�ੱਡਰ ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ��: \"=\" ਦ� ਬਾ�ਦ �ਸ�ਮ ਹ�ੱਡਰ ਦਾ ਨਾ� �ਤ� ਮ�ੱਲ \";\" ਨਾਲ ਵੱ�।"
+
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "ਸ�ਰੱ�ਿ�:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "ਬਿਨਾ�-ਵਰ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "ਸ�ਰੱ�ਿ�ਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "��ਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "ਬਹ�ਤ ��ਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#, fuzzy
+#| msgid "None"
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "��� ਨਹ�"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
-msgid "Key"
-msgstr "��"
-
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
-msgid "Values"
-msgstr "ਮ�ੱਲ"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15660,13 +17001,17 @@ msgstr ""
 "�ੱ� �ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਲ� ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ�� ਦਿ�:\n"
 "�ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਮ�ੱਲਾ� ਲ� ਨਾ� \";\" ਨਾਲ ਵੱ� �ਰ�� ਦਿ�।"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "�ਮ�ਲ ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "��"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+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."
 msgid "Add custom headers to outgoing mail messages."
 msgstr "ਬਾਹਰ �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਲ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਸ਼ਾਮਲ �ਰ�।"
 
@@ -15674,966 +17019,16 @@ msgstr "ਬਾਹਰ �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਲ� ਪਸੰ
 msgid "Custom Header"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਦ� ਲਿਸ�"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"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 "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰ ��ਲ�ਹ�"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "��ਾ���(_A):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "ਫ�ਲਡਰ ਨਾ�(_F):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "ਯ��਼ਰ(_U):"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "ਸ�ਰੱ�ਿ�ਤ ਪਾਸਵਰਡ"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਸ਼��� ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਪਾਸਵਰਡ (NTLM) ਪ�ਰਮਾਣ�ਿਤਾ ਨਾਲ ������।"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "ਸਧਾਰਨ ਪਾਸਵਰਡ"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਸ਼��� ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਨਾਲ ������।"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "ਦਫਤਰ�� ਬਾਹਰ"
-
-#: ../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."
-msgstr ""
-"ਹ�ਠਾ� ਨਿਰਧਾਰਿਤ ��ਤਾ ਸ�ਨ�ਹਾ ���ਮ��ਿ� ਹ� �ਹਨਾ� ਸਾਰ� ਪੱਤਰ ਭ��ਣ ਵਾਲਿ�� ਨ�ੰ ਭ�� ਦਿੱਤਾ\n"
-"�ਾਵ��ਾ, �� �ਿ ਤ�ਹਾਡ� ਦਫਤਰ�� ਬਾਹਰ ਹ�ਣ ਦ� ਸ�ਰਤ ਵਿੱ� ਪੱਤਰ ਭ��ਣ।"
-
-#: ../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: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:340
-msgid "Change the password for Exchange account"
-msgstr "��ਸ਼���਼ ��ਾ��� ਲ� ਪਾਸਵਰਡ ਤਬਦ�ਲ"
-
-#: ../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:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "��ਸ���਼ ��ਾ��� ਲ� ਡ�ਲ���� ਸ��ਿੰ� ਪਰਬੰਧਨ"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "ਡ�ਲ���ਸ਼ਨ ਸਹਾ��"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "ਫ���ਲ"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "ਸਭ ��ਸ਼���਼ ਫ�ਲਡਰਾ� ਦਾ ��ਾਰ ਵ��ਾ�"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "ਫ�ਲਡਰ ��ਾਰ"
-
-#: ../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:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "ਪ�ਰਮਾਣ�ਿਤਾ(_u)"
-
-#: ../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:787
-msgid "_Mailbox:"
-msgstr "ਮ�ਲਬਾ�ਸ(_M):"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "ਪਰਮਾਣਿ�ਤਾ �ਾ�ਪ(_A)"
-
-#: ../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: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 ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦਾ �ਫਲਾ�ਨ ਢੰ� ਹ�। ਤ�ਸ�� ਹ�ਣ ਫ�ਲਡਰ ਬਣਾ �ਾ� ਸ�ਧ ਨਹ�� ਸ�ਦ� ਹ�।\n"
-"�ਿਰਪਾ �ਰ�� �ਹਨਾ� �ਾਰਵਾ��� ਵਿੱ� �ਨਲਾ�� ਢੰ� ਲ� ਤਬਦ�ਲ �ਰ�।"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"ਮ���ਦਾ ਪਾਸਵਰਡ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਮ���ਦ ਪ�ਰਾਣ� ਪਾਸਵਰਡ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�। �ਿਰਪਾ �ਰ�� ਠ�� "
-"ਪਾਸਵਰਡ ਦਿ�।"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "ਦ� ਪਾਸਵਰਡ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ। �ਿਰਪਾ �ਰ�� ਪਾਸਵਰਡ ਮ�� ਦਿ�।"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "ਪਾਸਵਰਡ ਪ�ਸ਼��:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ਮ���ਦਾ ਪਾਸਵਰਡ:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "ਨਵਾ� ਪਾਸਵਰਡ:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ �ਤਮ ਹ� �� ਹ�। �ਿਰਪਾ �ਰ�� �ਪਣਾ ਪਾਸਵਰਡ ਹ�ਣ� ਬਦਲ�।"
-
-#: ../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:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "ਪਸੰਦ�ਦਾ"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "ਸੰਪਾਦ� (ਪ�ਨ, ਲਿ�ਣ, ਸ�ਧਣ)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "ਲ��� (ਪ�ਨ, ਲਿ�ਣ)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "ਪ���ਲ�ਰਤਾ (ਪ�ਨ ਲ� ਹ�)"
-
-#: ../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:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-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: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."
-msgstr ""
-"�ਹ ਸ�ਨ�ਹਾ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ���ਮ��ਿ� ਹ� ਤ�ਹਾਨ�ੰ �ਹ �ਾਣ�ਾਰ� ਲ� ਭ��ਿ� �ਿ� ਹ� �ਿ ਤ�ਸ�� �ੱ� ਡ�ਲ���� ਥਾਪ� "
-"�� ਹ�। ਤ�ਸ�� ਹ�ਣ ਮ�ਰ� ਤ�ਰ �ੱਤ� ਸ�ਨ�ਹ� ਭ�� ਸ�ਦ� ਹ�।"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../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: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:358
-msgid "However you are not permitted to see my private items."
-msgstr "ਪਰ ਤ�ਹਾਨ�ੰ ਮ�ਰ��� ਪ�ਰਾ�ਵ�� ���ਮਾ� ਵ��ਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�।"
-
-#: ../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:416
-msgid "Delegate To"
-msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "�� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਦ� ਲ� ਪਹ�ੰ� ਨਹ�� ਹ�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਰ� ਵਿੱ� ��ਦ ਨ�ੰ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../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:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "ਪ�ਰਤ�ਨਿਧਾ� ਸ��� �ੱਪਡ�� ਨਹ�� ਹ� ਸ��"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../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: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:4
-msgid "Co_ntacts:"
-msgstr "ਸੰਪਰ�(_n):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "ਪ�ਰਤ�ਨਿਧ"
-
-#: ../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 "�ਧਿ�ਾਰ ਨਹ� ਹ�"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"�ਹ ਯ��਼ਰ ਤ�ਹਾਡ� ਤ�ਰ 'ਤ� ਪੱਤਰ ਭ��ਣ �ਤ� ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤ� �ਧਿ�ਾਰਾ�\n"
-"ਨਾਲ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਵਰਤ ਸ�ਣ ਦ� ਯ�� ਹਨ।"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "ਪ�ਰਤ�ਨਿਧ ਨਿੱ�� ���ਮਾ� ਨ�ੰ ਵ�� ਨਹ�� ਸ�ਦ� ਹਨ(_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "��ਣ-ਬ�ਸਾ(_I):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-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):"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "�ਧਿ�ਾਰ..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "ਫ�ਲਡਰ ਨਾ�"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "ਫ�ਲਡਰ ��ਾਰ"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "ਯ��਼ਰ"
-
-#: ../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 "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣਾ�"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "��ਸ਼���਼ ਫ�ਲਡਰ ਲ��"
-
-#: ../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:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "�� ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�ਣ� ਹ�?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "\"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>�ਸ ਸਮ�� ਤ�ਹਾਡ� ਸਥਿਤ� \"ਦਫਤਰ�� ਬਾਹਰ\" ਹ�</b>\n"
-"\n"
-"�� ਤ�ਸ�� �ਸ ਨ�ੰ \"ਦਫਤਰ ਵਿੱ�\" ਨਾਲ ਤਬਦ�ਲ �ਰਨ� �ਾਹ�ੰਦ� ਹ�?"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b> ਦਫਤਰ�� ਬਾਹਰ ਸ�ਨ�ਹਾ</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>ਸਥਿਤ�:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small> ਹ�ਠਾ� ਨਿਰਧਾਰਿਤ ��ਤਾ ਸ�ਨ�ਹਾ ���ਮ��ਿ� ਹ� �ਹਨਾ� ਸਾਰ� ਪੱਤਰ ਭ��ਣ ਵਾਲਿ�� ਨ�ੰ ਭ�� ਦਿੱਤਾ "
-"�ਾਵ��ਾ,\n"
-"�� �ਿ ਤ�ਹਾਡ� ਦਫਤਰ�� ਬਾਹਰ ਹ�ਣ ਦ� ਸ�ਰਤ ਵਿੱ� ਪੱਤਰ ਭ��ਣ।</small> "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ ਰਿਹਾ ਹਾ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ ਰਿਹਾ ਹਾ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "ਨਹ��, ਹਾਲਤ ਨਾ ਬਦਲ�"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "ਦਫਤਰ�� ਬਾਹਰ ਸਹਾ��"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "ਹਾ�, ਸਥਿਤ� ਤਬਦ�ਲ"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "ਪਾਸਵਰਡ ਮਿ�ਦ �ਾਤਮਾ ��ਤਾਵਨ�..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ੭ ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "ਪਾਸਵਰਡ ਬਦਲ�(_C)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�।)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "ਯ��਼ਰ ����:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>�ਧਿ�ਾਰ</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "ਹ�ਾ ਨਹ�� ਸ�ਦ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "ਸ�ਧ ਨਹ�� ਸ�ਦ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "���ਮਾ� ਬਣਾ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "ਸਬ-ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "��� ਵ� ���ਮਾ� ਹ�ਾ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "�ਪਣ��� ���ਮਾ� ਹ�ਾ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "��� ���ਮਾ� ਸ�ਧ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "�ਪਣ��� ���ਮਾ� ਦ� ਸ�ਧ"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "ਫ�ਲਡਰ ਸੰਪਰ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "ਫ�ਲਡਰ ਮਾਲ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "ਫ�ਲਡਰ ਦਿੱ�"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "���ਮਾ� ਪ��"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "ਭ�ਮਿ�ਾ: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>ਸ�ਨ�ਹਾ ਸ��ਿੰ�</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>�ਰ��ਿੰ� ��ਣ</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "��ਸ਼��� - ਭ��ਣ ��ਣਾ�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "�ਹਿਮ��ਤ(_m):  "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"�ਮ\n"
-"�ੱ�\n"
-"�ੱ�"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"ਸਧਾਰਨ\n"
-"ਨਿੱ��\n"
-"ਪ�ਰਾ�ਵ��\n"
-"��ਪਤ"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "�ਹ ਸ�ਨ�ਹ� ਲ� ਵਾਪਸ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� ਹ�(_d)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "�ਹ ਸ�ਨ�ਹ� ਲ� �ੱ� ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ� ਹ�(_r)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ਡ�ਲ���� ਵਾ�� ਭ���"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "ਸੰਵ�ਦਨਸ਼�ਲਤਾ(_S): "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "ਯ��਼ਰ(_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "ਯ��਼ਰ ��ਣ�"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਸੰਪਰ� ਲ� ਮ��ਬਰ ਬਣ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ��ਲੰਡਰ ਦ� ਮ��ਬਰ ਬਣ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "�ਵ�ਲ�ਸ਼ਨ-��ਸ���਼ ��ਸ��ਨਸ਼ਨ ਪ���� ����ਵ�� �ਰ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "��ਸ਼��� �ਾਰਵਾ���"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� \"��ਸ���਼ ਸਥਾਪਨ\" ��ਬ ਵਰਤ� ਨਹ�� �ਾ ਸ�ਦ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "ਸੰਰ�ਨਾ ਸਮੱਸਿ�ਵਾ� �ਰ�� ਪਾਸਵਰਡ ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "ਫ�ਲਡਰ ਵ��ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
-
-#  mail:async-error-nodescribe primary
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "�ਾਰਵਾ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"��ਸ���਼ ��ਾ��� \"{0}\" ਲ� ��ਣਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਤ�ਹਾਡ� ਵਲ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰ�� ਮ�� �ਾਲ� "
-"�ਰਨ �ਪਰੰਤ ਹ� ਪਰਭਾਵ� ਹ�ਣ����।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "ਸਰਵਰ ਨਾਲ ਪਰਮਾਣਿਤ ਨਹ�� ਹ� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "ਪਾਸਵਰਡ ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"��ਸ���਼ �ਾਤਾ ਸੰਰ�ਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�, �ਿ��ਿ\n"
-"�ੱ� �ਣ�ਾਣ �ਲਤ� �� ਹ�। URL, ਯ��਼ਰ ਨਾ� �ਤ� \n"
-"ਪਾਸਵਰਡ ਦ� �ਾ�� �ਰ�� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "��ਸ਼���਼ ਸਰਵਰ ਨਾਲ ��� ਨਹ�� ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "ਸਰਵਰ {0} ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "ਪ�ਰਤ�ਨਿਧ ਲ� ਫ�ਲਡਰ �ਧਿ�ਾਰਾ� ਨ�ੰ �ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "��ਸ���਼ ਵ�ਬ ਸ��ਰ��਼ ਸਿਸ�ਮ ਨਹ�� ਮਿਲਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "ਸਰਵਰ {0} ���ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "{0} ਨ�ੰ ਪ�ਰਤ�ਨਿਧ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "ਫ�ਲਡਰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "ਫ�ਲਡਰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "ਦਫ਼ਤਰ��-ਬਾਹਰ ਹਾਲਤ ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "ਫ�ਲਡਰ �ਧਿ�ਾਰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "ਦਫ਼ਤਰ��-ਬਾਹਰ ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��ਬਰ� ਯ��਼ਰ ਦ� ਮ�ਲ-ਬਾ�ਸ ਨ�ੰ ਲ�ਡ �ਰਨ ਵਾਸਤ� ਮ��-�ਾਲ� ਦ� ਲ�� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "��ਸ���਼ ��ਾ��� �ਫਲਾ�ਨ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"��ਸ���਼ ��ਨ���ਰ ਨ�ੰ ��ਸ���਼ ਸਰਵਰ �ਤ� ��� ਸਹ�ਲਤਾ� ਲ�\n"
-"ਪਹ�ੰ� ਦ� ਲ�� ਹ�, �� �ਿ �ਯ�� �ਾ� ਬੰਦ �ਾਪਦ��� ਹਨ।\n"
-"(�ਹ ��ਸਰ ਬਿਨਾ� �ਾਰਨ ਹ� ਹ� ਸ�ਦਾ ਹ�)। ਤ�ਹਾਡ�\n"
-"��ਸ���਼ ਪਰਸ਼ਾਸ� ਨ�ੰ ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ��ਨ���ਰ ਦ� ਵਰਤ��\n"
-"�ਰਨ ਦ�ਣ ਲ� �ਹ ਸਹ�ਲਤਾ� ਨ�ੰ ਯ�� �ਰਨਾ\n"
-"ਪਵ��ਾ।\n"
-"\n"
-"�ਪਣ� ��ਸ���਼ ਪਰਸ਼ਾਸ� ਨ�ੰ �ਾਣ�ਾਰ� ਦ�ਣ ਲ�\n"
-"ਹ�ਠ ਦਿੱਤਾ ਸਬੰਧ ਵਰਤ��:\n"
-"\n"
-"{0}\n"
-"  "
-
-#  FIXME: domain/code
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "ਪ�ਰਤ�ਨਿਧ �ੱਪਡ�� �ਰਨ ਲ� ਫ�ਲ ਹ��� ਹ�।"
-
-#  XXX we shouldn't be popping up dialogs in this code.
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "ਫ�ਲਡਰ ਮ���ਦ ਨਹ�� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "ਫ�ਲਡਰ �ਫਲਾ�ਨ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "ਸਧਾਰਨ �ਲਤ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "�ਲ�ਬਲ ਸ��� ਸਰਵਰ ਪਹ�ੰ� ਵਿੱ� ਨਹ�� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr "���ਰ OWA ਵੱ�ਰ� ਮਾਰ� �ੱਤ� �ੱਲ ਰਿਹਾ ਹ� ਤਾ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸੰਰ�ਨਾ ਡਾ�ਲਾ� ਦ� ਦ�ਣਾ ਪਵ��ਾ।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "�ਸ ਸਰਵਰ �ੱਤ� {0} ਲ� ��� ਪੱਤਰ-ਬ�ਸਾ ਨਹ�� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "ਪ�ਸ਼�� �ਰ� �ਿ ਠ�� URL ਦਿੱਤਾ ਹ� �ਤ� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "�ਾ�� �ਰ� �ਿ ਸਰਵਰ ਨਾ� ਦ� �ੱ�ਰ ਠ�� ਹਨ �ਤ� ਮ�� ��ਸ਼ਸ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "�ਾ�� �ਰ� �ਿ ਤ�ਹਾਡਾ ਯ��਼ਰ ਨਾ� �ਤ� ਪਾਸਵਰਡ ਠ�� ਹ� �ਤ� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "�ਸ ��ਾ��� ਲ� ��� �ਲ�ਬਲ ਸ��� ਸਰਵਰ ਸੰਰ�ਿਤ ਨਹ�� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "{1} �ੱਤ� {0} ਯ��਼ਰ ਲ� ��� ਪੱਤਰ-ਬ�ਸਾ ਨਹ�� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "�ਦਾ� ਦਾ ��� ਯ��਼ਰ {0} ਨਹ��"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "ਪਾਸਵਰਡ ਸਫ਼ਲਤਾਪ�ਰ� ਤਬਦ�ਲ ��ਤਾ �ਿ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "�ੱ� ਡ�ਲ���� ID ਦਿ� �ਾ� �ੱ� ਡ�ਲ���� ਵਾ�� ਭ��ਣ ��ਣ ਹ�ਾ ਦਿ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "ਪ�ਸ਼�� �ਰ� �ਿ �ਲ�ਬਲ ਸ��� ਸਰਵਰ ਨਾ� ਠ�� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "�ਿਰਪਾ �ਰ�� ਪਰਭਾਵ� ਹ�ਣ ਲ� �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਲਾ�"
-
-#  FIXME: This is just to get the shadow, is there a better way?
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "�ਿਰਪਾ �ਰ�� �ੱ� ਯ��਼ਰ ��ਣ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "ਸਰਵਰ ਨ� ਪਾਸਵਰਡ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�, �ਿ��ਿ �ਹ ਬਹ�ਤ �ਮ�਼�ਰ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "�ਦ�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰ��� ਤਾ� ��ਸ���਼ ��ਾ��� �ਯ�� �ਰ ਦਿੱਤਾ �ਾਵ��ਾ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "��ਸ���਼ ��ਾ��� ਨ�ੰ ਤ�ਹਾਡ� ਵਲ�� �ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਤ�� ਬਾ�ਦ ਹ�ਾ�� �ਾਵ��ਾ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "��ਸ���਼ ਸਰਵਰ ��ਸ���਼ ��ਨ���ਰ ਨਾਲ �ਨ���ਲ ਨਹ�� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"ਸਰਵਰ ��ਸ਼���਼ ੫.੫ ਨਾਲ �ੱਲ ਰਿਹਾ ਹ�। ��ਸ਼���਼ ��ਨ���ਰ ਮਾ��ਰ�ਸਾਫ�\n"
-"��ਸ਼���਼ ੨੦੦੦ �ਤ� ੨੦੦੩ ਲ� ਹ� ਸਹਾ�� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"�ਸ ਸਮੱਸਿ� ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ ਮੰ�\n"
-"�ਰ ਰਿਹਾ ਹ� �ਿ ਤ�ਸ�� �ਪਣ� ਯ��਼ਰ ਨਾ� ਦ� ਨਾਲ\n"
-"ਵਿੰਡ� ਡ�ਮ�ਨ ਨਾ� ਵ� ਦਿ� (�ਿਵ�� �ਿ &quot;DOMAIN\\user&quot;)।\n"
-"\n"
-"�ਾ� ਤ�ਸ�� ਸਿਰਫ਼ �ਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "�ੱ� ਵੱ�ਰ� ਪਾਸਵਰਡ ਨਾਲ ਮ��-��ਸ਼ਸ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "ਯ��਼ਰ ਨ�ੰ ਪਹ�ੰ� �ੰ�ਰ�ਲ ਸ��� ਵਿੱ� ���ਨ ਲ� �ਸਫ਼ਲ:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਸ�ਧਣ ਲ� �ਸਫ਼ਲ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-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:604
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "�ਣ�ਾਣ� �ਲਤ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "�ਣ�ਾਣ� �ਿਸਮ"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "ਤ�ਸ�� �ਸ ਸਰਵਰ �ੱਤ� �ਪਣ� ਪੱਤਰ ਸੰਭਾਲਣ ਲ� ���ਾ ਭਰਨ ਦ� ਨ��� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "ਤ�ਹਾਨ�ੰ �ੱ� ਸਮ�� ��ਵਲ �ੱ� ਹ� ਡ�ਲ����ਰ ਦ� ਤ�ਰ �ੱਤ� ਸ�ਨ�ਹਾ ਭ��ਣ ਦ� ��਼ਾ�਼ਤ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "ਤ�ਸ�� �ਪਣ� �ਪ ਨ�ੰ ਪ�ਰਤ�ਨਿਧ ਨਹ�� ਬਣਾ ਸ�ਦ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "ਤ�ਸ�� �ਸ ਸਰਵਰ �ੱਤ� ਪੱਤਰ ਸੰਭਾਲਣ ਲ� �ਪਣ� ���� ਤ�� ਵੱਧ �� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "ਤ�ਸ�� ��ਹ�ਰਾ ��ਸ਼���਼ ��ਾ��� ਹ� ਸੰਰ�ਿਤ �ਰ ਸ�ਦ� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ��� ਪੱਤਰ ਹ�ਾ�ਣ ਨਾਲ ��� ਥਾ� ਸਾਫ਼ �ਰ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ਤ�ਸ�� ਹ�ਣ ਸ਼ਾ�ਦ ਪੱਤਰ ਭ�� �ਾ� ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ����।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ਤ�ਸ�� �ਦ�� ਤੱ� ਪੱਤਰ ਨ�ੰ ਭ�� ਸ�ਦ�, �ਦ�� ਤੱ� �ਿ ��� ਪੱਤਰਾ� ਨ�ੰ ਹ�ਾ�� "
-"ਨਹ�� �ਾ�ਦਾ ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ਪ�ੱ� �� ਹ�।"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} ਨ�ੰ ਪਹ�ੰ� �ੰ�ਰ�ਲ ਸ��� ਵਿੱ� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} ਪਹਿਲਾ� ਹ� ਡ�ਲ���� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} ਪਹਿਲਾ� ਹ� ਸ��� ਵਿੱ� ਹ�"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� �ੰਮਾ� ਲ� ਮ��ਬਰ ਬਣ�"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "ਫ�ਲਡਰ �ਧਿ�ਾਰ ��ੱ� �ਰ�"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+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
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "�ਦ��  ਵ� ਨਵ�� ਮ�ਲ ਲਿ�ਣ� ਸ਼�ਰ� ਹ�ਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਲਾ�"
 
@@ -16645,14 +17040,28 @@ msgstr "ਡਿਫਾਲ� ਬਾਹਰ� �ਡ��ਰ"
 msgid "The default command that must be used as the editor."
 msgstr "ਮ�ਲ �ਮਾ�ਡ, �� �ਿ �ਡ��ਰ ਵ��� ਵਰਤ� �ਾਣ� ਲਾ�਼ਮ� ਹ�।"
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs ਲ� \"xemacs\" ਵਰਤ��\n"
+"VI ਲ� \"gvim -f\" ਵਰਤ��"
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ��"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "ਬਾਹਰ� �ਡ��ਰ"
 
 #: ../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 "ਬਾਹਰ� ਸੰਪਾਦ� ਨ�ੰ ਪਲ�ਨ-���ਸ� ਮ�ਲ ਸ�ਨ�ਹ� ਲਿ�ਣ ਲ� ਵਰਤ��।"
 
@@ -16671,7 +17080,6 @@ msgid ""
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਮ�ਲ ਸੰਭਾਲਣ ਲ� �ੱ� �ਰ�਼� ਫਾ�ਲ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ ਹ�। ਬਾ�ਦ '� ��ਸ਼ਿਸ਼ �ਰ�।"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-#| msgid "External Editor"
 msgid "External editor still running"
 msgstr "ਬਾਹਰ� �ਡ��ਰ ਹਾਲ� ਵ� �ੱਲ ਰਿਹਾ ਹ�"
 
@@ -16680,8 +17088,8 @@ 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 ""
@@ -16691,85 +17099,96 @@ msgstr ""
 "ਤ�ਹਾਡ� ਪਲੱ��ਨ ਪਸੰਦ ਵਿੱ� ਬਾਹਰ� �ਡ��ਰ ਸ�ੱ� ��ਤਾ �ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�। �ੱ� ਵੱ�ਰਾ "
 "�ਡ��ਰ ਸ�ੱ� �ਰ�� ��ਸ਼ਿਸ਼ �ਰ�। "
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:110
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim\""
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Emacs ਲ� \"xemacs\" ਵਰਤ��\n"
-"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"
+#: ../plugins/face/face.c:286
+#, fuzzy
+#| msgid "Select a (48*48) png of size < 700bytes"
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "�ੱ� (੪੮*੪੮) png ��ਾਰ ��ਣ� < ੭੦੦ਬਾ��"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG ਫਾ�ਲਾ�"
+#: ../plugins/face/face.c:296
+#, fuzzy
+#| msgid "Importing files"
+msgid "Image files"
+msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "ਫ�ਸ(_F)"
+#: ../plugins/face/face.c:415
+#, fuzzy
+#| msgid "Include:"
+msgid "Include _Face"
+msgstr "ਸ਼ਾਮਿਲ:"
 
 #: ../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 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."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"�ਪਣ� �ਿਹਰ� ਦ� ���� �ਿਹ� ਤਸਵ�ਰ ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹਿ�� ਨਾਲ ���� �ਰ�\n"
-"\n"
-"ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� "
-"ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ (Base-64) �ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� "
-"ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ ਲ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+#| msgid "Table header"
+msgid "Failed Read"
+msgstr "��ਬਲ ਹ�ੱਡਰ"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "ਫ�ਲਡਰ ਮ��ਬਰ� ਹ�ਾ�"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+#| msgid "Invalid Date Value"
+msgid "Invalid Image Size"
+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/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+#| msgid "_No image"
+msgid "Not an image"
+msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+#| msgid "Please select an image for this contact"
+msgid "Please select an image of size 48 * 48"
+msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+#| msgid "The item could not be sent!\n"
+msgid "The file cannot be read"
+msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
 
-#: ../plugins/google-account-setup/google-source.c:81
 #: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "���ਲ"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../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/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ਯ��਼ਰ %s ਨ�ੰ ਮ��ਬਰ� ਵਾਲ� ��ਲੰਡਰ ਦ� �ਸ�ਸ ਲਿਸ� ਲ� ਪਾਸਵਰਡ ਦਿ�।"
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16778,42 +17197,78 @@ msgstr ""
 "���ਲ ਸਰਵਰ ਤ�� ਡਾ�ਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "�ਣ�ਾਣ� �ਲਤ� ਹ�।"
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_l)"
 
-#: ../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 "Add Google Calendars to Evolution."
 msgstr "���ਲ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#| msgid "Gnome Calendar"
 msgid "Google Calendars"
 msgstr "���ਲ ��ਲੰਡਰ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "�ਾ�� ਲਿਸ�"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼ ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "ਨਵਾ� ਸਾ��ਾ ਫ�ਲਡਰ(_S)..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "�ਰ�ੱਪਵਾ�� ��ਾ��� ਸ���ੱਪ"
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ(_P)..."
 
-#: ../plugins/groupwise-features/install-shared.c:219
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "�ੰ� ਪੱਤਰ ਸ��ਿੰ�..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ �ਰ��..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "ਪੱਤਰ ਮ��-�ਾ��"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "��਼ਮਾ�ਸ� �ਰ��"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "ਮ��ਿੰ� ਮ��-ਭ���(_n)..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "ਫ�ਲਡਰ ਬਣਾ�"
+
+#: ../plugins/groupwise-features/install-shared.c:225
+#, fuzzy, c-format
+#| msgid ""
+#| "The user '%s' has shared a folder with you\n"
+#| "\n"
+#| "Message from '%s'\n"
+#| "\n"
+#| "\n"
+#| "%s\n"
+#| "\n"
+#| "\n"
+#| "Click 'Forward' to install the shared folder\n"
+#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -16823,7 +17278,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "ਯ��਼ਰ '%s' ਨ� �ੱ� ਫ�ਲਡਰ ਤ�ਹਾਡ� ਨਾਲ ਸਾ��ਾ ��ਤਾ ਹ�\n"
@@ -16837,74 +17292,81 @@ msgstr ""
 "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰਨ ਲ� '�ੱ��' ਦਬਾ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰ�"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ�ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "�ੰ� ਸ��ਿੰ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "�ੰ� ਪੱਤਰ ਸ��ਿੰ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "�ੰ� ਪੱਤਰ ਸ��ਿੰ�..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>�ੰ� ਲਿਸ�:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "�-ਮ�ਲ:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+#, fuzzy
+#| msgid "_Junk List"
+msgid "Junk List:"
+msgstr "�ੰ� ਲਿਸ�(_J)"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "�ਯ��(_D)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "ਯ��(_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "�ੰ� ਲਿਸ�(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "ਹ�ਾ�(_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
+#: ../plugins/groupwise-features/mail-retract.c:86
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this ?"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਹ�ਾ�� �ਾਵ��ਾ। �� ਤ�ਸ�� �ਹ �ਰਨ "
 "ਲ� ਯ��ਨ� ਹ�?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "ਸ�ਨ�ਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ��-���ਿ� �ਿ�"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "ਪੱਤਰ ਮ��-�ਾ��"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 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."
 msgid "Fine-tune your GroupWise accounts."
 msgstr "�ਪਣ� �ਰ�ੱਪਵਾ�� ��ਾ��� ਵਿੱ� ਸ�ਧਾਰ �ਰ�।"
 
@@ -16974,22 +17436,24 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "ਤ�ਹਾਨ�ੰ �� ਯ��਼ਰ ਨਾ� ਦ�ਣਾ ਪਵ��ਾ, �� �ਿ ਲਿਸ� ਵਿੱ� ਦ�ਣਾ �ਾਹ�ੰਦ� ਹ�"
 
 #: ../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 ?"
+#, fuzzy
+#| msgid "Do you want to resend the 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 ?"
+#, fuzzy
+#| msgid "Do you want to resend the recurring 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 ?"
+#, fuzzy
+#| msgid "Do you want to retract the original item ?"
+msgid "Do you want to retract the original item?"
 msgstr "�� ਤ�ਸ�� �ਸਲ� ���ਮਾ� ਨ�ੰ ਮ��-�ਾ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../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 "�ਸਲ� ਨ�ੰ ਪ�ਰਾਪਤ �ਰਤਾ ਦ� ਮ�ਲ-ਬਾ�ਸ ਵਿੱ��� ਵ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
@@ -17006,8 +17470,8 @@ 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-process-meeting.error.xml.h:9
@@ -17019,223 +17483,192 @@ msgstr "�� ਤ�ਸ�� �ਹ ਮਨ�਼�ਰ �ਰਦ� ਹ�?"
 msgid "Would you like to decline it?"
 msgstr "�� ਤ�ਸ�� �ਸ ਲ� �ਨ�ਾਰ �ਰਦ� ਹ�?"
 
-#: ../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
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ਯ��਼ਰ :</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "�ਸ�ਮਾ��਼ ਨ���ਫਿ��ਸ਼ਨ ਸ�ਨ�ਹਾ(_u)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "ਸੰਪਰ�(_t)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "ਸ�ਨ�ਹਾ"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "ਸਾ�� ਫ�ਲਡਰ ਸ��ਨਾ"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "ਦਰਸ਼�ਾ ਹ�ਠ ਦਿੱਤ� ਸ��ਨਾ ਪ�ਰਾਪਤ �ਰਨ��।\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "ਸਾ�� ਨਹ��(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "ਸਾ��ਾ(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "ਸਾ��(_S)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>ਨਾ�</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "ਪਹ�ੰ� �ਧਿ�ਾਰ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "ਸ਼ਾਮਲ/ਸ�ਧ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "ਸੰਪਰ�(_t)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "ਫ�ਲਡਰ/��ਣ/ਨਿਯਮ/ ਸ�ਧ(_f)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "ਪ���� ���ਮਾ� ਨ�ੰ ਨਿੱ�� ਬਣਾ�(_p)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "ਯਾਦ ਪੱਤਰ"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "ਮ�ਰ� �ਲਾਰਮ ਲ� ਮ��ਬਰ(_a)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "ਮ�ਰ��� ਸ��ਨਾਵਾ� ਲ� ਮ��ਬਰ�(_n)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "ਲਿ�ਣ(_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "ਪ��ਹਨ(_R)"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>��ਾ��� ਨਾ�</b>"
 
-#. 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-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ"
 
-#: ../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
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%1$s %2$s (ਯ��਼ਰ %3$s) ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-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:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "���ਰ ��ਾ��� �ਨਲਾ�ਨ ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣਾ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ਯ��਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "ਨਵਾ� ਸਾ��ਾ ਫ�ਲਡਰ(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "ਸਾ��"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "ਸ�ਧ"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "ਵਲ��:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "ਲਿ�ਣ ਮਿਤ�:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Recipient: "
 msgstr "ਪ�ਰਾਪਤ �ਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:211
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Opened: "
 msgstr "��ਲ�ਹ�: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Accepted: "
 msgstr "ਮਨ�਼�ਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Deleted: "
 msgstr "ਹ�ਾ�: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Declined: "
 msgstr "�ਨ�ਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Completed: "
 msgstr "ਪ�ਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Undelivered: "
 msgstr "�ਣ-ਡਿਲਵਰ: "
 
-#: ../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 "Add Hula support to Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਹ�ਲਾ ਸਹਿਯ�� ਸ਼ਾਮਲ।"
@@ -17244,27 +17677,33 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਹ�ਲਾ ਸਹਿਯ�� ਸ਼
 msgid "Hula Support"
 msgstr "ਹ�ਲਾ ਸਹਿਯ��"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+#| msgid "Inline"
+msgid "Inline Image"
+msgstr "ਲਾ�ਨ '�"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+#, fuzzy
+#| msgid "Show vCards directly in mail messages."
+msgid "View image attachments directly in mail messages."
+msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ਹ�ੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP ਹ�ੱਡਰ</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ਮ�ੱਢਲ� �ਤ� ਮ�ਲਿੰ� ਸ��� ਹ�ੱਡਰ (ਮ�ਲ) (_M)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -17273,7 +17712,7 @@ msgstr ""
 "ਵਾਧ� ਹ�ੱਡਰ ਦਿੰਦ� ਹ�, �ਿਸ ਦ� ਤ�ਹਾਨ�ੰ ਸ���ਡਰਡ ਹ�ੱਡਰ ਵਿੱ� ���ਨ ਦ� ਲ�� ਹ�ੰਦ� ਹ�।\n"
 "ਤ�ਸ�� �ਸ ਨ�ੰ �ਣਡਿੱਠਾ �ਰਦ� ਹ� �� ਤ�ਸ�� \"ਸਭ ਹ�ੱਡਰ\" ਦ� ��ਣ �ਰਦ� ਹ�।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17281,7 +17720,7 @@ msgstr ""
 "�ਪਣ� IMAP ਹ�ੱਡਰ ਪਸੰਦ ��ਣ�। \n"
 "�ਿੰਨ� ਹ�ੱਡਰ ਵੱਧ �ਨ�ਹਾ� ਹ� ਤ�ਹਾਨ�ੰ �ਨ�ਹਾ� ਨ�ੰ ਡਾ�ਨਲ�ਡ �ਰਨ �ੱਤ� ਸਮਾ� ਲੱ���ਾ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17289,8 +17728,7 @@ msgstr ""
 "ਮ�ਲ ਹ�ੱਡਰ - (ਸਭ ਤ�� ਤ��਼) (_B)\n"
 "�ਹ ��ਣ�, �� ਤ�ਹਾਡ� ��ਲ ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ ਨਹ�� ਹਨ"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
-#| msgid "Fetch A_ll Headers"
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "ਸਭ ਹ�ੱਡਰ ਲਵ�(_F)"
 
@@ -17302,689 +17740,680 @@ msgstr "�ਪਣ� IMAP ��ਾ��� ਵਿੱ� ਸ�ਧਾਰ �ਰ
 msgid "IMAP Features"
 msgstr "IMAP ਫ��ਰ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "ਹਾਰਡਵ��ਰ �ਬਸ�ਸ਼ਨ ਲ��ਰ ਲ�ਡ ਨਹ�� ਹ�"
-
-#: ../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."
-msgstr ""
-"\"hald\" ਸਰਵਿਸ ਲ���ਦ� ਸ�, ਪਰ �ਸ ਵ�ਲ� �ੱਲ ਨਹ�� ਰਹ� ਹ�। ਸਰਵਿਸ ਯ�� �ਰ� �ਤ� �ਹ ਪਰ��ਰਾਮ ਮ��-"
-"�ਾ� �ਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "�ੱ� iPod ��� ਫ�ਲ�ਹ ਹ��"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਸਿ�ਰ�ਨਾ��਼ �ਰਨ ਲ� �ੱ� iPod ਨਹ�� ਲੱਭਿ� ਹ�। �ਾ� ਤਾ� �ਹ ਤ�ਹਾਡ� ਸਿਸ�ਮ ਨਾਲ ���ਿ� ਨਹ�� "
-"ਹ� �ਾ� �ਹ �ਾਲ� ਨਹ�� ��ਤਾ �ਿ� ਹ�।"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar ਫਾਰਮ�� (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-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:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' ��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "��ਲੰਡਰ '%s' ਵਿੱ� �ੱ� ਮ�ਲਾ�ਾਤ �ਸ ਮ��ਿੰ� ਨਾਲ ��ਰਾ ਰਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ��ਲੰਡਰ ਵਿੱ� ਮ�ਲਾ�ਾਤ ਮਿਲ� ਹ�"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "��� ਵ� ��ਲੰਡਰ ਲੱਭਣ ਲ� �ਸਫ਼ਲ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ਿਸ� ਵ� ��ਲੰਡਰ ਵਿੱ� �ਹ ਮ��ਿੰ� ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "�ਿਸ� �ੰਮ ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "�ਿਸ� ਮ�ਮ� ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
-#| msgid "Opening calendar"
+#: ../plugins/itip-formatter/itip-formatter.c:860
 msgid "Opening the calendar. Please wait.."
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�। �ਡ��� ��..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਲ� �ੱ� ਮ���ਦਾ ਵਰ�ਨ ਦ� ��� �ਾਰ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1044
 msgid "Unable to parse item"
 msgstr "��ਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ��ਲੰਡਰ ਤ�� ��ਾ� ਭ��ਣ ਵਿੱ� �ਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨ�਼�ਰ ਦ� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1147
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "�ੰਤਰਮ ਦ� ਤ�ਰ ਤ� ��ਲੰਡਰ '%s' ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "�ਨ�ਾਰ ਵਾ�� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1157
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "��ਲੰਡਰ '%s' ਭ��ਿ� ਰੱਦ ਵਾ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰ�ਠ� ਨ� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ ਦਿੱਤਾ ਹ� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 msgid "Sent a cancelation notice to the delegate"
 msgstr "�ੱ� ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ ਹ�ਣ ਦ� ਸ��ਨਾ ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ �ਰਨਾ ਬਾਰ� �ਾਣ�ਾਰ� ਭ��� ਨਹ�� �ਾ ਸ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ �ਲਤ ਹ�ਣ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� ਦਾ �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "��ਲੰਡਰ %s ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Meeting information sent"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid "Task information sent"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1436
 msgid "Memo information sent"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ��ਿੰ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Unable to send task information, the task does not exist"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਫ਼ਲ, �ੰਮ ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ�ਮ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1516
+#, fuzzy
+#| msgid "Calendars"
+msgid "calendar.ics"
+msgstr "��ਲੰਡਰ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1521
+#, fuzzy
+#| msgid "New Calendar"
+msgid "Save Calendar"
+msgstr "ਨਵਾ� ��ਲੰਡਰ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਹ�ਣ ਦਾ ਦਾ�ਵਾ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਠ�� ����ਲੰਡਰ (iCalendar) ਨਹ�� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 msgid "The item in the calendar is not valid"
 msgstr "��ਲੰਡਰ ਵਿੱ� ��ਾ� ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 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:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਵਿੱ� �� ���ਮਾ� ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ਯਾਤ �ਰਨਾ ਪਵ��ਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "�ਹ ਮ��ਿੰ� ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "�ਹ �ੰਮ ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "�ਹ ਮ�ਮ� ਫ�ਰ ਹ�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "_Delete message after acting"
 msgstr "�ਾਰਵਾ� �ਪਰੰਤ ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
 msgid "Conflict Search"
 msgstr "�ਪਵਾਦ ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮ��ਿੰ� ��ਰਾ ਲੱਭਣ ਲ� ��ਲੰਡਰ ��ਣ�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "�ੱ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "�ੱ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "�ੱ� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "�ੱਲ�ਹ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %H:%M:%S"
 msgstr "�ੱਲ�ਹ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "�ੱਲ�ਹ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "�ੱਲ�ਹ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ਦ� ਤ�ਰ �ੱਤ� �ਵਾਬ ਭ��� ��"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ਦ� ਤ�ਰ �ੱਤ� ਲਿ�"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ਤ�ਹਾਡ� ਨਾਲ ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਲ� �ਧਿ�ਰਿਤ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> %s ਰਾਹ�� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> ਰਾਹ�� %s ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ਤਾ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤਾ ਮ��ਿੰ� �ਾਵਾਬ ਵਾਪਸ ਭ��ਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਵਾਪਸ� �ਵਾਬ ਭ��ਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ।"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ� ਮ��ਿੰ� ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�।"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� �ੰਮ ਲ� %s ਲ� �ਿੰਮ�ਵਾਰ� ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ਨ� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ���ਦਾ �ੰਮ ਸ਼ਾਮਲ ��ਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ਮ���ਦਾ �ੰਮ ਵਿੱ� ਸ਼ਾਮਲ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> ਰਾਹ�� %s �ੱ�� ਦਿੱਤ� �ਸਾ�ਨ �ੰਮ ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> �ਾਰ� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਪਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� �ੱ�� ਦਿੱਤਾ �ਸਾ�ਨ �ੰਮ �ਵਾਬ ਭ��ਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਬਾਰ� �ਵਾਬ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤਾ �ਾਰ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤਾ �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ �ਸਾ�ਨਮਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਭ��� ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� �ਾਰ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ਨ� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> %s ਰਾਹ�� ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਹ�ਠ ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "ਸਾਰਾ ਦਿਨ:"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+#, fuzzy
+#| msgid "Sta_rt date:"
+msgid "Start day:"
+msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�(_r):"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+#, fuzzy
+#| msgid "%d day"
+#| msgid_plural "%d days"
+msgid "End day:"
+msgstr "%d ਦਿਨ"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "ਸਮਾਪਤ� ਸਮਾ�:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹ�(_O))"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 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
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "ਮਨ�਼�ਰ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨ�਼�ਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "ਸਭ �ਰ�਼� ਮਨ�਼�ਰ(_T)"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "�ਰ�਼�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "ਸਭ ਮਨ�਼�ਰ(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "�ਾਣ�ਾਰ� ਭ���(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼� ਹਾਲਤ �ੱਪਡ��(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "�ੱਪਡ��(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "ਸਮਾਪਤ� ਸਮਾ�:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "�ਿੱਪਣ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ ਦਿ�(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼�ਾ� ਨ�ੰ �ੱਪਡ�� ਭ���(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮ��ਿ�� �ੱਤ� ਲਾ��(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "�ਾ�ਮ ਫਰ� ਵਾ�� ਵ���(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "ਮ�ਨ�ੰ ਯਾਦ ਰੱ��(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "�ੰਹ�ਰਿ� ਰ�ਮਾ�ਡਰ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
-#| msgid "_Memos"
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "�ੰਮ(_T):"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "ਮ�ਮ�(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#| msgid "Displays text/calendar parts in messages."
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਿ�� ਵਿੱ� \"���ਸ�/��ਲੰਡਰ\" ਮਾ�ਮ ਭਾ� ਵ���"
 
@@ -18006,18 +18435,6 @@ msgstr "�ਹ ਮ��ਿੰ� ਲ� �ਧਿ�ਰਿਤ ਹ�"
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� ਭ��ਣ ਵਾਲ� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਲ �ਰਨਾ ਹ�?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-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 "ਬ�ਪ �ਾ� ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�"
@@ -18053,51 +18470,60 @@ msgid "Play sound when new messages arrive."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਸਾ��ਡ ਫਾ�ਲ।"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "���ਾਨ ਨਾਲ ਪ�ਪ�ੱਪ ਸ�ਨ�ਹਾ ਵ� ਵ���।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "�ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ �ਵ� ਤਾ� ਨਵਾ� ਮ�ਲ ���ਾਨ ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ਵ���।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "�ਲਾ�ਣ ਲ� ਸਾ��ਡ ਫਾ�ਲ ਨਾ� ਹ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਸਾ��ਡ ਫਾ�ਲ।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+#| msgid "Use underline"
+msgid "Use sound theme"
+msgstr "ਹ�ਠਾ� ਰ��ਾ ਵਰਤ��"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "�� ਨਵ�� ਸ�ਨ�ਹ� ��ਣ �ੱਤ� ਸਾ��ਡ �ਾ� ਬ�ਪ �ਲਾ� �ਾਵ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "�ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ �ਵ� ਤਾ� ���ਾਨ �ੱਤ� ਸ�ਨ�ਹਾ ਵ��ਣਾ"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਾ� ਨਹ��।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�� ��ਵਲ �ਨ-ਬਾ�ਸ ਵਿ�ਲ� ਸ�ਨ�ਹਿ�� ਲ� ਹ� ਨ���ਫਾ� �ਰਨਾ ਹ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:366
 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:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18112,99 +18538,121 @@ msgstr[1] ""
 "ਤ�ਹਾਨ�ੰ %2$s ਵਿੱ� %1$d ਨਵ�� ਸ�ਨ�ਹ�\n"
 "�� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, fuzzy, c-format
+#| msgid "From %s:"
+msgid "From: %s"
+msgstr "%s ਤ��:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, fuzzy, c-format
+#| msgid "Subject:"
+msgid "Subject: %s"
+msgstr "ਵਿਸ਼ਾ:"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, 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:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "ਨਵ�� �ਮ�ਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਵ���(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "���ਾਨ ਨਾਲ ਸ�ਨ�ਹਾ ਵ� ਪ�ਪ�ੱਪ �ਰ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�(_s)"
+#: ../plugins/mail-notification/mail-notification.c:869
+#, fuzzy
+#| msgid "Use underline"
+msgid "Use sound _theme"
+msgstr "ਹ�ਠਾ� ਰ��ਾ ਵਰਤ��"
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "�ਾਸ ਫਾ�ਲ ਨਾ�(_f):"
+#: ../plugins/mail-notification/mail-notification.c:888
+#, fuzzy
+#| msgid "Play _sound file"
+msgid "Play _file:"
+msgstr "ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "ਧ�ਨ� ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "�ਲਾ�(_a)"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�(_I)"
 
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
+
 #: ../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
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
-msgstr ""
-"��ਣਿ� ��ਲੰਡਰ ਵਿੱ� �ਵ��� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਵ��� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� "
-"ਹ�?"
+msgstr "��ਣਿ� ��ਲੰਡਰ ਵਿੱ� �ਵ��� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਵ��� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, 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
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
-"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਮ�ਮ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� ਮ�ਮ� ਲਿਸ� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਮ�ਮ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� ਮ�ਮ� ਲਿਸ� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� "
+"ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
+#: ../plugins/mail-to-task/mail-to-task.c:519
 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
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18212,14 +18660,15 @@ msgstr ""
 "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
 "ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
+#: ../plugins/mail-to-task/mail-to-task.c:525
 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
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18227,11 +18676,12 @@ 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-task/mail-to-task.c:429
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18245,7 +18695,7 @@ msgstr[1] ""
 "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
 "ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18253,152 +18703,151 @@ 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"
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[ਸੰ��ਪ ਨਹ��]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਬ���� ਵਾਪਸ ਮਿਲਿ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570, c-format
-#| msgid "An error occurred while printing"
+#: ../plugins/mail-to-task/mail-to-task.c:696
+#, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ਪਰ�ਸ�ਸ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:732
 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
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� �ੰਮ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
-#| msgid ""
-#| "Selected source is read only, thus cannot create task there. Select other "
-#| "source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "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}\"."
+#: ../plugins/mail-to-task/mail-to-task.c:941
+#, c-format
 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/mail-to-task.c:1060
+msgid "Create an _Event"
+msgstr "�ਵ��� ਬਣਾ�(_E)"
 
-#: ../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 "Create a new memo"
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+msgid "Create a new event from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� �ਵ��� ਬਣਾ�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "ਮ�ਮ� ਬਣਾ�(_o)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#| msgid "New _Meeting"
-msgid "Create a _Meeting"
-msgstr "ਮ��ਿੰ� ਬਣਾ�(_M)"
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+msgid "Create a new memo from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
-#: ../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"
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 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/mail-to-task.c:1076
+msgid "Create a new task from the selected message"
+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/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "ਮ��ਿੰ� ਬਣਾ�(_M)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-#| msgid "Create a new meeting request"
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 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/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ� ਵਿੱ� ਬਦਲ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "ਸੰਪਰ� ਸ��� ਮਾਲ�(_o)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
+msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
-msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_a)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_u)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
+msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ਾਰਵਾ�"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+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
-msgid "Mailing _List"
-msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "ਸੰਪਰ� ਲਿਸ� ਮਾਲ�(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-#| msgid ""
-#| "Provide actions for common mailing list commands (subscribe, "
-#| "unsubscribe...)."
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "�ਮ ਮ�ਲਿੰ� ਸ��� �ਮਾ�ਡਾ� (ਮ��ਬਰ ਬਣ�, ਹ��,...) �ਪਲੱਬਧ �ਰਵਾ�ਦਾ ਹ�।"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਦ� ਮਾਲ� ਨਾਲ ਸੰਪਰ�"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
 msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#, fuzzy
+#| msgid "Unsubscribe to the mailing list this message belongs to"
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ਾਰਵਾ�"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "�ਮ ਮ�ਲਿੰ� ਸ��� �ਮਾ�ਡਾ� (ਮ��ਬਰ ਬਣ�, ਹ��,...) �ਪਲੱਬਧ �ਰਵਾ�ਦਾ ਹ�।"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "�ਾਰਵਾ� �ਪਲੱਬਧ ਨਹ��"
@@ -18476,59 +18925,11 @@ msgstr "ਸ�ਨ�ਹਾ ਸ�ਧ(_E)"
 msgid "_Send message"
 msgstr "ਸ�ਨ�ਹਾ ਭ���(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-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"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਦ� ਮਾਲ� ਨਾਲ ਸੰਪਰ�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-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 "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
-
-#: ../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 "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
-
-#: ../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 "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "�� ਸਬ-ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਮਾਰ� �ਰਨ� ਹਨ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18536,84 +18937,66 @@ msgstr ""
 "�ਸ ਨਾਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਹ� ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� �ਾ� ਮ���ਦਾ ਫ�ਲਡਰ ਦ� ਨਾਲ ਸਭ �ਧ�ਨ-"
 "ਫ�ਲਡਰ ਵ�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
-#| msgid "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� ਵਿੱ�(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
-#| msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ�(_F)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:349
+msgid "Mark Me_ssages as Read"
+msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹ� ਹ�� ਬਣਾ�(_S)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "ਸਭ ਪ��ਹ� ਬਣਾ�"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹ� ਹ�� ਬਣਾ�(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#| 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 "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 "Change Evolution's settings"
 msgid "Manage your Evolution plugins."
 msgstr "ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਪਲੱ��ਨ ਪਰਬੰਧ।"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "ਪਲੱ�-�ਨ ਮ�ਨ��ਰ"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "ਪਲੱ�-�ਨ �ਯ�� ਤ� �ਾਲ�"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "ਪਲੱ�-�ਨ(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "ਲ���"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "ਸੰਰ�ਨਾ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ਨ��: ��� ਤਬਦ�ਲ��� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� ਪ�ਰਭਾਵ� ਨਹ�� ਹ� ਸ�ਦ��� ਹਨ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "ਸੰ��ਪ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "ਪਲੱ�-�ਨ"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "ਪਲੱ�-�ਨ(_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "ਪਲੱ�-�ਨ �ਯ�� ਤ� �ਾਲ�"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "ਪਲ�ਨ ���ਸ� ਮ�ਡ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-#| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 
@@ -18621,19 +19004,43 @@ msgstr "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ ਪਲ��-���ਸ� ਵ���, �� �ਹ HTML ਸਮੱ�ਰ� ਵ� ਰੱ�ਦ� ਹ�ਵ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "ਸਧਾਰਨ ਹ� ਪਸੰਦ"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+#, fuzzy
+#| msgid "Show HTML if present"
+msgid "Show plain text if present"
+msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ���"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+#, fuzzy
+#| msgid "Only ever show PLAIN"
+msgid "Only ever show plain text"
 msgstr "ਹਮ�ਸ਼ਾ ਸਧਾਰਨ ਹ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HT_ML ਮ�ਡ"
 
@@ -18657,26 +19064,37 @@ msgstr "Outlook PST �ੰਪ�ਰ�"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ਨਿੱ�� ਫ�ਲਡਰ (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "ਪੱਤਰ(_M)"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "ਮ�ਲਾ�ਾਤ(_p)"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "�ੰਮ(_T)"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "�ਰਨਲ ���ਰ���(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "���ਲ�ੱ� ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "��ਲੰਡਰ ਪਰਾ�ਸ਼ਨ"
 
@@ -18685,147 +19103,166 @@ 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:95
-#: ../plugins/publish-calendar/publish-calendar.c:337, c-format
-#| msgid "Could not open source"
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
+#, c-format
 msgid "Could not open %s:"
 msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97, c-format
-#| msgid "Could not parse PGP message: Unknown error"
+#: ../plugins/publish-calendar/publish-calendar.c:210
+#, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: �ਣ�ਾਣ �ਲਤ�"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%s ਪਬਲਿਸ਼ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%s ਲ� ਪਬਲਿਸ ਸਫ਼ਲ ਰਿਹਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s ਦਾ ਮਾ��� ਫ�ਲ�ਹ:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "ਯ��(_n)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "�� ਤ�ਸ�� �ਹ �ਿ�ਾਣਾ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
-#| msgid "Could not create message."
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 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>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ� ਪਰ�ਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">ਸਰ�ਤ</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#, fuzzy
+#| msgid "Custom Notification"
+msgid "Custom Location"
+msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+#| msgid "Day"
+msgid "Daily"
+msgstr "ਦਿਨ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (ਲਾ��ਨ ਨਾਲ)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+#| msgid ""
+#| "Daily\n"
+#| "Weekly\n"
+#| "Manual (via Actions menu)"
+msgid "Manual (via Actions menu)"
 msgstr ""
 "ਰ��਼ਾਨਾ\n"
 "ਹਫ਼ਤਾਵਾਰ�\n"
 "ਦਸਤ� (�ਾਰਵਾ� ਮ�ਨ� ਰਾਹ��)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "ਯ��(_n)"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "ਪ�ਰ�(_o):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#, fuzzy
+#| msgid "Public"
+msgid "Public FTP"
+msgstr "ਸਰਵ�ਨ�"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "ਪਰ�ਾਸ਼ਣ �ਿ�ਾਣਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "ਪਰ�ਾਸ਼ਨ �ਵਿਰਤ�(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"ਸ�ਰੱ�ਿ�ਤ FTP (SSH)\n"
-"ਪਬਲਿ� FTP\n"
-"FTP (ਬਿਨਾ� ਲਾ��ਨ ਦ�)\n"
-"Windows ਸਾ��\n"
-"WebDAV (HTTP)\n"
-"ਸ�ਰੱ�ਿ�ਤ WebDAV (HTTPS)\n"
-"ਪਸੰਦ�ਦਾ �ਿ�ਾਣਾ"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "Secure FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "Secure WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "ਸਰਵਿਸ �ਿਸਮ(_T): "
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#| msgid "Time _zone:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#, fuzzy
+#| msgid "Source"
+msgid "Sources"
+msgstr "ਸਰ�ਤ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "ਸਮਾ� �ੰਤਰਾਲ(_d):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
+#| msgid "WebDAV"
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#, fuzzy
+#| msgid "Week"
+msgid "Weekly"
+msgstr "ਹਫਤਾ"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#, fuzzy
+#| msgid "_Window"
+msgid "Windows share"
+msgstr "ਵਿੰਡ�(_W)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "ਫਾ�ਲ(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "�ੰ� ਪਰ�ਾਸ਼ਤ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "ਯ��਼ਰ ਨਾ�(_U):"
 
-#: ../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"
-msgstr ""
-"iCal\n"
-"ਵ�ਹਲਾ/ਰ��ਿ�"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#, fuzzy
+#| msgid "Call"
+msgid "iCal"
+msgstr "�ਾਲ"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -18833,38 +19270,14 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "��ਲੰਡਰ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ��ਲੰਡਰ ਬ���ਡ ਹ�ਣ ਮ���ਦ ਨਹ�� ਰਿਹਾ।"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "ਨਵਾ� �ਿ�ਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "�ਿ�ਾਣਾ ਸ�ਧ"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "ਹ�ਲ� ਪਾ�ਥਨ"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "ਪਾ�ਥਨ ਪਲੱ��ਨ ਲ�ਡਰ ��ਸ�"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "ਪਾ�ਥਨ ��ਸ� ਪਲੱ��ਨ"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "ਪਾ�ਥਨ �-ਪਲੱ��ਨ ਲ�ਡਰ ਲ� ��ਸ� ਪਲੱ��ਨ।"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "�ੱ� ਪਲੱ��ਨ, �� ਹ�ਰ ਪਲੱ��ਨ ਲ�ਡ �ਰਦ� ਹ�, ਪਾ�ਥਨ ਨਾਲ ਲਿ��।"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "ਪਾ�ਥਨ ਲ�ਡਰ"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -18896,26 +19309,25 @@ msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ੱਸ ਦ�ਲ ਦ� �
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#, fuzzy, c-format
+#| msgid "SpamAssassin is not available."
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ਹ Spamassasin ਨ�ੰ ਹ�ਰ ਵ� ਭਰ�ਸ�ਯ�� ਬਣਾ�ਦਾ ਹ�, ਪਰ ਹ�ਲ� �ਰਦਾ ਹ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 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 Bogofilter."
 msgid "Filter junk messages using SpamAssassin."
 msgstr "SpamAssassin ਦ� ਵਰਤ�� �ਰ�� �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#| msgid "SpamAssassin junk plugin"
 msgid "SpamAssassin Junk Filter"
 msgstr "SpamAssassin �ੰ� ਫਿਲ�ਰ"
 
@@ -18927,139 +19339,128 @@ 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:160
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "ਵ�ਰਵਾ ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "���ਾ�ਰ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "�ਿੱਪਣ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "ਸੰਪਰ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "ਸ਼�ਰ�"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "ਫ�-ਸਦ� ਮ��ੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "ਦਰਸ਼� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "ਸ�ਧਿ�"
 
-#: ../plugins/save-calendar/csv-format.c:523
-#| msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ਫਾਰਮ�� ਲ� ਤ�ਨ��� ��ਣਾ�(_d)"
 
-#: ../plugins/save-calendar/csv-format.c:530
-#| msgid "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a _header"
 msgstr "ਹ�ੱਡਰ �ੱ�� ����(_h)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-#| msgid "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "_Value delimiter:"
 msgstr "ਮ�ੱਲ ਸ�ਮਾ(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:546
-#| msgid "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:543
 msgid "_Record delimiter:"
 msgstr "ਰਿ�ਾਰਡ ਸ�ਮਾ(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:553
-#| msgid "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:550
 msgid "_Encapsulate values with:"
 msgstr "ਮ�ੱਲ �ਸ ਨਾਲ ਢੱ��(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "�ਾਮਿ�� ਨਾਲ ਵੱ� ਮ�ੱਲ਼ ਫਾਰਮ�� (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar ਫਾਰਮ�� (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "��ਣ� ਸੰਭਾਲ�"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#| 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"
-msgstr "ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�(_S)"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮ�� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
-#| msgid "Format"
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "ਫਾਰਮ��(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#| 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 "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)"
+#: ../plugins/save-calendar/save-calendar.c:325
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected calendar to disk"
+msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ���ਸ� ਫਾ�ਲ਼ ਦ� ਤ�ਰ �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "��ਵਲ ਮ�ਮ� ਲਿਸ� ਹ� ਵ���(_o)"
+#: ../plugins/save-calendar/save-calendar.c:356
+#, fuzzy
+#| msgid "Save the selected messages as a text file"
+msgid "Save the selected memo list to disk"
+msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ���ਸ� ਫਾ�ਲ਼ ਦ� ਤ�ਰ �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "ਸਿਰਫ਼ �ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
+#: ../plugins/save-calendar/save-calendar.c:387
+#, fuzzy
+#| msgid "Save a calendar or task list to disk."
+msgid "Save the selected task list to disk"
+msgstr "��ਣ� ��ਲੰਡਰ �ਾ� �ਾਸ� ਲਿਸ� ਨ�ੰ ਡਿਸ� 'ਤ� ਸੰਭਾਲ�।"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19069,15 +19470,15 @@ msgstr "�ਪਣ� ਸ਼�ਰ��ਤ� ��ਾ��� ਸ���ੱ
 msgid "Setup Assistant"
 msgstr "ਸ���ੱਪ ਸਹਾ��"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "�� ��� ਨ�ੰ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 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"
@@ -19089,34 +19490,30 @@ msgstr ""
 "\n"
 "�ਾਰ� ਰੱ�ਣ ਥ� \"�ੱ��\" ਬ�ਨ ਨ�ੰ ਦੱਬ� ��। "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "�ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ� ��:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "%s ਤ��:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "�ਡ��� ��"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-#| msgid "Thread messages by subject"
 msgid "Sort mail message threads by subject."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
 
@@ -19139,33 +19536,33 @@ msgid ""
 "message body."
 msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��ਪਲ�� ਪਲੱ��ਨ ਸਬ-�ਾ��ਲ ਲ� ਸ਼ਬਦ/ਮ�ੱਲ ��� ਦ� ਲਿਸ� ਹ�।"
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
+
+#: ../plugins/templates/templates.c:617
+#, fuzzy
+#| msgid "No title"
+msgid "No Title"
 msgstr "�ਾ��ਲ ਨਹ��"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�(_T)"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 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"
 msgid "TNEF Decoder"
 msgstr "TNEF ਡ���ਡਰ"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#| msgid "Multiple vCards"
 msgid "Inline vCards"
 msgstr "�ਨ-ਲਾ�ਨ vCards"
 
@@ -19173,36 +19570,31 @@ msgstr "�ਨ-ਲਾ�ਨ vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "ਪ�ਰਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 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."
+#: ../plugins/vcard-inline/vcard-inline.c:224
 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."
+#: ../plugins/vcard-inline/vcard-inline.c:233
+#, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "%d ਹ�ਰ ਸੰਪਰ� ਹ�।"
 msgstr[1] "%d ਹ�ਰ ਸੰਪਰ� ਹਨ।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
-#| msgid "Save in address book"
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸੰਭਾਲ�"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#| msgid "WebDAV contacts"
 msgid "Add WebDAV contacts to Evolution."
 msgstr "WebDAV ਸੰਪਰ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
@@ -19222,22 +19614,6 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "ifMatch �ਣਡਿੱਠਾ (_Apache < 2.2.8 ਦ� ਲ�� ਹ�)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ੱਲ"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ੱਲ ਸੰਰ�ਨਾ ਫ���ਰ�"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਾ�� "
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ� ਭਾ�"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "ਪਰਾ�ਸ� ਸਰਵਰ ��ਨ��ਸ਼ਨ ਪਰਮਾਣਿਤ"
@@ -19255,42 +19631,54 @@ msgid "Default sidebar width"
 msgstr "ਮ�ਲ ਬਾਹ� ���ਾ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window X coordinate"
+msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ਹਾਲਤ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window Y coordinate"
+msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ਹਾਲਤ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ��ਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ਹਾਲਤ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ���ਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "�ਦ�� HTTP/ਸ�ਰੱ�ਿ�ਤ HTTP ਰਾਹ�� �ੰ�ਰਨ�ੱ� ਵਰਤਣਾ ਹ�ਵ� ਤਾ� ਪਰਾ�ਸ� ਸਥਾਪਨ �ਾਲ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "HTTP ਪਰਾ�ਸ� ਹ�ਸ� ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "HTTP ਪਰਾ�ਸ� ਪਾਸਵਰਡ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "HTTP ਪਰਾ�ਸ� ਪ�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "HTTP ਪਰਾ�ਸ� ਯ��਼ਰ-ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ਭਾ� ਦਾ ID �ਾ� �ਪਨਾ� ਨ�ੰ ਸ਼�ਰ��ਤ ਤ� ਵ��ਿ� �ਾ�� �ਰ��ਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19301,63 +19689,61 @@ msgstr ""
 "shell/network_config/authentication_user\" GConf  ��ੰ�� �ਤ� ਪਾਸਵਰਡ ਨ�ੰ gnome-"
 "keyring �ਾ� ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾ�ਲ ਤ�� ਲਿ� �ਾ�ਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-#| msgid "Insert Attachment"
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "ਸ਼�ਰ��ਤ� ����ਮ��� �ਲ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-#| msgid "Install the shared folder"
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "ਸ਼�ਰ��ਤ� ਫਾ�ਲ ��ਣ�ਾਰ ਫ�ਲਡਰ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ਡਾ�ਲਾ� ਲ� ਸ਼�ਰ��ਤ� ਫ�ਲਡਰ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 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
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "��ਰ� ਨਵ�ਨ ਸੰਰ�ਨਾ ਵਰ�ਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ਫ�ਲਡਰ, �� �ਿ �ਫਲ਼ਾ�ਨ ਲ� ਸਿ�ਰ�ਨਾ��਼ �ਰਨ� ਹਨ, ਦ� ਰਸਤ� ਦ� ਲਿਸ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "�਼�ਰ-ਪਰਾ�ਸ� ਹ�ਸ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "�ਦ�� HTTP ਪਰਾ�ਸ� ��ਤਾ �ਾਵ� ਤਾ� ਪਰਮਾਣ�ਿਤਾ ਵਾਸਪ� ਪਾਸਵਰਡ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਮ�ਡ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ਪਰਾ�ਸ� ਹ�ਸ� ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS ਪਰਾ�ਸ� ਪ�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ� ਹ�ਸ� ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ� ਪ�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19368,41 +19754,53 @@ msgstr ""
 "ਨਹ��\", \"��ਦ ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਦਿ�\" �ਤ� \"autoconfig url ਵਿੱ� ਦਿੱਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਵਰਤ��"
 "\" ਹਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "ਵਿ�ਾਸ ��ਤਾਵਨ� ਪ�ੱ��ਿੱ� ਡਾ�ਲਾ� �ੱਡ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱ�� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 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:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default X coordinate for the main window."
+msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+#| msgid "The default width for the main window, in pixels."
+msgid "The default Y coordinate for the main window."
+msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹ� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19410,19 +19808,19 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦਾ ��ਰ� �ੱਪ�ਰ�ਡ ��ਤਾ ਸੰਰ�ਨਾ ਵਰ�ਨ, ਵੱਧ/�ੱ�/ਸੰਰ�ਨਾ ਪੱਧਰ ਨਾਲ (�ਦਾਹਰਨ ਲ� \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "ਪਰਾ�ਸ� HTTP ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ਪਰ�ਾਸ� ਸ�ਰੱ�ਿ�ਤ HTTP ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "ਪਰਾ�ਸ� ਸਾ�� ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19430,7 +19828,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ \"/apps/evolution/shell/network_config/http_host\" ਰਾਹ�� ਦਿੱਤਾ "
 "�ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19438,7 +19836,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ  \"/apps/evolution/shell/network_config/secure_host\" ਰਾਹ�� "
 "ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19446,7 +19844,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ \"/apps/evolution/shell/network_config/socks_host\"ਰਾਹ�� ਦਿੱਤਾ "
 "�ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19455,7 +19853,7 @@ msgstr ""
 "ਵਿੰਡ� ਬ�ਨਾ� ਦਾ ਸ�ਾ�ਲ ਹ�। \"���ਸ�\", \"���ਾਨ\", \"ਦ�ਵ��\", \"��ਲਬਾਰ\" ਸੰਭਵ ਹ�। �� \"��ਲਬਾਰ"
 "\" ਨ�ੰ ��ਣਿ� �ਿ� ਤਾ�, �ਨ�ਮ ��ਲਬਾਰ ਸ��ਿੰ� ਰਾਹ�� ਹ� ਬ�ਨਾ� ਦਾ ਸ�ਾ�ਲ ਲਿ� �ਾਵ��ਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 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 "
@@ -19466,283 +19864,725 @@ msgstr ""
 "ਹ�ਵ�)। �ਹ ਮ�ੱਲ ਵਿੱ� ਹ�ਸ�-ਨਾ�, ਡ�ਮ�ਨ (ਸ਼�ਰ��ਤ� ਵਲਾ�ਡ-�ਾਰਡ *.foo.com �ਦਿ ਨਾਲ), IP ਹ�ਸ� �ਡਰ�ੱਸ "
 "(IPv੪ �ਤ� IPv੬ ਦ�ਵਾ�) ਨਾਲ �ਤ� ਨ�ੱ�ਵਰ� �ਡਰ�ੱਸ ਨਾਲ ਨ�ੱ�ਮਾਸ� (�ਿਵ�� �ਿ 192.168.0.0/24) ਹਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "��ਲਬਾਰ �ਪਲੱਬਧ ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL �� �ਿ ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਮ�ੱਲ ਦਿੰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "HTTP ਪਰਾ�ਸ� ਵਰਤ��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ਪਰਮਾਣ�ਿਤਾ ਵ��� ਦ�ਣ ਲ� ਯ��਼ਰ ਨਾ�, �ਦ�� �ਿ HTTP ਪਰਾ�ਸ� �ਾਰ� ਹ�ਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "�� �ਵ�ਲ�ਸ਼ਨ �ਫਲਾ�ਨ ਢੰ� ਨਾਲ ਸ਼�ਰ� ��ਤਾ �ਾਵ��ਾ, ਨਾ�ਿ �ਨਲਾ�ਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "�� �ਰ��� ਨ�ੰ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਦਿੱਤਾ �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "�� ਬਾਹ� ਵ��ਾ� ਦ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "�� ਹਾਲਤ-ਪੱ�� ਵ��ਾ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "�� ਸੰਦ ਪੱ�� �ਪਲੱਬਧ ਹ�ਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "�� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਿ�ਾਸ ਵਰ�ਨ ਡਾ�ਲਾ� ਨ�ੰ ਵ��ਾ�� ਨਾ �ਾਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "�� ਵਿੰਡ� ਬ�ਨ ਵ��ਾ� ਦ�ਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>ਸਰ�ਰਮ ��ਨ��ਸ਼ਨ</b>"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "���"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "ਸਰ�ਰਮ ��ਨ��ਸ਼ਨ ਦਬਾ�"
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "��� ਸੰਭਾਲ�"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "�ਹ ��ਨ��ਸ਼ਨ ਬੰਦ �ਰਨ ਲ� �ਤ� �ਫਲਾ�ਨ �ਾਣ ਲ� OK ਦਬਾ�"
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld �ਿਬਾ"
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:687
+#, fuzzy
+#| msgid "Sho_w: "
+msgid "Sho_w:"
+msgstr "ਵ���(_w): "
 
-#: ../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 "ਫਾ�ਲ, �� ਵ� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� �ਯਾਤ �ਰਨ� ਹ� �ਤ� �ਸ ਦ� �ਿਸਮ ਸ��� ਵਿੱ��� ��ਣ�।"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:714
+#, fuzzy
+#| msgid "Sear_ch: "
+msgid "Sear_ch:"
+msgstr "���(_c): "
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:769
+#, fuzzy
+#| msgid " i_n "
+msgid "i_n"
+msgstr " �ੰਦਰ(_n) "
 
-#: ../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"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-switcher.c:448
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "Toolbar Style"
+msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ(_b)"
+
+#: ../shell/e-shell-switcher.c:449
+msgid "The switcher's toolbar style"
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਨ� ਹ�ਠ ਲਿ�ਿ�� ਤ�� ਸ��ਿੰ� �ਯਾਤ �ਰਨ ਲ� �ਾ�� ��ਤ�\n"
-"ਹ�: Pine, Netscape, Elm, iCalendar। ��� ਸ��ਿੰ�, �� �ਿ\n"
-"�ਯਾਤ ��ਤ� �ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� ਮ�� ��ਸ਼ਿਸ �ਰਨ� �ਾਹ�ੰਦ�\n"
-"ਹ� ਤਾ� \"ਪਿੱ��\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।\n"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:743
+#, fuzzy
+#| msgid "Toolbar is visible"
+msgid "Toolbar Visible"
+msgstr "��ਲਬਾਰ �ਪਲੱਬਧ ਹ�"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
+#: ../shell/e-shell-switcher.c:466
+#, fuzzy
+#| msgid "Whether the sidebar should be visible."
+msgid "Whether the switcher is visible"
+msgstr "�� ਬਾਹ� ਵ��ਾ� ਦ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
+#: ../shell/e-shell-utils.c:220
+#, fuzzy
+#| msgid "vCard (.vcf, .gcrd)"
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
+#: ../shell/e-shell-utils.c:222
+#, fuzzy
+#| msgid "iCalendar files (.ics)"
+msgid "iCalendar (.ics)"
+msgstr "iCalendar ਫਾ�ਲਾ� (.ics)"
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
+#: ../shell/e-shell-utils.c:243
+#, fuzzy
+#| msgid "All files"
+msgid "All Files (*)"
+msgstr "ਸਭ ਫਾ�ਲਾ�"
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "�ਯਾਤ(_I)"
+#: ../shell/e-shell-view.c:604
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switcher Action"
+msgstr "%s ਲ� ਤਬਦ�ਲ"
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
+#: ../shell/e-shell-view.c:605
+msgid "The switcher action for this shell view"
+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:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
+#: ../shell/e-shell-view.c:620
+#, fuzzy
+#| msgid "Serial Number"
+msgid "Page Number"
+msgstr "�ਰਮ �ੰ�"
 
-#: ../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-view.c:621
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:78, c-format
-#| msgid "Error executing %s."
-msgid "Error executing %s. (%s)"
-msgstr "%s �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: (%s)"
+#: ../shell/e-shell-view.c:637
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Rule"
+msgstr "��� ਫਿਲ�ਰ"
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "ਬੱ�-ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
+#: ../shell/e-shell-view.c:638
+msgid "Criteria for the current search results"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "ਬੱ�-ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+#: ../shell/e-shell-view.c:653
+msgid "The EShellBackend for this shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:668
+msgid "Shell Content Widget"
+msgstr ""
+
+#: ../shell/e-shell-view.c:669
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:685
+#, fuzzy
+#| msgid "Default sidebar width"
+msgid "Shell Sidebar Widget"
+msgstr "ਮ�ਲ ਬਾਹ� ���ਾ�"
+
+#: ../shell/e-shell-view.c:686
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:701
+msgid "Shell Taskbar Widget"
+msgstr "ਸ�ੱਲ �ਾਸ�ਬਾਰ ਵਿਦ��ੱ�"
+
+#: ../shell/e-shell-view.c:702
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:717
+#, fuzzy
+#| msgid "New _Window"
+msgid "Shell Window"
+msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
+
+#: ../shell/e-shell-view.c:718
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:749
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:763
+#, fuzzy
+#| msgid "_Current View"
+msgid "Current View ID"
+msgstr "ਮ���ਦਾ �ਲ�(_C)"
+
+#: ../shell/e-shell-view.c:764
+#, fuzzy
+#| msgid "the current time"
+msgid "The current GAL view ID"
+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:938
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/";
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
-#: ../shell/e-shell-window-commands.c:1163
-msgid "_Work Online"
-msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
+#: ../shell/e-shell-window-actions.c:1223
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "Bug Buddy is not installed."
+msgstr "ਬੱ�-ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
+
+#: ../shell/e-shell-window-actions.c:1225
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "Bug Buddy could not be run."
+msgstr "ਬੱ�-ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#: ../shell/e-shell-window-actions.c:1327
+#, fuzzy
+#| msgid "Bug buddy is not installed."
+msgid "GNOME Pilot is not installed."
+msgstr "ਬੱ�-ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
+
+#: ../shell/e-shell-window-actions.c:1329
+#, fuzzy
+#| msgid "Bug buddy could not be run."
+msgid "GNOME Pilot could not be run."
+msgstr "ਬੱ�-ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#: ../shell/e-shell-window-actions.c:1423
+msgid "Show information about Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ� �ਾਣ�ਾਰ� ਵ���"
+
+#: ../shell/e-shell-window-actions.c:1428
+msgid "_Close Window"
+msgstr "ਵਿੰਡ� ਬੰਦ �ਰ�(_C)"
+
+#: ../shell/e-shell-window-actions.c:1435
+#, fuzzy
+#| msgid "A_ppointments"
+msgid "_Contents"
+msgstr "ਮ�ਲਾ�ਾਤ(_p)"
+
+#: ../shell/e-shell-window-actions.c:1437
+#, fuzzy
+#| msgid "Open Other User's Folder"
+msgid "Open the Evolution User Guide"
+msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰ ��ਲ�ਹ�"
+
+#: ../shell/e-shell-window-actions.c:1463
+msgid "Evolution _FAQ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ-�ਵਾਬ(_F)"
+
+#: ../shell/e-shell-window-actions.c:1465
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲਾ� ਲ� ਵ�ੱਬ-ਪ��਼ ��ਲ�ਹ�"
+
+#: ../shell/e-shell-window-actions.c:1470
+msgid "_Forget Passwords"
+msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�(_F)"
+
+#: ../shell/e-shell-window-actions.c:1472
+#, fuzzy
+#| msgid "Are you sure you want to forget all remembered passwords?"
+msgid "Forget all remembered passwords"
+msgstr "�� ਤ�ਸ�� ਸਭ ਯਾਦ ਰੱ�� ਹ�� ਪਾਸਵਰਡ ਭ�ੱਲਣ ਲ� ਤਿ�ਰ ਹ�?"
+
+#: ../shell/e-shell-window-actions.c:1477
+msgid "I_mport..."
+msgstr "�ੰਪ�ਰ� �ਰ�(_m)..."
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Import data from other programs"
+msgstr "ਹ�ਰ �ਾਰ�ਾ� ਤ�� ਡਾ�ਾ �ੰਪ�ਰ� �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1484
+msgid "New _Window"
+msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
+
+#: ../shell/e-shell-window-actions.c:1486
+#, fuzzy
+#| msgid "Create a new window displaying this folder"
+msgid "Create a new window displaying this view"
+msgstr "�ਸ ਫ�ਲਡਰ ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਨਵ�� ਵਿੰਡ� ਬਣਾ�"
+
+#: ../shell/e-shell-window-actions.c:1500
+#, fuzzy
+#| msgid "Configuration"
+msgid "Configure Evolution"
+msgstr "ਸੰਰ�ਨਾ"
+
+#: ../shell/e-shell-window-actions.c:1505
+msgid "_Quick Reference"
+msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1507
+#, fuzzy
+#| msgid "Change Evolution's settings"
+msgid "Show Evolution's shortcut keys"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਤਬਦ�ਲ"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Exit the program"
+msgstr "ਪਰ��ਰਾਮ ਬੰਦ �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1519
+msgid "_Advanced Search..."
+msgstr "ਤ�ਨ��� ���(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1528
+#, fuzzy
+#| msgid "Clear the search"
+msgid "Clear the current search parameters"
+msgstr "��� ਸਾਫ਼ �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1533
+msgid "_Edit Saved Searches..."
+msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1535
+#, fuzzy
+#| msgid "Manage your email, contacts and schedule"
+msgid "Manage your saved searches"
+msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ���, ਸੰਪਰ� �ਤ� ਸ਼�ਡਿ�ਲ ਦਾ ਪਰਬੰਧ �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1542
+msgid "Click here to change the search type"
+msgstr "��� �ਾ�ਪ ਬਦਲਣ ਲ� �ਲਿੱ� �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1547
+msgid "_Find Now"
+msgstr "ਹ�ਣ ���(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1549
+#, fuzzy
+#| msgid "Cancel the current mail operation"
+msgid "Execute the current search parameters"
+msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1554
+msgid "_Save Search..."
+msgstr "��� ਸੰਭਾਲ�(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1556
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the current search parameters"
+msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
+
+#: ../shell/e-shell-window-actions.c:1568
+msgid "Send / _Receive"
+msgstr "ਭ��� / ਲਵ�(_R)"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "Send queued items and retrieve new items"
+msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
+
+#: ../shell/e-shell-window-actions.c:1575
+#, fuzzy
+#| msgid "Submit _Bug Report"
+msgid "Submit _Bug Report..."
+msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�(_B)"
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1577
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ਬੱ� ਬੱਡ� ਵਰਤ �� ਬੱ� �ਾਣ�ਾਰ� ਭ���"
+
+#: ../shell/e-shell-window-actions.c:1582
+#, fuzzy
+#| msgid "iPod Synchronization"
+msgid "GNOME Pilot _Synchronization..."
+msgstr "iPod ਸਿ�ਰ�ਨਾ��਼"
+
+#: ../shell/e-shell-window-actions.c:1584
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Set up GNOME Pilot configuration"
+msgstr "ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ���ੱਪ"
+
+#: ../shell/e-shell-window-actions.c:1589
 msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "�ਫ-ਲਾ�ਨ �ਾ�"
+#: ../shell/e-shell-window-actions.c:1591
+#, fuzzy
+#| msgid "Start in offline mode"
+msgid "Put Evolution into offline mode"
+msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਨਲਾ�ਨ ਹ�।\n"
-"�ਸ ਬ�ਨ ਨ�ੰ �ਫਲਾ�ਨ ਹ�ਣ ਲ� ਦਬਾ�।"
+#: ../shell/e-shell-window-actions.c:1596
+msgid "_Work Online"
+msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਫਲਾ�ਨ ਹ�ਣ ਦ� �ਾਰਵਾ� �ਧ�ਨ ਹ�।"
+#: ../shell/e-shell-window-actions.c:1598
+#, fuzzy
+#| msgid "Start in online mode"
+msgid "Put Evolution into online mode"
+msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�।\n"
-"�ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
+#: ../shell/e-shell-window-actions.c:1626
+msgid "Lay_out"
+msgstr "ਲ����(_o)"
+
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_New"
+msgstr "ਨਵਾ�(_N)"
+
+#: ../shell/e-shell-window-actions.c:1640
+msgid "_Search"
+msgstr "���(_S)"
+
+#: ../shell/e-shell-window-actions.c:1647
+msgid "_Switcher Appearance"
+msgstr "ਸਵਿੱ�ਰ ਦਿੱ�(_S)"
+
+#: ../shell/e-shell-window-actions.c:1661
+msgid "_Window"
+msgstr "ਵਿੰਡ�(_W)"
+
+#: ../shell/e-shell-window-actions.c:1690
+msgid "Show Side _Bar"
+msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
+
+#: ../shell/e-shell-window-actions.c:1692
+#, fuzzy
+#| msgid "Show Side _Bar"
+msgid "Show the side bar"
+msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
+
+#: ../shell/e-shell-window-actions.c:1698
+#, fuzzy
+#| msgid "Show Animations"
+msgid "Show _Buttons"
+msgstr "�ਨ�ਮ�ਸ਼ਨ ਵ���"
+
+#: ../shell/e-shell-window-actions.c:1700
+#, fuzzy
+#| msgid "Show the second time zone"
+msgid "Show the switcher buttons"
+msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
+
+#: ../shell/e-shell-window-actions.c:1708
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show the status bar"
+msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
+
+#: ../shell/e-shell-window-actions.c:1714
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show _Tool Bar"
+msgstr "��ਲਬਾਰ ਵ���(_T)"
+
+#: ../shell/e-shell-window-actions.c:1716
+#, fuzzy
+#| msgid "Show _Toolbar"
+msgid "Show the tool bar"
+msgstr "��ਲਬਾਰ ਵ���(_T)"
+
+#: ../shell/e-shell-window-actions.c:1738
+msgid "_Icons Only"
+msgstr "���ਾਨ ਹ�(_I)"
+
+#: ../shell/e-shell-window-actions.c:1740
+msgid "Display window buttons with icons only"
+msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਾਨ ਹ� ਵ��ਾ�"
+
+#: ../shell/e-shell-window-actions.c:1745
+msgid "_Text Only"
+msgstr "ਸਿਰ� ���ਸ�(_T)"
+
+#: ../shell/e-shell-window-actions.c:1747
+msgid "Display window buttons with text only"
+msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਸ� ਹ� ਵ��ਾ�"
+
+#: ../shell/e-shell-window-actions.c:1752
+msgid "Icons _and Text"
+msgstr "���ਾਨ �ਤ� ���ਸ�(_a)"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "Display window buttons with icons and text"
+msgstr "ਵਿੰਡ� ਬ�ਨਾ� ਨਾਲ ���ਾਨ �ਤ� ���ਸ� ਵ��ਾ�"
+
+#: ../shell/e-shell-window-actions.c:1759
+msgid "Tool_bar Style"
+msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ(_b)"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "ਵਿੰਡ� ਬ�ਨ ਡ�ਸ��ਾਪ ��ਲਬਾਰ ਸ��ਿੰ� ਨਾਲ ਵ��ਾ�"
+
+#: ../shell/e-shell-window-actions.c:1769
+msgid "Define Views..."
+msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
+
+#: ../shell/e-shell-window-actions.c:1771
+msgid "Create or edit views"
+msgstr "ਵਿ� ਬਣਾ� �ਾ� ਸ�ਧ"
+
+#: ../shell/e-shell-window-actions.c:1776
+msgid "Save Custom View..."
+msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�..."
+
+#: ../shell/e-shell-window-actions.c:1778
+msgid "Save current custom view"
+msgstr "ਮ���ਦਾ �ਸ�ਮਾ��਼ ਵਿ� ਸੰਭਾਲ�"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "C_urrent View"
+msgstr "ਮ���ਦਾ �ਲ�(_u)"
 
-#: ../shell/e-shell-window.c:778
+#: ../shell/e-shell-window-actions.c:1795
+msgid "Custom View"
+msgstr "�ਸ�ਮ �ਲ�"
+
+#: ../shell/e-shell-window-actions.c:1797
+msgid "Current view is a customized view"
+msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
+
+#: ../shell/e-shell-window-actions.c:1807
+#, fuzzy
+#| msgid "Set up the page settings for your current printer"
+msgid "Change the page settings for your current printer"
+msgstr "�ਪਣ� ਮ���ਦਾ ਪਰਿੰ�ਰ ਲ� ਸਫਾ ਸ��ਿੰ� ਵ��ਾ�"
+
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲ� ਤਬਦ�ਲ"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "�ਣ�ਾਣ ਸਿਸ�ਮ �ਲਤ� ਹ�।"
+#: ../shell/e-shell-window-actions.c:2337
+msgid "Execute these search parameters"
+msgstr ""
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:552
 #, c-format
-msgid "%ld KB"
-msgstr "%ld �ਿਬਾ"
+msgid "%s - Evolution"
+msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 
-#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "ਠ�� ਹ�"
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "ਨਵਾ�"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "�ਲਤ �ਰ��ਮਿੰ�"
+#: ../shell/e-shell-window.c:619
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "OAF ਤ� ਰ�ਿਸ�ਰ ਨਹ�� ਹ� ਸ�ਿ� ਹ�"
+#: ../shell/e-shell-window.c:620
+#, fuzzy
+#| msgid "Name of new view:"
+msgid "Name of the active shell view"
+msgstr "ਨਵ�� �ਲ� ਦਾ ਨਾ�:"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "ਸੰਰ�ਨਾ ਡਾ�ਾਬ�ਸ ਨਹ�� ਲੱਭਾ ਹ�"
+#: ../shell/e-shell-window.c:635
+msgid "The shell window's EFocusTracker"
+msgstr ""
 
-#: ../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/e-shell-window.c:649 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "��ਮ��ਰ�"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "ਨਵ�� �ਾ��"
+#: ../shell/e-shell-window.c:650 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr ""
 
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "�ਾ��(_T)"
+#: ../shell/e-shell-window.c:665
+#, fuzzy
+#| msgid "_Caret Mode"
+msgid "Safe Mode"
+msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "�ੱ� ਨਵ�� �ਾ�� ��ਾ� ਬਣਾ�"
+#: ../shell/e-shell-window.c:666
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the shell window is in safe mode"
+msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ਯਾਤ �ਰਨ ਲ� \"�ਯਾਤ\" ਤ� �ਲਿੱ� �ਰ�।"
+#: ../shell/e-shell-window.c:697
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Sidebar Visible"
+msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਯਾਤ�ਾਰ ਸਹਾ��"
+#: ../shell/e-shell-window.c:698
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's side bar is visible"
+msgstr "�� ਵਿੰਡ� ਬ�ਨ ਵ��ਾ� ਦ�ਣ।"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "�ਯਾਤ ਫਾ�ਲ"
+#: ../shell/e-shell-window.c:712
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Switcher Visible"
+msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "�ਯਾਤ �ਿਸਮ"
+#: ../shell/e-shell-window.c:713
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "�� ਵਿੰਡ� ਬ�ਨ ਵ��ਾ� ਦ�ਣ।"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "�ਯਾਤ�ਾਰ �ਿਸਮ"
+#: ../shell/e-shell-window.c:728
+#, fuzzy
+#| msgid "Statusbar is visible"
+msgid "Taskbar Visible"
+msgstr "ਹਾਲਤ-ਪੱ�� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "�ੰਪ�ਰ� �ਰਨ ਥ� �ਾਣ�ਾਰ� ��ਣ�"
+#: ../shell/e-shell-window.c:729
+#, fuzzy
+#| msgid "Whether the status bar should be visible."
+msgid "Whether the shell window's task bar is visible"
+msgstr "�� ਹਾਲਤ-ਪੱ�� ਵ��ਾ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
+#: ../shell/e-shell-window.c:744
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's tool bar is visible"
+msgstr "�� ਵਿੰਡ� ਬ�ਨ ਵ��ਾ� ਦ�ਣ।"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+#: ../shell/e-shell-window.c:758
+#, fuzzy
+#| msgid "Manager"
+msgid "UI Manager"
+msgstr "ਮ�ਨ��ਰ"
+
+#: ../shell/e-shell-window.c:759
+msgid "The shell window's GtkUIManager"
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ �ਯਾਤ�ਾਰ ਸਹਾ�� ਤ� �� ���� ਨ�ੰ ।\n"
-"�ਸ ਸਹਾ�� ਨਾਲ ਤ�ਸ� ਬਾਹਰ� ਫਾ�ਲਾ� �ਵ�ਲ�ਸ਼ਨ ਤ� �ਯਾਤ \n"
-"�ਰ ਸ�ਦ� ਹ�।"
+
+#: ../shell/e-shell.c:213
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go offline..."
+msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../shell/e-shell.c:267
+#, fuzzy
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing to go online..."
+msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../shell/e-shell.c:339
+msgid "Preparing to quit..."
+msgstr "ਬੰਦ �ਰਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
+
+#: ../shell/e-shell.c:788
+#, fuzzy
+#| msgid "Save directory"
+msgid "Module Directory"
+msgstr "ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:804
+#, fuzzy
+#| msgid "TLS not Available"
+msgid "Network Available"
+msgstr "TLS �ਪਲੱਬਧ ਨਹ� ਹ�"
+
+#: ../shell/e-shell.c:805
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the network is available"
+msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
+
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "�ਨਲਾ�ਨ"
+
+#: ../shell/e-shell.c:821
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the shell is online"
+msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19777,7 +20617,7 @@ msgstr ""
 "ਸਾਨ�ੰ �ਮ�ਦ ਹ� ਮਿੱਤਰ ਤ�ੰ ਸਾਡ� ਮ�ਹਨਤ ਦਾ �ਨੰਦ ਮਾਣ��ਾ �ਤ� �ਸ�� ਤ�ਰ� �ਸ ਸਹਿਯ�� ਦਾ\n"
 "ਤਹਿ ਦਿਲ�� ਧੰਨਵਾਦ �ਰਦ� ਹਾ�\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19785,43 +20625,59 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "�ਵ�ਲ�ਸ਼ਨ ��ਮ\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਦੱਸ�"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:320
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:327
+#, fuzzy
+#| msgid "Forcibly shut down all Evolution components"
+msgid "Forcibly shut down Evolution"
 msgstr "ਸਭ �ਵ�ਲ�ਸ਼ਨ ਭਾ� ਮ�ਬ�ਰ �ਰ�� ਬੰਦ �ਰ�"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ੧.੪ ਤ�� ਮ�ਬ�ਰ �ਰ�� ਵਾਪਿਸ"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:334
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰ� ਭਾ�ਾ� ਦ� ਡ�ਬੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਵਿੱ� ਭ���।"
 
-#: ../shell/main.c:503
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
 msgstr "��� ਪਲੱ�-�ਨ ਲ�ਡ ਤ�� ਰ�� ਹ�।"
 
-#: ../shell/main.c:505
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�ਨ �ਯ�� �ਰ�।"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:342
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:344
+#, fuzzy
+#| msgid "Restarting Evolution"
+msgid "Request a running Evolution process to quit"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ��ਤ� �ਾ ਰਹ� ਹ�"
+
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �ਵ�ਲ�ਸ਼ਨ PIM �ਤ� �-ਮ�ਲ �ਲਾ��"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19835,22 +20691,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਯਾਦ ਰੱ�� ਹ�� ਪਾਸਵਰਡ ਭ�ੱਲਣ ਲ� ਤਿ�ਰ ਹ�?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ਨਹ�� ਹ� ਸ�ਦ�"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "�ਾਰ�"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "ਵਰ�ਨ {0} ਦਾ ਪ�ਰਾਣਾ ਡਾ�ਾ ਹ�ਾ�?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ਰ� ਨਹ�� ਹ� ਸ�ਦ� ਹ�।"
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -19859,16 +20707,16 @@ msgstr ""
 "ਮ�� ਪ�ੱ�ਿ� �ਾਵ��ਾ।"
 
 #  shell:upgrade-nospace primary
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "�ੱਪ�ਰ�ਡ ਲ� ਲ���ਦ� ਡਿਸ� ਥਾ� ਨਹ�� ਹ�।"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "�� ਪ�ਰਾਣਾ ਡਾ�ਾ ਹ�ਾ�ਣਾ ਹ�?"
 
 #  shell:upgrade-remove-1-4-confirm secondary
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19888,7 +20736,7 @@ msgstr ""
 "�ੱ� ਵਾਰ ਹ�ਾ�ਣ ਬਾ�ਦ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਦ� ਪ�ਰਾਣ� ਵਰ�ਨ ਨ�ੰ ਵਾਪਿਸ ਨਹ�� ਲਿ� ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� ਤ�ਸ�� ��ਦ "
 "ਨਾ ਵਰਤ��।\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -19903,11 +20751,13 @@ msgstr ""
 "ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ। ���ਰ ਤ�ਸ�� �ਸ ਡਾ�ਾ ਨ�ੰ ਰੱ�ਣ ਲ� ��ਣਿ�, ਤਾ� ਤ�ਸ�� �ਪਣ� �ਿੰਮ�ਵਾਰ� �ੱਤ� &quot;"
 "evolution&quot;ਦ� ਭਾ� ਹ�ਾ ਸ�ਦ� ਹ�।\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+#| msgid "Upgrade from previous version failed: {0}"
+msgid "Upgrade from previous version failed:"
 msgstr "ਪ�ਰਾਣ� ਵਰ�ਨ �ੱਤ� �ੱਪ�ਰ�ਡ �ਸਫਲ: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -19920,45 +20770,27 @@ msgstr ""
 "\n"
 "ਤ�ਹਾਨ�ੰ �ਾਰ� ਰੱ�ਣ ਲ� �ਪਣ� �ਰ ਡਾ�ਰ���ਰ� ਵਿੱ� ਹ�ਰ ਥਾ� ਬਣਾ�ਣ ਦ� ਲ�� ਹ�।"
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"ਤ�ਹਾਡ� ਸਿਸ�ਮ ਦ� ਸੰਰ�ਨਾ �ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹ�:\n"
-"\n"
-"ਵ�ਰਵ� ਲ� ਮੱਦਦ ਵ���।"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"ਤ�ਹਾਡ� ਸਿਸ�ਮ ਦ� ਸੰਰ�ਨਾ �ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹ�:\n"
-"\n"
-"{0}\n"
-"\n"
-"ਵ�ਰਵ� ਲ� ਮੱਦਦ ਵ���।"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "ਭ�ੱਲ�(_F)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "ਡਾ�ਾ ਰੱ��(_K)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "ਮ�ਨ�ੰ ਬਾ�ਦ ਵਿੱ� ਯਾਦ �ਰਵਾ�(_R)"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
+#| msgid ""
+#| "{1}\n"
+#| "\n"
+#| "If you choose to continue, you may not have access to some of your old "
+#| "data.\n"
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -19967,7 +20799,104 @@ msgstr ""
 "\n"
 "���ਰ ਤ�ਸ�� �ਾਰ� ਰਹ� ਤਾ� ਤ�ਸ�� �ਪਣ� ਪ�ਰਾਣ� ਡਾ�ਾ ਨ�ੰ ��ਲ ਨਹ�� ਸ����।\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+#| msgctxt "New"
+#| msgid "_Test"
+msgctxt "New"
+msgid "_Test Item"
+msgstr "�ਾ��(_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "�ੱ� ਨਵ�� �ਾ�� ��ਾ� ਬਣਾ�"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+#| msgid "Resource"
+msgctxt "New"
+msgid "Test _Source"
+msgstr "ਸਰ�ਤ"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+#| msgid "Create a new test item"
+msgid "Create a new test source"
+msgstr "�ੱ� ਨਵ�� �ਾ�� ��ਾ� ਬਣਾ�"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "ਬ�ਪ�ਾਣ ਡ�ਸ��ਾਪ ਫਾ�ਲ ਵਰ�ਨ '%s'"
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+#| msgid "Scanning %s"
+msgid "Starting %s"
+msgstr "%s ਸ਼�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ਬ�ਪ�ਾਣ ਲਾ�� ��ਣ: %d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+#| msgid "Editor not launchable"
+msgid "Not a launchable item"
+msgstr "�ੱਲਣਯ�� ���ਮ ਨਹ�� ਹ�"
+
+#: ../smclient/eggsmclient.c:227
+#, fuzzy
+#| msgid "_Direct connection to the Internet"
+msgid "Disable connection to session manager"
+msgstr "�ੰ�ਰਨ�ੱ� ਲ� ਸਿੱਧਾ ��ਨ��ਸ਼ਨ(_D)"
+
+#: ../smclient/eggsmclient.c:230
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Specify file containing saved configuration"
+msgstr "ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ���ੱਪ"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr "ਫਾ�ਲ"
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ID  ਦਿ�"
+
+#: ../smclient/eggsmclient.c:233
+#| msgid "UID"
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ��ਣਾ�:"
+
+#: ../smclient/eggsmclient.c:255
+#, fuzzy
+#| msgid "Show image animations"
+msgid "Show session management options"
+msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19978,7 +20907,7 @@ msgstr ""
 "\n"
 "ਵਿਸ਼ਵਾਸ ਸ��ਿੰ� ਵਿੱ� ਸ�ਧ:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19987,7 +20916,7 @@ msgstr ""
 "�ਿ��ਿ ਤ�ਸ�� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ ਤ� ਭਰ�ਸਾ� �ਰਦ� ਹ�, ਸ� ਤ�ਸ� �ਸ ਸਰ��ਫਿ��� ਤ� ਭਰ�ਸਾ �ਰ ਸ�ਦ� "
 "ਹ�, �ਦ�� ਤੱ� �ਿ ਦਿ�ਾ�� ਨਾ �ਿ� ਹ�ਵ�"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19996,55 +20925,59 @@ msgstr ""
 "�ਿ��ਿ ਤ�ਸ�� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ ਤ� ਭਰ�ਸਾ ਨਹ�� �ਰਦ�, ਸ� ਤ�ਸ� �ਸ ਸਰ��ਫਿ��� ਤ� ਭਰ�ਸਾ ਨਹ�� �ਰ "
 "ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� �ਿ ਦਿ�ਾ�� ਨਾ �ਿ� ਹ�ਵ�"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਸਰ��ਫਿ��� ��ਣ�..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "ਸਭ PKCS12 ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "ਸਭ ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "ਸਰ��ਫਿ��� ਨਾ�"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "ਮ�ਸਦ"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "�ਰਮ �ੰ�"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "ਮਿ�ਦ"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "ਸਭ �ਮ�ਲ ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "ਸਰ��ਫਿ���"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ਸਰ��ਫਿ��� ਦਰਸ਼�: %s"
@@ -20065,7 +20998,7 @@ msgstr "ਨਵਾ� ਪਾਸਵਰਡ ਭਰ�"
 
 #  FIXME: add serial no, validity date, uses
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20074,7 +21007,7 @@ msgstr ""
 "�ਸ ਨ�ੰ �ਾਰ� ��ਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20083,59 +21016,27 @@ msgstr ""
 "�ਸ ਨ� �ਾਰ� ��ਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "ਸਰ��ਫਿ��� ��ਣ�"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ਸਰ��ਫਿ��� ਦਾ ਹਿੱਸਾ ਨਹ��>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>ਸਰ��ਫਿ��� ��ਤਰ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>ਸਰ��ਫਿ��� ਲ��</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>��ਤਰ ਮ�ੱਲ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>ਨਿਸ਼ਾਨ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>�ਸ ਨ� �ਾਰ� ��ਤਾ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>�ਸ ਨ�ੰ �ਾਰ� ��ਤਾ</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>�ਸ ਸਰ��ਫਿ��� ਨ�ੰ �ਹਨਾ� ਨ�  ਪ�ਰਮਾਣਿਤ ��ਤਾ ਹ�:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>�ਾ��</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "ਪ�ਰਮਾਣ�ਤਾ"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "ਬ���ਪ"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "ਸਭ ਦਾ ਬ���ੱਪ"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20143,1614 +21044,355 @@ msgstr ""
 "�ਿਸ� �ੰਮ ਲ� �ਸ CA ਤ� ਭਰ�ਸਾ �ਰਨ ਤ�� ਪਹਿਲਾ� ਤ�ਹਾਨ�ੰ �ਸ ਦਾ ਸਰ��ਫਿ��� ਵ�� ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਤ� �ਸ "
 "ਦ��� ਪਾਲਸ��� ਤ� ਹਦਾ�ਤਾ� �ਾ�� ਲਵ�।"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ �ਾ��"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+#| msgid "<b>Certificate Fields</b>"
+msgid "Certificate Fields"
+msgstr "<b>ਸਰ��ਫਿ��� ��ਤਰ</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
+#| msgid "<b>Certificate Hierarchy</b>"
+msgid "Certificate Hierarchy"
+msgstr "<b>ਸਰ��ਫਿ��� ਲ��</b>"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "ਸਰ��ਫਿ��� ਵ�ਰਵਾ"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "ਸਰ��ਫਿ��� ��ਬਲ"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "�ਮ ਨਾ� (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "ਸੰਪਰ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਦ� ਪਰ�ਮਾਣ�ਿਤਾ ਤ� ਭਰ�ਸਾ ਨਾ �ਰ�"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "ਸਿਰ� ਫਰ�� ਵਿੰਡ� ਹ�"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "ਸ�ਧ"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "�-ਮ�ਲ ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ ਸ��ਿੰ�"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "�-ਮ�ਲ ਦਸਤ�ਤ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "ਮਿ�ਦ"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+#, fuzzy
+#| msgid "Field Name"
+msgid "Field Value"
+msgstr "��ਤਰ ਨਾ�"
+
+#: ../smime/gui/smime-ui.ui.h:22
+#, fuzzy
+#| msgid "MD5 Fingerprint"
+msgid "Fingerprints"
+msgstr "MD੫ ਨਿਸ਼ਾਨ"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "�ਯਾਤ"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+#, fuzzy
+#| msgid "Issued On"
+msgid "Issued By"
+msgstr "�ਾਰ� �ਰਨ ਦ� ਮਿਤ�"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "�ਾਰ� �ਰਨ ਦ� ਮਿਤ�"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+#, fuzzy
+#| msgid "Issued On"
+msgid "Issued To"
+msgstr "�ਾਰ� �ਰਨ ਦ� ਮਿਤ�"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD੫ ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "_ਸੰਸਥਾ"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "ਸੰ�ਠਨ ��ਾ� (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL �ਲਾ�� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+#, fuzzy
+#| msgid "<b>This certificate has been verified for the following uses:</b>"
+msgid "This certificate has been verified for the following uses:"
+msgstr "<b>�ਸ ਸਰ��ਫਿ��� ਨ�ੰ �ਹਨਾ� ਨ�  ਪ�ਰਮਾਣਿਤ ��ਤਾ ਹ�:</b>"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਤ� ਭਰ�ਸਾ"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "�ਸ CA ਤ� �-ਮ�ਲ ਯ��਼ਰਵਾ� ਦ� ਪ�ਾਣ ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "�ਸ CA ਤ� ਸਾਫ�ਵ��ਰ ਵਿ�ਾਸਵਾਦ��� ਦ� ਪ�ਾਣ ਲ� ਭਰ�ਸਾ �ਰ�।"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "�ਸ CA ਤ� ਵ�ੱਬ ਸਾ��ਾ� ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+#, fuzzy
+#| msgid "<b>Validity</b>"
+msgid "Validity"
+msgstr "<b>�ਾ��</b>"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "ਵ���"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਸੰਸਥਾਵਾ� ਦ� ਹਨ �� ਤ�ਹਾਨ�ੰ ਪ�ਾਣਦ��� ਹਨ:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਰਤਾ ਪ�ਾਣ �ਰਦ� ਹਨ:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਲ��ਾ� ਦ� ਪ�ਾਣ �ਰਦ� ਹਨ:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "ਤ�ਹਾਡਾ ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "CA ਭਰ�ਸਾ ਸ�ਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "ਸਰ��ਫਿ��� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "�ੰ��ਰਿਪ�"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "ਵਰ�ਨ"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "ਵਰ�ਨ 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "ਵਰ�ਨ 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "ਵਰ�ਨ ੩"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD੫ RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ���ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "ਸਰ��ਫਿ��� ��ੰ�� ਵਰਤ��"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "ਨ�ੱ�ਸ��ਪ ਸਰ��ਫਿ��� �ਿਸਮ"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ �� ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "��ਾ� ਪ�ਾਣ�ਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਰਾਮ��ਰ"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵ�ਨ� �� �ਾਣ�ਾਰ�"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼� ਦਾ ਸਰਵ�ਨ� �� �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼� ਦ� ਸਰਵ�ਨ� ��"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "�ਲਤ�: �ਾਰ� ਵਾਧ� ਲ� �ਸਫਲ"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "�ਬ���� ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "�-ਮ�ਲ ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "ਨਾ-�ਨ�ਾਰ"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "�� �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "ਡਾ�ਾ �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "��ੰ�� ��ਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "ਨਾ�਼��"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "�ਾਤ� ਨਹ��"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "�ਾਰ� �ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "�ਾਰ� �ਰਤਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਮ�ੱਲ"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ਫਾ�ਲ ਪਾਸਵਰਡ"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ਫਾ�ਲ ਲ� ਪਾਸਵਰਡ:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "ਸਰ��ਫਿ��� ਲਿ��"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "'%s' ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "%s (%s) ਨ�ੰ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ (_B)"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਤਬਦ�ਲ"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "ਸਭ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� �ਾਪ� (_p)..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "ਸੰਪਰ� �ਲ�(_P)"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "ਨ�ਲ"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "��ਣ� ਸ�ੰਪਰ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਭਾ�ਾ� ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "��ਣ� ਦ� ਨ�ਲ"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "ਨਵਾ� �ਡਰ�ੱਸ ਬ�ੱ� ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "�ੱ��"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "��ਣ� �ੱ��"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਹ�ਾ�(_e)"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "��ਣਿ� ਫ�ਲਡਰ ਹ�ਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "ਸੰਪਰ� �ੱ��"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "ਸਭ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ���(_v)..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "ਫ�ਲਡਰ ਭ���..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "�ਿਪ�ਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "�ਲਿੱਪਬ�ਰਡ �ਿਪ�ਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "ਪਰਿੰ� �ਾਣ ਵਾਲ� ਸੰਪਰ�ਾ� ਦ� �ਲ�"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "��ਣ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� VC_ard ਵਾ�� ਸੰਭਾਲ�"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "VCard �ੰ� ਸੰਭਾਲ�..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ VCard ਵਾ�� ਸੰਭਾਲ�"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "ਸਭ ��ਣ�"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "ਸਭ ��ਣ�(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "ਸਭ ਸੰਪਰ� ��ਣ�"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਵਿ��ਤ� ਨ�ੰ ਭ���"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ��ਾ�"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "ਰ���(_o)"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "ਰ���"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "ਲ�ਡ �ਰਨ ਨ�ੰ ਰ���"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "ਮ���ਦਾ ਸੰਪਰ� ਵ���"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "�ਾਰਵਾ�(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "ਸੰਪਰ�ਾ� ਦ� �ੱਥ� ਨ�ਲ(_C)..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "ਫ�ਲਡਰ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� ਨ�ਲ(_C)"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "ਸੰਪਰ� ਹ�ਾ�(_D)"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "ਸੰਪਰ� ਨ�ੰ �ੱ�� ਭ���(_F)..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "ਸੰਪਰ� �ੱਥ� ਭ���(_M)..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "ਫ�ਲਡਰ ਸੰਪਰ� �ੱਥ� ਭ���(_M)"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "ਨਵਾ�(_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "ਨਾ� ਬਦਲ�(_R)"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "ਸੰਪਰ� ਨ�ੰ VCard ਵਾ�� ਸੰਭਾਲ�(_S)..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "ਫ�ਲਡਰ ਸੰਪਰ� ਨ�ੰ VCard ਰਾਹ�� ਵਾ�� ਸੰਭਾਲ� (_S)"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "ਦਿਨ"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�(_A)"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਹ�ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "�ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "ਪਿੱ�� �ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "�ੱ�� �ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "ਸ���"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "ਮਹ�ਨਾ"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "�ੱ��"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "ਪਰਿੰ� �ਰਨ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "ਪਿੱ��"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "�ਹ ��ਲੰਡਰ ਪਰਿੰ� �ਰ�"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "ਨਿ���(_e)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "ਪ�ਰਾਣ� ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�ਾ� ਵਿੱ� ਸ�ਧ"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "ਮਿਤ� ��ਣ�(_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "�ੱ� ��ਣ�(_T)"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "�ਾਸ ਮਿਤ� ��ਣ�"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "�ੱ� ��ਣ�"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "ਸ��� ਦ� ਤਰਾ� ਵ���"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "�ੱ� ਦਿਨ ਵ��ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "�ੱ� ਮਹ�ਨਾ ਵ��ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "�ੱ� ਹ�ਤਾ ਵ��ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "�ਾਰ��ਾਰ� ਹਫਤਾ ਵ��ਾ�"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "ਮ���ਦਾ ਮ�ਲਾ�ਾਤ ਦ���"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "ਲਾ� ਸ�ਨ�ਹਿ�� ਲ� ਡ�ਬੱ� �ਨਸ��ਲ ਵ���"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "ਹਫਤਾ"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "�ੰਮ ਹਫਤਾ"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "ਡ�ਬੱ� ਲਾ�(_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ��ਲ�ਹ�(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "ਨਵ�� ਮ�ਲ ਨ�ੰ ਫਿਲ�ਰ �ਰਨ ਲ� ਨਿਯਮ ਬਣਾ� �ਾ� ਸ�ਧ�"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "�ਫਲਾ�ਨ ਲ� ਮਾਰ� ��ਤ� ��ਾ���/ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "ਰੱਦ� �ਾਲ�(_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "ਫ�ਲਡਰ(_o)"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ��� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "ਫ�ਲਡਰ ���(_o)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�(_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਲ� ਨਾਲ-ਨਾਲ ਹ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "��ਸਾਲ� �ਲ�(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ(_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "ਨਵਾ�(_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "�ਲ�(_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "ਮ��ਬਰ�(_S)..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "�ਸ ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲ�"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "�ਸ ਫ�ਲਡਰ ਦ��� ਵਿਸ਼�ਸਤਾਵਾ� ਬਦਲ�"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "ਸਭ ਥਰਿੱਡ ਸਮ���(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਸਮ���"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "ਸਭ ਥਰਿੱਡ ਫ�ਲਾ�(_x)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "ਮਿ�ਾ�(_x)"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਫ�ਲਾ�"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਹਲ�(_e)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� �ਹਲ�(_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "ਪ�� ਸ�ਨ�ਹ� �ਹਲ�(_R)"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਰ��ਾ ਵ��ਾ�ਣ ਦ� ਬ�ਾ� �ਹਲ� �ਰ�"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�(_K)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਿਪ�ਾ�"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� �ਸ ਫ�ਲਡਰ ਵਿੱ��� ਹ�ਾ ਦਿ�"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "�ਹ ਫ�ਲਡਰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ �ਰ�"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "ਸ�ਨ�ਹਾ ਸਬ-ਥਰਿੱਡ ��ਣ�(_u)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਵ��ਾ�(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "ਸਭ ਸ�ਨ�ਹ� ��ਣ�(_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "ਸਭ ਤ� ਸਿਰ� �ਹ� ਸ�ਨ�ਹ� ��ਣ� �� �ਿ ਮ���ਦਾ ਸਮ�� ਨਹ�� ��ਣ�"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "�ੱ�� ਮਸਲ� ਦ� ਸਾਰ� ਸ�ਨ�ਹ� ��ਣ� ਸ�ਨ�ਹ� ਬਣਾ�"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "ਮ���ਦਾ ਸ�ਨ�ਹ� ਲ� ਸਭ �ਵਾਬ ��ਣ�"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "ਲ��ਵ�� ਸ�ਨ�ਹ� ਵ��ਾ�(_N)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "�ਰ�� ਤ�ਰ ਤ� �ਹਲ� ਸ�ਨ�ਹ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ਸਾਰ� ਪ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
-
-#: ../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)"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�(_d)"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "ਫਿਲ�ਰ ਲ�ਾ�(_p)"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ(_H)"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ� ਫਿਲ�ਰ ਨਿਯਮ ਲਾ�� �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "�ੰ� ਲ� �ਾ��(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ��(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਭ��ਣ ਵਾਲ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "ਨਿਯਮ ਬਣਾ�(_u)"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "�ਹਨਾ� ਸ�ਨ�ਹ��� ਤ�� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "�ਸ ਮ�ਲਿੰ� ਸ��� ਤ�� �ੱ� ��� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "�ਸ ਭ��ਣ ਵਾਲ� ਤ�� �ੱ� ��� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "�ਸ ਵਿਸ਼� ਲ� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "�ਹਨਾ� ਭ��ਣ�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "�ਹਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "ਮ�ਲਿੰ� ਸ��� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "�ਸ ਵਿਸ਼� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "���ਸ� ��ਾਰ ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "��ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "��ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਮਸਲਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "��ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "ਪਿ�ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "ਪਿ�ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "�ੱ�� ਭ��� �ਸ ਵਾ��(_O)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� ਫਿਲ�ਰ(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "ਸ�ਨ�ਹ��� ਤ� ਫਿਲ�ਰ(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "ਵਿਸ਼� ਤ� ਫਿਲ�ਰ(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਬ��ਾਰ ਸਥਿਤ� ਲ� �ਾ���"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "ਧਿ�ਨ ਰੱ�ਣ ਲ� ��ਣ� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "�ੱ�� ��ਲ�ਹ�(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "HTML ਪੱਤਰ ਵਿੱ� ਸ�ਨ�ਹ� ਲ�ਡ �ਰਨ ਲ� ਮ�ਬ�ਰ �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� ਸ�ਨ�ਹ� ਵਾ�� �ਰ�� �ੱ�� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਹਵਾਲਾ �ੱ� �ਵਾਬ ਦ� ਤਰਾ� �ਰ�� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ੱ�� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨੱਥ� �ਰ�� �ੱ�� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "���ਸ� ��ਾਰ ਵਧਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਪ�� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਾਸ ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ੰ� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ੰ�-ਨਹ�� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਪ��ਹ� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "��ਣ� ਸ�ਨਹ� ਨਾ-�਼ਰ�ਰ� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "ਨਵਾ� �ਾਸ ਸ�ਨ�ਹਾ(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "�ੱ�� ਮਸਲਾ(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "ਰੱਦ� ਨਹ��"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� ��ਲ�ਹ�"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਸ�ਧ ਲ� ਰ��ਤਾ (�ੰਪ��਼ਰ) ਵਿੱ� ��ਲ�"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "ਪਿੱ�� ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ(_r)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ��� ��ਪ�"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "ਵਾਪਸ(_d)"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ���ਸ� ਫਾ�ਲ਼ ਦ� ਤ�ਰ �ੱਤ� ਸੰਭਾਲ�"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "ਮ�ਲਿੰ� ਸ��� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
-
-#: ../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:87
-msgid "Select _All Text"
-msgstr "ਸਭ ���ਸ� ��ਣ�(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "�ੱ� ਸ�ਨ�ਹ� ਵਿੱ� ਸਭ ���ਸ� ��ਣ�"
-
-#: ../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:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "ਨਾ-�ਾਸ(_m)"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "�਼�ਮ ਬਾਹਰ(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "ਨੱਥ�(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "�ਾ�(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "�ਾਸ(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "�ੰ�(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "�ਮ ��ਾਰ(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "�ੰ� ਨਹ��(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
-
-#: ../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:122
-msgid "_Read"
-msgstr "ਪ��ਹਨ(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "ਨਾ-ਪ�ਿ�(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "�਼�ਮ(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "�਼�ਮ �ੰਦਰ(_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "ਬੰਦ �ਰ�"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "ਮ�ੱ� ��ਲਬਾਰ"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "��ਣ� ਮ�ਮ� ਦ� ਨ�ਲ"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "��ਣ� ਮ�ਮ� �ੱ��"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਮ�ਮ� ��ਪ�"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਮ�ਮ� ਦ� ਸ��� ਦ� �ਲ�"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "ਮ�ਮ� ਦ� ਸ��� ਪਰਿੰ� �ਰ�"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "��ਣ� ਮ�ਮ� ਵ���"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "ਮ�ਮ� ��ਲ�ਹ�(_O)"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "��ਣ� �ੰਮਾ� ਦ� ਨ�ਲ"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "��ਣ� �ੰਮ �ੱ��"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "ਸਮਾਪਤ �ੰਮ ਹ�ਾ�"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "��ਣ� �ੰਮ� ਹ�ਾ�"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "ਸਮਾਪਤ ਲਿ��(_k)"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "�ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਾਰ� ��ਪ�"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਰ� ਸ��� ਦ� �ਲ�"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "�ੰਮ ਸ��� ਪਰਿੰ� �ਰ�"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "�ੰਮ �ਲ� ਵਿੰਡ� ਵ��ਾ�"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "�ੰਮ �ਲ�(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "��ਣ� �ਾਰ� ਵ���"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "�ੰਮ ��ਲ�ਹ�(_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ�..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਤਬਦ�ਲ"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "��ਲਬਾਰ ਦ� �ਲ� ਤਬਦ�ਲ"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "�ਸ ਫ�ਲਡਰ ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਨਵ�� ਵਿੰਡ� ਬਣਾ�"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "ਵਿੰਡ� ਬ�ਨ ਡ�ਸ��ਾਪ ��ਲਬਾਰ ਸ��ਿੰ� ਨਾਲ ਵ��ਾ�"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "ਵਿੰਡ� ਬ�ਨਾ� ਨਾਲ ���ਾਨ �ਤ� ���ਸ� ਵ��ਾ�"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਾਨ ਹ� ਵ��ਾ�"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਸ� ਹ� ਵ��ਾ�"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ-�ਵਾਬ(_F)"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "ਪਰ��ਰਾਮ ਬੰਦ �ਰ�"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "ਯਾਦ ��ਤ� ਪਾਸਵਰਡ ਭ�ੱਲ ��, �ਸ�ਰ�� ਮ�� ਮੰ�� �ਾਣ��"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "ਵਿੰਡ� ਬ�ਨ �ਹਲ�"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "�ੰਪ�ਰ� �ਰ�(_m)..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "���ਾਨ �ਤ� ���ਸ�(_a)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "ਹ�ਰ �ਾਰ�ਾ� ਤ�� ਡਾ�ਾ �ੰਪ�ਰ� �ਰ�"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "ਲ����(_o)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲਾ� ਲ� ਵ�ੱਬ-ਪ��਼ ��ਲ�ਹ�"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "ਸਫ਼ਾ ਸ�ੱ��ੱਪ(_u)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "ਮ�ਰ� ਪਸੰਦ(_n)"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "ਭ��� / ਲਵ�"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "ਭ��� / ਲਵ�(_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ���ੱਪ"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "��ਲਬਾਰ ਵ���(_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ� �ਾਣ�ਾਰ� ਵ���"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�(_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "ਬੱ� ਬੱਡ� ਵਰਤ �� ਬੱ� �ਾਣ�ਾਰ� ਭ���"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰ ਰਹ� ਹਾ�, ਨ�ੰ ਬਦਲ�"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ(_b)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "ਹਾਲਤ ਪੱ�� ਵ��ਾ�/�ਹਲ�"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "ਹਾਲਤ ਪੱ�� ਵ��ਾ�/�ਹਲ�"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "�ਫ-ਲਾ�ਨ �ਾ�(_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "�ਸ ਬਾਰ�(_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "ਵਿੰਡ� ਬੰਦ �ਰ�(_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�(_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲ(_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "ਬ�ਨ �ਹਲ�(_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "���ਾਨ ਹ�(_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "ਬਾਹਰ(_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "ਸਵਿੱ�ਰ ਦਿੱ�(_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "ਸਿ�ਰ�ਨਾ��਼ ��ਣ(_S)..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "ਸਿਰ� ���ਸ�(_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "ਵਿੰਡ�(_W)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "�ੰਪਨ� ਨਾਲ(_C)"
@@ -21824,31 +21466,29 @@ 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: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
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>ਸਮਾ� ��ਤਰ</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>��ਣ(_S)</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#, fuzzy
+#| msgid "Time _Zone"
+msgid "Time Zones"
+msgstr "ਸਮਾ� ��ਤਰ(_Z)"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "ਸਮਾ�-��ਤਰ ਲ��ਦ� �ੰਬ� ਬਾ�ਸ"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21857,30 +21497,34 @@ msgstr ""
 "ਮਾ�ਸ ਦਾ �ੱਬਾ ਬ�ਨ ��ਤਰ ਦਾ ��ਾਰ ਵੱਡਾ �ਰਨ ਲ� ਵਰਤ�� �ਤ� ਸਮਾ� ��ਤਰ ��ਣ�।\n"
 "ਮਾ�ਸ ਦਾ ਸੱ�ਾ ਬ�ਨ ��ਤਰ ��ਾ�ਣ ਦ� �ੰਮ �ਵ��ਾ।"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#, fuzzy
+#| msgid "Selection Mode"
+msgid "_Selection"
+msgstr "��ਣ ਢੰ�"
+
 #: ../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:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ਲ� �ਲ� ਪਰਿਭਾਸ਼ਾ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "�ਲ� ਪਰਿਭਾਸ਼ਾ"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" ਲ� �ਲ� ਪਰਿਭਾਸ਼ਿਤ"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "��ਬਲ"
 
@@ -21888,229 +21532,228 @@ msgstr "��ਬਲ"
 msgid "Instance"
 msgstr "ਮ��ਾ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "ਮ���ਦਾ �ਲ� ਸੰਭਾਲ�"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "ਨਵਾ� �ਲ� ਬਣਾ�(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "ਮ���ਦਾ �ਲ� ਤਬਦ�ਲ(_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "�ਸ�ਮ �ਲ�"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "ਮ���ਦਾ �ਲ�(_u)"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "�ਲ� ��ਣ�: %s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "ਮ���ਦਾ �ਸ�ਮਾ��਼ ਵਿ� ਸੰਭਾਲ�"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "ਵਿ� ਬਣਾ� �ਾ� ਸ�ਧ"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "ਫ���ਰ�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "ਨਵ�� �ਲ� ਬਣਾ�"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "ਨਵ�� �ਲ� ਦਾ ਨਾ�:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "�ਲ� ਦ� �ਿਸਮ"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 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-account-manager.c:348
+msgid "De_fault"
+msgstr "ਮ�ਲ(_f)"
 
-#: ../widgets/misc/e-attachment.c:2193, c-format
-#| msgid "Could not open the link."
-msgid "Could not open the attachment"
-msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+#| msgid "Account name"
+msgid "Account Name"
+msgstr "��ਾ��� ਨਾ�"
 
-#: ../widgets/misc/e-attachment.c:2635
-#| msgid "Attachment Reminder"
-msgid "Attachment contents not loaded"
-msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+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-action-combo-box.c:388
+#, fuzzy
+#| msgid "_Actions"
+msgid "Action"
+msgstr "�ਾਰਵਾ�(_A)"
 
-#: ../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-action-combo-box.c:389
+msgid "A GtkRadioAction"
+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-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� �ਲ� ਲ� ਸ��ਾ�(_S)"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
-#| msgid "Set as _Background"
 msgid "Could not set as background"
 msgstr "ਬ���ਰਾ��ਡ ਸ�ੱ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�(_B)"
+
 #: ../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)"
+msgid "Hide Attachment _Bar"
+msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
+
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "����ਮ��� ਪੱ�� ਵ���(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "����(_t)"
 
-#: ../widgets/misc/e-attachment-store.c:607
-#| msgid "Save attachments"
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "����ਮ��� ਸੰਭਾਲ�"
 msgstr[1] "����ਮ���ਾ� ਸੰਭਾਲ�"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
 
 #: ../widgets/misc/e-attachment-view.c:326
-#| msgid "_Add attachment..."
 msgid "A_dd Attachment..."
 msgstr "����ਮ��� ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:643, c-format
-#| msgid "Open in %s..."
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "�ਹਲ�(_H)"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "ਲਾ�ਨ '� ਵ���(_V)"
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ਨਾਲ ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-attachment-view.c:646, c-format
-#| msgid "Save attachment as"
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
 msgid "Open this attachment in %s"
 msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
 
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
+msgid "Attached message"
+msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ�।"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2197
+#, c-format
+msgid "Could not open '%s'"
+msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2200
+#, c-format
+msgid "Could not open the attachment"
+msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
+
+#: ../widgets/misc/e-attachment.c:2711
+#, c-format
+msgid "Could not save '%s'"
+msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2714
+#, c-format
+msgid "Could not save the attachment"
+msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+#, fuzzy
+#| msgid "Click to open %s"
+msgid "Ctrl-click to open a link"
+msgstr "%s ��ਲਣ ਲ� �ਲਿੱ� �ਰ�"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22118,58 +21761,58 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "ਮਹ�ਨਾ ��ਲੰਡਰ"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 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:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 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:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "ਸ�ਿਪਲ ਭਰ�"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "ਨਿ�ਨਤਮ ���ਾ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "ਨਿ�ਨਤਮ ���ਾ�"
 
@@ -22177,198 +21820,176 @@ msgstr "ਨਿ�ਨਤਮ ���ਾ�"
 msgid "Spacing"
 msgstr "�ਾਲ� ਥਾ�"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "ਹ�ਣ"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "ਸਮ�� ਦਾ ਫਾਰਮ�� �ੰ� ਦਾ ਹ�ਣਾ ਲਾ�ਮ� ਹ�: %s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "ਪ�ਰਤ�ਸ਼ਤ �ਾਸ ਤ�ਰ ਤ� ੦ ਤ� ੧੦੦ ਦ� ਦਰਮਿ�ਨ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "�ਰਬ�"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "ਬਾਲ�ਿ�"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "���ਦਰ� ਯ�ਰਪ�"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "��ਨ"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "ਸਰ�ਲਿ�"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "�ਰ��"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "ਹ�ਬਰਿ�"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "�ਾਪਾਨ�"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "��ਰ��"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "ਥਾ�"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "ਤ�ਰ�ਿਸ਼"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "ਯ�ਨ���ਡ"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "ਪੱ�ਮ� ਯ�ਰਪ"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-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 "ਪ�ਰਾਤਨ"
-
-#: ../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
-msgid "Simplified"
-msgstr "ਸਧਾਰਨ"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ਯ��ਰ�ਨ"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "ਦਿੱ�"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "�ਣ�ਾਣ �ੱ�ਰ ਸ�ੱ�: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲ� �ੱ�ਰ ਦਿ�"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "ਹ�ਰ..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "ਮਿਤ� �ਤ� ਸਮਾ�"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "ਮਿਤ� ਦ�ਣ ਲ� ���ਸ� �ੰਦਰਾ�"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "��ਲੰਡਰ ਵ��ਾ�ਣ ਲ� �ਹ ਬ�ਨ ਦਬਾ�"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾ� ��ਣਨ ਲ� ਲ��ਦਾ ਬ�ਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "ਹ�ਣ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "�ੱ�(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:698
+msgid "_None"
+msgstr "��� ਨਹ��(_N)"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+#, fuzzy
+#| msgid "None"
+msgctxt "date"
+msgid "None"
+msgstr "��� ਨਹ�"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "�ਲਤ ਤਾਰ�� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "�ਲਤ ਸਮਾ� ਮ�ੱਲ"
 
-#. FIXME: get the toplevel window...
-#: ../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 "ਤ�ਨ��� ���"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "ਫਾ�ਲ, �� ਵ� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� �ਯਾਤ �ਰਨ� ਹ� �ਤ� �ਸ ਦ� �ਿਸਮ ਸ��� ਵਿੱ��� ��ਣ�।"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "��� ਸੰਭਾਲ�"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "���(_S)"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "���"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "��� ਸੰਭਾਲ�(_S)..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "ਤ�ਨ��� ���(_A)..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "ਸਭ ��ਾ���"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "ਮ���ਦਾ ��ਾ���"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
+#: ../widgets/misc/e-import-assistant.c:516
+#, fuzzy
+#| msgid ""
+#| "Evolution checked for settings to import from the following\n"
+#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+#| "settings found. If you would like to\n"
+#| "try again, please click the \"Back\" button.\n"
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਨ� ਹ�ਠ ਲਿ�ਿ�� ਤ�� ਸ��ਿੰ� �ਯਾਤ �ਰਨ ਲ� �ਾ�� ��ਤ�\n"
+"ਹ�: Pine, Netscape, Elm, iCalendar। ��� ਸ��ਿੰ�, �� �ਿ\n"
+"�ਯਾਤ ��ਤ� �ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� ਮ�� ��ਸ਼ਿਸ �ਰਨ� �ਾਹ�ੰਦ�\n"
+"ਹ� ਤਾ� \"ਪਿੱ��\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।\n"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "�ਿੱਤਰ ��ਣ�"
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਯਾਤ�ਾਰ ਸਹਾ��"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "�ਯਾਤ �ਿਸਮ"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Import Assistant.\n"
+#| "With this assistant you will be guided through the process of\n"
+#| "importing external files into Evolution."
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ �ਯਾਤ�ਾਰ ਸਹਾ�� ਤ� �� ���� ਨ�ੰ ।\n"
+"�ਸ ਸਹਾ�� ਨਾਲ ਤ�ਸ� ਬਾਹਰ� ਫਾ�ਲਾ� �ਵ�ਲ�ਸ਼ਨ ਤ� �ਯਾਤ \n"
+"�ਰ ਸ�ਦ� ਹ�।"
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "�ਯਾਤ�ਾਰ �ਿਸਮ"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "�ੰਪ�ਰ� �ਰਨ ਥ� �ਾਣ�ਾਰ� ��ਣ�"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+#, fuzzy
+#| msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ਯਾਤ �ਰਨ ਲ� \"�ਯਾਤ\" ਤ� �ਲਿੱ� �ਰ�।"
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+#, fuzzy
+#| msgid "Important"
+msgid "Import Data"
+msgstr "�ਾਸ"
+
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨ�ਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:623
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22376,85 +21997,141 @@ msgstr ""
 "ਸਮਾ�-��ਤਰ ��ਣਨ ਲ� ਮਾ�ਸ-�ਧਾਰਿਤ ਸ�ੰਦਰ ਨ�ਸ਼ਾ ਹ�। ��-ਬ�ਰਡ ਦ� ਵਰਤ�� �ਰਨ ਵਾਲ� ਸਮਾ�-��ਤਰ ਲ� ਹ�ਠਾ� "
 "ਦਿੱਤਾ �ੰਬ�ਸਮਾ� ��ਤਰ ਬ�ਸਾ ਵਰਤ ਸ�ਦ� ਹਨ।"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "�ਨਲਾ�ਨ"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently online.\n"
+#| "Click on this button to work offline."
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਨਲਾ�ਨ ਹ�।\n"
+"�ਸ ਬ�ਨ ਨ�ੰ �ਫਲਾ�ਨ ਹ�ਣ ਲ� ਦਬਾ�।"
+
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�।\n"
+"�ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�।\n"
+"�ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
+
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "ਬ�ਨ ਹਾਲਤ �ਨਲਾ�ਨ ਹ�"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:306
+#, fuzzy
+#| msgid "Horizontal pane position"
+msgid "Horizontal Position"
+msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
+
+#: ../widgets/misc/e-paned.c:307
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:318
+#, fuzzy
+#| msgid "Vertical pane position"
+msgid "Vertical Position"
+msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
+
+#: ../widgets/misc/e-paned.c:319
+msgid "Pane position when oriented vertically"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:330
+#, fuzzy
+#| msgid "_Properties"
+msgid "Proportion"
+msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:342
+#, fuzzy
+#| msgid "_Resize"
+msgid "Fixed Resize"
+msgstr "ਮ��-��ਾਰ(_R)"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "ਨਾਲ ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "ਨਿੱ�� ਰਿ�ਾਰਡ ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "���ਾ�ਰ� ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "�ਾਲ� ਸ�ਨ�ਹਾ"
-
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "ਮ��-ਵਹਾ ਮਾਡਲ"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "�ਾਲਮ ���ਾ�"
+#  message-search popup match count string
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "ਮਿਲਦਾ: %d"
 
-#: ../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:554
+msgid "Close the find bar"
+msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
 
-#: ../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:562
+msgid "Fin_d:"
+msgstr "���(_d):"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "���(_S)"
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "��� ਸਾਫ਼ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "ਹ�ਣ ���(_F)"
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "ਪਿੱ��(_P)"
 
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "ਸਾ�(_C)"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "���ਮ ID"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "�ੱ��(_N)"
 
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "���ਸ�"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+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:1053
-msgid "Sho_w: "
-msgstr "ਵ���(_w): "
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦ� ਸਭ(_c)"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "���(_c): "
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
 
-#. 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:1088
-msgid " i_n "
-msgstr " �ੰਦਰ(_n) "
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "ਪ��਼ ਦ� �ੱਤ� ਪ�ੱ��, ਹ�ਠਾ� ਤ�� ਫ�ਰ �ਾਰ�"
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22466,321 +22143,455 @@ msgstr "�ਰਸਰ �ਤਾਰ"
 msgid "Cursor Column"
 msgstr "�ਰਸਰ �ਾਲਮ"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "��ਰਮਬੱਧ�"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "��ਣ ਢੰ�"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "�ਰਸਰ ਢੰ�"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "ਹ�ਾ�ਣ ਤ�(_l):"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>ਭ��ਣ ��ਣ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>�ਵਾਬ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>ਵਾਪਸ� ਸ��ਨਾ</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>ਸਥਿਤ� ���</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "ਸਵ�-ਹ�ਾ� ਭ��� ���ਮ(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "�ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਲ� ਭ��ਣ ���ਮ ਬਣਾ�(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "ਪਹ�ੰ�� �ਤ� ��ਲ�ਹ�(_v)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+#| msgid "<b>Delivery Options</b>"
+msgid "Delivery Options"
+msgstr "<b>ਭ��ਣ ��ਣ</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "ਸਧਾਰਨ ��ਣ(_r)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+#| msgid ""
+#| "None\n"
+#| "Mail Receipt"
+msgid "Mail Receipt"
 msgstr ""
 "���\n"
 "ਪੱਤਰ ਨਹ��"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"�ਮ\n"
-"ਮਲ���ਤ\n"
-"ਲ��ਵਾ�\n"
-"��ਪਤ\n"
-"ਬਹ�ਤ ��ਪਤ\n"
-"ਸਿਰਫ਼ ਤ�ਹਾਡ� ਲ�"
+#: ../widgets/misc/e-send-options.ui.h:14
+#, fuzzy
+#| msgid "Priority"
+msgid "Proprietary"
+msgstr "ਪਹਿਲ"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "�ਵਾਬ ਲ���ਦਾ(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+#, fuzzy
+#| msgid "<b>Return Notification</b>"
+msgid "Return Notification"
+msgstr "<b>ਵਾਪਸ� ਸ��ਨਾ</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ���(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"ਨਾ-ਪ�ਰਭਾਸ਼ਤ\n"
-"�ੱ�\n"
-"ਮਿ�ਰ�\n"
-"�ੱ�"
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+#| msgid "S_tandard Font:"
+msgid "Standard"
+msgstr "ਸ���ਡਰਡ ਫ���(_t):"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+#, fuzzy
+#| msgid "Sta_tus Tracking"
+msgid "Status Tracking"
+msgstr "ਹਾਲਤ ���(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+#| msgid "Top secret"
+msgid "Top Secret"
+msgstr "ਬਹ�ਤ ��ਪਤ"
+
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "�ਦ�� ਮਨ�਼�ਰ ਹ�ਵ�(_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "�ਦ�� ਮ��ੰਮਲ(_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "�ਦ�� �ਨ�ਾਰ ਹ�ਵ�(_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "ਵਿੱ�(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "ਬਾ�ਦ(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "ਸਭ �ਾਣ�ਾਰ�(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
-#| msgid "_Classification"
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "ਵਰ���ਰਨ(_C):"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "ਦ�ਰ ਸ�ਨ�ਹਾ ਵੰਡ(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "ਪਹ�ੰ��(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "ਮਿ�ਦ ਮਿਤ� ਸ�ੱ�(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "�ਦ-ਤੱ�(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "�ਦ�� ਠ�� ਲੱ��(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 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:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "ਬ�-ਨਾ�"
 
-#. 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:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% ਸਮਾਪਤ)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "ਸੰਭਾਲ� ਤ� ਬੰਦ �ਰ�(_S)"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "ਦਸਤ�ਤ ਸ�ਧ"
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+#| msgid "Add signature script"
+msgid "Add Signature Script"
+msgstr "�ੱ� ਦਸਤ�ਤ� ਸ�ਰਿਪ� ਸ਼ਾਮਿਲ"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+#| msgid "Edit Signature"
+msgid "Edit Signature Script"
+msgstr "ਦਸਤ�ਤ ਸ�ਧ"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "ਸ��ਰਿਪ� ����(_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used 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."
+msgstr ""
+"�ਸ ਸ��ਰਿਪ� ਦ� ���ਪ�ੱ� ਤ�ਹਾਡ� ਦਸਤ�ਤ ਵਿੱ� ਵਰਤ� �ਾਵ���।\n"
+"ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ �ਵ���।"
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+#| msgid "_Script:"
+msgid "S_cript:"
+msgstr "ਸ��ਰਿਪ�(_S):"
+
+#  mail:signature-notscript secondary
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+#| msgid "The script file must exist and be executable."
+msgid "Script file must be executable."
+msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ ਮ���ਦ �ਤ� �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "URL �ੱਤ� �ਾਣ ਲ� �ੱਥ� ਦਬਾ�"
 
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
+
+#: ../widgets/misc/e-web-view.c:350
+#, fuzzy
+#| msgid "Copy things to the clipboard."
+msgid "Copy the link to the clipboard"
+msgstr "���਼ਾ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�।"
+
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
+msgstr "ਹਮ�ਸ਼ਾ �ਲਾ�ਾਰ� ਵਿੱ� ��ਲ�ਹ�(_O)"
+
+#: ../widgets/misc/e-web-view.c:360
+#, fuzzy
+#| msgid "_Open Link in Browser"
+msgid "Open the link in a web browser"
+msgstr "ਹਮ�ਸ਼ਾ �ਲਾ�ਾਰ� ਵਿੱ� ��ਲ�ਹ�(_O)"
+
+#: ../widgets/misc/e-web-view.c:368
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "_Copy Email Address"
+msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
+
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid "Select all text and images"
+msgstr "�ੱ� ਸ�ਨ�ਹ� ਵਿੱ� ਸਭ ���ਸ� ��ਣ�"
+
+#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:756
+#, c-format
+msgid "Click to call %s"
+msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
+
+#: ../widgets/misc/e-web-view.c:758
+msgid "Click to hide/unhide addresses"
+msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
+
+#: ../widgets/misc/e-web-view.c:760
+#, c-format
+msgid "Click to open %s"
+msgstr "%s ��ਲਣ ਲ� �ਲਿੱ� �ਰ�"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "��ਲੰਡਰ: %s ਤ�� %s ਤੱ�"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਾ�"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ਪ�ਪ�ੱਪ ਲਿਸ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "ਹ�ਣ"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+#| msgid "None"
+msgctxt "table-date"
+msgid "None"
+msgstr "��� ਨਹ�"
+
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "ਠ�� ਹ�"
+
+#: ../widgets/table/e-cell-date-edit.c:862
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "ਸਮ�� ਦਾ ਫਾਰਮ�� �ੰ� ਦਾ ਹ�ਣਾ ਲਾ�ਮ� ਹ�: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "ਪ�ਰਤ�ਸ਼ਤ �ਾਸ ਤ�ਰ ਤ� ੦ ਤ� ੧੦੦ ਦ� ਦਰਮਿ�ਨ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
+
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "��ਣ� �ਾਲਮ"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "���ਦਰਿਤ �ਾਲਮ"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "ਨਾ-��ਣਿ� �ਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "�ਾਲਮ ਵਿੰਨ�"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "�ਾਲਮ ਹ�ਠ ਲਾ�ਨ"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "���ਾ �ਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "�ਾਲਮ ਰੰ�"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "BG ਰੰ� �ਾਲਮ"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "ਸ਼ਾਮਲ ਲ� �ਲਿੱ� �ਰ�"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "ਸਥਿਤ�"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ਵੱਧਦਾ �ਰਮ)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(�ੱ�ਦਾ �ਰਮ)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "ਨਾ ��ਰਮਬੱਧ"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "��� �ਰ�ੱਪਿੰ� ਨਹ��"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "��ਤਰ ਵ���"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "�ਪਲੱਬਧ ��ਤਰ"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "�ਪਲੱਬਧ ��ਤਰ(_v):"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ �ਰਮ"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "ਸਭ ਸਾਫ਼"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "�ੱ�ਦਾ �ਰਮ"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "�ਸ ਰਾਹ�� �ਰ�ੱਪ ���ਮ"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "ਹ�ਠਾ� ਭ���(_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "�ੱਤ� ਭ���(_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "�ਲ� ਵਿੱ� ��ਤਰ ਵ���(_f)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "�ਲ� ਵਿੱ� ��ਤਰ ਵ���(_n)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "�ਲ� ਵਿੱ� ��ਤਰ ਵ���(_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "ਲ��ਬੱਧ"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "�ੰ� ਲ��ਬੱਧ ���ਮਾ�"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "ਤਦ"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "ਵ��ਾ� ��ਤਰ(_F)..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "�ੰ� �ਰ�ੱਪ(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "�ਲ� ਵਿੱ� ��ਤਰ ਵ���(_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "�ਹ ਫ�ਲਡਰ ਲ��ਬੱਧ ਵ���(_S):"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "ਲ��ਬੱਧ(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "�ਾਲਮ ਸ਼ਾਮਲ..."
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "��ਤਰ ��ਣ�ਾਰ"
+#, fuzzy
+#| msgid "Add a C_olumn..."
+msgid "Add a Column"
+msgstr "�ਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22788,93 +22599,93 @@ msgstr ""
 "�ਪਣ� ��ਬਲ ਵਿੱ� �ੱ� �ਾਲਮ ਨ�ੰ ���ਨ ਲ�, �ਸ\n"
 "ਨ�ੰ �ਸ ��ਾ �ੱਤ� ਸ�ੱ� ਦਿ�, �ਿੱਥ� ਤ�ਸ�� ਵ��ਣਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d ���ਮ)"
 msgstr[1] "%s : %s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ���ਮ)"
 msgstr[1] "%s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾ� �ਤਾਰ ਰੰ�"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
 msgid "Horizontal Draw Grid"
 msgstr "�ਿਤਿ�� �ਰਿੱਡ ਬਣਾ�"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬ�ਾਰ� �ਰਿੱਡ ਬਣਾ�"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
 msgid "Draw focus"
 msgstr "ਫ��ਸ �ਿੱ��"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "�ਰਸਰ ਮ�ਡ"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "��ਣ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c: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
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-tree.c:3337
 msgid "Length Threshold"
 msgstr "ਮ�ੱਢਲ� ਲੰਬਾ�"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c: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
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-tree.c:3369
 msgid "Uniform row height"
 msgstr "��ਸਾਰ �ਤਾਰ ��ਾ�"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
@@ -22928,200 +22739,2500 @@ msgstr "�ਾਲਮ ਫਾਰਮ��(_S)..."
 msgid "Custo_mize Current View..."
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "_Sort By"
 msgstr "ਲ��ਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1555
 msgid "_Custom"
 msgstr "�ਸ�ਮ(_C)"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "��ਬਲ ਹ�ੱਡਰ"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "��ਬਲ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "�ਰਸਰ �ਤਾਰ"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "�ਰਮਬੱਧ �ਾਣ�ਾਰ�"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
+#: ../widgets/table/e-tree.c:3376
 msgid "Always search"
 msgstr "ਹਮ�ਸ਼ਾ ����"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3342
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲ� ਦਬਾ�"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "ਲ��"
+#: ../widgets/table/e-table.c:3356
+#, fuzzy
+#| msgid "Indicator Spacing"
+msgid "Vertical Row Spacing"
+msgstr "ਸੰ��ਤ� ਥਾ�"
 
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-table.c:3357
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
 msgid "ETree table adapter"
 msgstr "ETree ��ਬਲ �ਡਪ�ਰ"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3382
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ���"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3383
 msgid "Draw lines and +/- expanders."
 msgstr "ਲਾ�ਨਾ� �ਿੱ�� �ਤ� +/- ਫ�ਲਾ�"
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3389
 msgid "Expander Size"
 msgstr "ਫ�ਲਾ� ��ਾਰ"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3390
 msgid "Size of the expander arrow"
 msgstr "ਫ�ਲਾ� ਤ�ਰ ਦਾ ��ਾਰ"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "ਪ�ਪ�ੱਪ"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "ਪ�ਪ�ੱਪ �ੱ� �ਾ�ਲਡ"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "ਸ�ਧ"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "�ਸ ਸ�ੱਲ਼ ਸ�ਧਣਾ ਸ਼�ਰ�"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "ਤਬਦ�ਲ"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "ਸ�ੱਲ ਤਬਦ�ਲ"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "ਫ�ਲਾ�"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਫ�ਲਾ�"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "ਸਮ���"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਸਮ���"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "��ਬਲ ਸ�ੱਲ"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "ਦਬਾ�"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "ਲ��ਬੱਧ"
+
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "ਸਭ ��ਣ�"
+
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "�ੰਪ�ੱ� ਢੰ�"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "�ਵ��� ਪ�ਰ�ਸ��ਸਰ"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+msgid "Text"
+msgstr "���ਸ�"
+
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "���ਾ"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "ਵਿੰਨ�ਹ�"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "�ੰ�ਰ"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "��ਸਾਰ"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "�ਲਿੱਪ ���ਾ�"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "�ਲਿੱਪ ��ਾ�"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "�ਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "�ਲਿੱਪ �ਤਰਭ�� ਭਰ�"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "X �ਫਸ�ੱ�"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "Y �ਫਸ�ੱ�"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "���ਸ� ���ਾ�"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "���ਸ� ��ਾ�"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "�ੰਡਾ�ਾਰ ਵਰਤ��"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "�ੰਡਾ�ਾਰ"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "ਲਾ�ਨ ਲਪ���"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "�ੰਤਰਾਲ �ੱ�ਰ"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "�ਧਿ�ਤਮ ਲਾ�ਨਾ�"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "ਹਾਸ਼��� �ਿੱ��"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "ਨਵ���-ਲਾ�ਨਾ� ਮਨ�਼�ਰ"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "ਬ�ਨ ਬਣਾ�"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "�ਰਸਰ ਸਥਿਤ�"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "IM ਪਰਸੰ�"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 
+#~ msgid "search bar"
+#~ msgstr "��� ਪੱ��"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��� ਪੱ��"
+
+#~ msgid "Combo Button"
+#~ msgstr "�ੰਬ� ਬ�ਨ"
+
+#~ msgid "Activate Default"
+#~ msgstr "ਡਿਫਾਲ� ����ਵ��"
+
+#~ msgid "Popup Menu"
+#~ msgstr "ਪ�ਪ�ੱਪ ਮ�ਨ�"
+
+#~ msgid "Error loading address book."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�।"
+
+#~ msgid "Server Version"
+#~ msgstr "ਸਰਵਰ ਵਰ�ਨ"
+
+#~ msgid "C_ontacts"
+#~ msgstr "ਸੰਪਰ�(_o)"
+
+#~| msgid "Configure autocomplete here"
+#~ msgid "Configure contacts and autocompletion here"
+#~ msgstr "ਸੰਪਰ� �ਤ� ਸਵ�-ਪ�ਰਨ ਸੰਰ�ਨਾ �ੱਥ� ਦਿ��"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਡਰ�ੱਸ ਪ�ਪ�ੱਪ"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਡਰ�ੱਸ ਦਰਸ਼�"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਾਰਡ ਦਰਸ਼�"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� ਭਾ�"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ S/Mime ਸਰ��ਫਿ��� ਪ�ਰਬੰਧ� �ੰ�ਰ�ਲ"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��ਿੰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "�ਪਣ� S/MIME ਸਰ��ਫਿ��� �ਥ� ਰੱ��"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਰੱ�ਣ ਵਿੱ� �ਸਫਲ।"
+
+#~ msgid "Base"
+#~ msgstr "ਬ�ਸ"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "ਫ�ਲਡਰ \"%s\" ਦਾ ਨਾ� ਬਦਲ�:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "ਫ�ਲਡਰ ਨਾ� ਬਦਲ�"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "vCard ਵਾ�� ਸੰਭਾਲ�..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "ਸੰਪਰ� ਸਰ�ਤ ��ਣ�ਾਰ�"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ �ਾਰਡ �ਤ� ਸ��� �ਲ� �ਤ� ਦਿੱ� ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�, (ਪਿ�ਸਲ "
+#~ "ਵਿੱ�)।"
+
+#~ msgid "Look up in address books"
+#~ msgstr "�ਡਰ�ਸ ਬ�ੱ� ਵਿੱ� ���"
+
+#~ msgid ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+#~ msgstr ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>ਪ�ਰਮਾਣ�ਿਤਾ</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>��� ਹ� ਰਹ� ਹ�</b>"
+
+#~| msgid "Using distinguished name (DN)"
+#~ msgid ""
+#~ "Anonymously\n"
+#~ "Using email address\n"
+#~ "Using distinguished name (DN)"
+#~ msgstr ""
+#~ "��ਿ�ਤ\n"
+#~ "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��\n"
+#~ "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ �ਡਰ�ੱਸ ਸਰਵਰ ਤ� ਤ�ਹਾਡ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤ��ਾ।"
+
+#~| msgid "One"
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "�ੱ�\n"
+#~ "ਸਬ"
+
+#~ msgid ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+#~ msgstr ""
+#~ "SSL �ੰ��ਰਿਪਸ਼ਨ\n"
+#~ "TLS �ੰ��ਰਿਪਸ਼ਨ\n"
+#~ "�ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
+
+#~ 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 root of the directory tree."
+#~ msgstr ""
+#~ "��� �ਧਾਰ �ੰਦਰਾ� ਦਾ ਵੱ�ਰਾ ਨਾ� (DN) ਹ�ੰਦਾ ਹ�, �ਿਥ�� �ਿ ਤ�ਸ�� ��� ਸ਼�ਰ� �ਰਦ� ਹ�। ���ਰ ਤ�ਸ�� �ਸ ਨ�ੰ "
+#~ "�ਾਲ� �ੱਡ ਦਿੱਤਾ ਤਾ�, ��� ਰ�� (root) ਡਾ�ਰ���ਰ� ਤ�� ਸ਼�ਰ� ਹ� �ਾਵ���।"
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr "�ਹ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਦਾ ਪ�ਰਾ ਨਾ� ਹ�। �ਦਾਹਰਨ ਲ� \"ldap.mycompany.com\""
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr ""
+#~ "�ਹ �ਧਿ�ਤਮ �ੰਦਰਾ� ਹਨ, �� �ਿ ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਸ�ਦ� ਹਨ। �ਹ ਨ�ੰ ਵਧ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ ਨਾਲ "
+#~ "ਤ�ਹਾਡ� �ਡਰ�ੱਸ-ਬ�ੱ� ਹ�ਲ� ਹ� �ਾਵ���।"
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr ""
+#~ "�ਹ �ਸ ਸਰਵਰ ਦਾ ਨਾ� ਹ�, �� �ਿ ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��� ਵਿੱ� ਵਿ�ਾ� ਦ� ਰਿਹਾ ਹ�। �ਹ ਸਿਰਫ "
+#~ "ਵ��ਣ ਲ� ਹ�।"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>�-ਮ�ਲ:</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>�ਰ</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>�ੰਮ</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>ਫ���ਲ</b>"
+
+#~| msgid "<b>Home</b>"
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>ਨ��ਿਸ</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>ਹ�ਰ</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>��ਲ�ਫ�ਨ</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>�ੰਮ</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "ਸ�ਰ�ਮਾਨ\n"
+#~ "ਸ�ਰ�ਮਤ�\n"
+#~ "ਸ�ਰ�ਮਤ�\n"
+#~ "��ਮਾਰ�\n"
+#~ "ਡਾ."
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "ਸ�ਨ�\n"
+#~ "��ਨ�\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>ਮ��ਬਰ</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "�ਸ ਨਾਲ ਸ਼�ਰ� ਹ�ੰਦ� ਨਾ�"
+
+#~ msgid "_Open"
+#~ msgstr "��ਲ�ਹ�(_O)"
+
+#~ msgid "_Print"
+#~ msgstr "ਪਰਿੰ� �ਰ�(_P)"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਭ���(_v)..."
+
+#~ msgid "Cu_t"
+#~ msgstr "�ੱ��(_t)"
+
+#~ msgid "_Copy"
+#~ msgstr "�ਾਪ� �ਰ�(_C)"
+
+#~ msgid "P_aste"
+#~ msgstr "��ਪ�(_a)"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�\n"
+#~ "�� �ਸ �ੱਪਰ ਹ� ਲਿ�ਿ� �ਾਵ�?"
+
+#~ msgid "Overwrite"
+#~ msgstr "�ੱਪਰ ਲਿ��"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "ਸੰਪਰ�"
+#~ msgstr[1] "ਸੰਪਰ�"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਾ��..."
+
+#~ msgid "Save Appointment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ ਸੰਭਾਲ�"
+
+#~ msgid "Save Memo"
+#~ msgstr "ਮ�ਮ� ਸੰਭਾਲ�"
+
+#~ msgid "Save Task"
+#~ msgstr "�ੰਮ ਸੰਭਾਲ�"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "�ਪਣਾ ਸਮਾ�-��ਤਰ, ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਦ� ਸੰਰ�ਨਾ ਲ� �ਥ� �ਾ�"
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਤ� �ੰਮ"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਸ�ਡਿ�ਲ ਸ�ਨ�ਹਾ ਦਰਸ਼�"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ/�ੰਮ ਸੰਪਾਦ�"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "�ਵ�ਲ਼�ਸ਼ਨ ਦਾ ��ਲੰਡਰ ਭਾ�"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਮ� ਭਾ�"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ �ੰਮ ਭਾ�"
+
+#~ msgid "Memo_s"
+#~ msgstr "ਮ�ਮ�(_s)"
+
+#~ msgid "_Calendars"
+#~ msgstr "��ਲੰਡਰ(_C)"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਤਾਵਨ� �ਿੱਪਣ� ਸ�ਵਾ"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "ਬ�ਨਬ� ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "��ਤਾਵਨ� ਨ���ਫਿ��ਸ਼ਨ ਸਰਵਿਸ ਫ���ਰ� ਬਣਾ� �ਾ ਸ�� ਹ�, ਸ਼ਾ�ਦ ਪਹਿਲਾ� ਹ� �ੱਲਦ� ਹ�..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr "�ੰਮ ਸ��� �ਤ� �ੰਮ �ਾਤ� ਵਿੱ�, ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "\"Preview (�ਲ�)\" ਪੱ�� ਵ���।"
+
+#~ msgid "Category is"
+#~ msgstr "���ਾ�ਰ� ਹ�"
+
+#~ msgid "Comment contains"
+#~ msgstr "�ਿੱਪਣ� ਵਿੱ� ਸ਼ਾਮਿਲ"
+
+#~ msgid "Location contains"
+#~ msgstr "�ਿ�ਾਣਾ ਵਿੱ� ਸ਼ਾਮਿਲ"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� �ਪਲੱਬਧ �ਰਵਾ�(_M)"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� �ਪਲੱਬਧ ਨਾ �ਰਵਾ�(_D)"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "��ਲੰਡਰ ਦਾ �ੱਪ�ਰ�ਡ �ਸਫਲ"
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ� ਬਣਾ�ਣ ਲ� ��ਲੰਡਰ '%s' ��ਲਣ ਵਿੱ� �ਸਫਲ"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ� ਬਣਾ�ਣ ਲ� ��ਲੰਡਰ ਨਹ�� ਹ�"
+
+#~ msgid "New appointment"
+#~ msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
+
+#~ msgid "New meeting"
+#~ msgstr "ਨਵ�� ਮ��ਿੰ�"
+
+#~ msgid "New all day appointment"
+#~ msgstr "ਨਵ�� ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "��ਲੰਡਰ ��ਲਣ ਲ� ਤਰ��ਾ ਸਹਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "��ਲੰਡਰ ��ਲਣ ਲ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>�ਲਾਰਮ</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>��ਣ</b>"
+
+#~| msgid "before"
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "ਪਹਿਲਾ�\n"
+#~ "ਬਾ�ਦ"
+
+#~| msgid ""
+#~| "Minutes\n"
+#~| "Hours\n"
+#~| "Days"
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "ਮਿੰ�\n"
+#~ "�ੰ��\n"
+#~ "ਦਿਨ"
+
+#~| msgid ""
+#~| "Minutes\n"
+#~| "Hours\n"
+#~| "Days"
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "ਮਿੰ�\n"
+#~ "�ੰ��\n"
+#~ "ਦਿਨ"
+
+#~| msgid "start of appointment"
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "ਮ�ਲਾ�ਾਤ ਨਾਲ ਸ਼�ਰ�\n"
+#~ "ਮ�ਲਾ�ਾਤ �ਤਮ"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "ਫਾ�ਲ ����"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "੬੦ ਮਿੰ�\n"
+#~ "੩੦ ਮਿੰ�\n"
+#~ "੧੫ ਮਿੰ�\n"
+#~ "੧੦ ਮਿੰ�\n"
+#~ "੦੫ ਮਿੰ�"
+
+#~| msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">�ਲਾਰਮ</span>"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">��ਤਾਵਨ�</span>"
+
+#~| msgid "<span weight=\"bold\">Time</span>"
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">ਸਮਾ�/ਮਿਤ� ਫਾਰਮ��</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">ਸਧਾਰਨ</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">�ੰਮ ਲਿਸ�</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">ਸਮਾ�</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">�ੰਮ ਹਫ਼ਤਾ</span>"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "ਮਿੰ�\n"
+#~ "�ੰ��\n"
+#~ "ਦਿਨ"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "ਸ�ਮਵਾਰ\n"
+#~ "ਮੰ�ਲਵਾਰ\n"
+#~ "ਬ�ੱਧਵਾਰ\n"
+#~ "ਵ�ਰਵਾਰ\n"
+#~ "ਸ਼�ੱ�ਰਵਾਰ\n"
+#~ "ਸਨਿੱ�ਰਵਾਰ\n"
+#~ "�ਤਵਾਰ"
+
+#~ msgid "_Add "
+#~ msgstr "ਸ਼ਾਮਲ(_A) "
+
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "ਮ�ਲਾ�ਾਤ ਤ�� 15 ਮਿੰ� ਪਹਿਲਾ�\n"
+#~ "ਮ�ਲਾ�ਾਤ ਤ�� 1 �ੰ�ਾ ਪਹਿਲਾ�\n"
+#~ "ਮ�ਲਾ�ਾਤ ਤ�� 1 ਦਿਨ ਪਹਿਲਾ�"
+
+#~ msgid ""
+#~ "a\n"
+#~ "b"
+#~ msgstr ""
+#~ "a\n"
+#~ "b"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>�ਲ�</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>ਦ�ਹਰਾ�</b>"
+
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "ਦਿਨ\n"
+#~ "ਹਫ਼ਤ�\n"
+#~ "ਮਹ�ਨ�\n"
+#~ "ਸਾਲ"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "ਲ�\n"
+#~ "�ਦ�� ਤੱ�\n"
+#~ "ਹਮ�ਸ਼ਾ"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">ਫ���ਲ</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">ਸਥਿਤ�</span>"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "�ੱ�\n"
+#~ "ਸਧਾਰਨ\n"
+#~ "�ੱ�\n"
+#~ "ਨਾ-ਪ�ਰਭਾਸਿਤ"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "ਸ਼�ਰ� ਨਹ��\n"
+#~ "�ਾਰ� ਹ�\n"
+#~ "ਪ�ਰਾ ��ਤਾ\n"
+#~ "ਰੱਦ ��ਤਾ"
+
+#~ msgid "_Save As..."
+#~ msgstr "�ੰ� ਸੰਭਾਲ�(_S)..."
+
+#~ msgid "P_rint..."
+#~ msgstr "ਪਰਿੰ� �ਰ�(_r)..."
+
+#~ msgid "C_ut"
+#~ msgstr "�ੱ��(_u)"
+
+#~ msgid "_Paste"
+#~ msgstr "��ਪ�(_P)"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "��ਣ� �ੰਮ ਪ�ਰ� ਹ�� ਨਿਰਧਾਰਿਤ �ਰ�(_M)"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "��ਣ� �ੰਮ ਨਾ-ਪ�ਰ� ਹ��� ਬਣਾ�(_M)"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "��ਣ� �ੰਮ ਹ�ਾ�(_D)"
+
+#~ msgid "Select T_oday"
+#~ msgstr "�ੱ� ��ਣ�(_O)"
+
+#~ msgid "_Select Date..."
+#~ msgstr "ਮਿਤ� ��ਣ�(_S)..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "ਪਰਿੰ� �ਰ�(_n)..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "��ਣ� ਮ�ਮ� ਹ�ਾ�(_D)"
+
+#~ msgid "Deleting selected objects..."
+#~ msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ..."
+
+#~ msgid "Completing tasks..."
+#~ msgstr "�ੰਮ ਪ�ਰ� �ਰ ਰਿਹਾ ਹ�..."
+
+#~ msgid "_Custom View"
+#~ msgstr "�ਲ� ਸ�ਧ(_C)"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "ਸ�ਧ �ਲ� ਸੰਭਾਲ�(_S)"
+
+#~ msgid "_Define Views..."
+#~ msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�(_D)..."
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "%s �ੱਤ� ਮ�ਲਾ�ਾਤ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�"
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "%s ਤ� �ੰਮ ਲ�ਡ �ਰ�"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "%s �ੱਤ� ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+
+#~ 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"
+#~ "ਦਸੰਬਰ"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "ਮ�ਮ� �ੱਪ�ਰ�ਡ �ਸਫ਼ਲ ਰਿਹਾ ਹ�।"
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "ਮ��ਿੰ� �ਤ� ��ਨਾ ਤਿ�ਰ �ਰਨ ਲ� ਮ�ਮ� ਸ��� '%s' ��ਲਣ ਤ�� �ਸਫਲ"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "ਮ�ਮ� ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
+
+#~ msgid "New shared memo"
+#~ msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ�"
+
+#~ msgid "New memo list"
+#~ msgstr "ਨਵਾ� ਮ�ਮ� ਲਿਸ�"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "�ੰਮ �ੱਪ�ਰ�ਡ �ਸਫਲ ਹ�।"
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "ਮ��ਿੰ� ਤ� ��ਨਾ ਤਿ�ਰ �ਰਨ ਲ� �ਾਰ� ਸ��� '%s' ��ਲਣ ਤ�� �ਸਫਲ"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "�ੰਮ ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
+
+#~ msgid "New task"
+#~ msgstr "ਨਵਾ� �ੰਮ"
+
+#~ msgid "New assigned task"
+#~ msgstr "ਨਵਾ� �ੰਮ ਦਿ�"
+
+#~ msgid "New task list"
+#~ msgstr "ਨਵ�� �ੰਮ ਸ��� "
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "�ੰਮ ਲਿਸ�(_k)"
+
+#~ msgid "_Security"
+#~ msgstr "ਸ�ਰੱ�ਿ�(_S)"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "ਡਾ�ਰ���ਰ��� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤ��� �ਾ ਸ�ਦ��� ਹਨ।"
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr "ਭ��ਣ ��ਣ ਸਿਰਫ਼ ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼ �ਤ� ਮਾ��ਰ�ਸਾਫ਼� ��ਸ਼���਼ ��ਾ��� ਲ� ਹ� �ਪਲੱਬਧ ਹ�।"
+
+#~ msgid "Send options not available."
+#~ msgstr "ਭ��ਣ ��ਣ �ਪਲੱਬਧ ਨਹ�� ਹ�।"
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "�ਸ ਡਾ�ਰ���ਰ� ਦ� ਭਾ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਾ� ਤਾ� ਸਾਰ��� ਫਾ�ਲਾ� �ੱ� �ੱ� �ਰ�� ਸ਼ਾਮਿਲ �ਰ� �ਾ� "
+#~ "ਡਾ�ਰ���ਰ� ਦਾ �ੱ� ��ਾ�ਵ ਬਣਾ� ਤ� �ਹਨਾ� ਨ�ੰ ਨੱਥ� �ਰ ਦਿ�।"
+
+#  mail-composer:recover-autosave title
+#~ msgid "Unfinished messages found"
+#~ msgstr "ਨਾ-ਸਮਾਪਤ ਸ�ਨ�ਹ� ਲੱਭ� ਹਨ"
+
+#  mail-composer:exit-unsaved title
+#~ msgid "Warning: Modified Message"
+#~ msgstr "��ਤਾਵਨ�: ਸ�ਧਿ� ਸ�ਨ�ਹਾ"
+
+#~ msgid "Evolution Information"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਾਣ�ਾਰ�"
+
+#~ msgid "Evolution Query"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ"
+
+#~ msgid "Component"
+#~ msgstr "ਭਾ�"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "�ੱਪਰ ਲ਼ਿ��?"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "ਲ�ਬਲ ਨਾ� �ਾਲ� ਨਹ�� ਹ� ਸ�ਦਾ ਹ�।"
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "ਸਰਵਰ �ੱਤ� ਪਹਿਲਾ� ਹ� �ੱ� ਲ�ਬਲ �ਸ ��� ਨਾਲ ਮ���ਦ ਹ�। �ਪਣਾ ਲ�ਬਲ ਨਾ� ਬਦਲ� ��।"
+
+#~ msgid "Test"
+#~ msgstr "�ਾ��"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>ਫਿਲ�ਰ ਨਿਯਮ(_F)</b>"
+
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "ਸ�ਿੰ�\n"
+#~ "ਮਿੰ� �ੰ��\n"
+#~ "ਦਿਨ\n"
+#~ "ਹਫ਼ਤ�\n"
+#~ "ਮਹ�ਨ�\n"
+#~ "ਸਾਲ"
+
+#~ msgid "Rule name"
+#~ msgstr "ਨਿਯਮ ਨਾ�"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr "ਮ�ਲ ਪਸੰਦ ਦ� ਸੰਰ�ਨਾ, �ਿਸ ਵਿੱ� ਸ�ਰੱ�ਿ� �ਤ� ਸ�ਨ�ਹਾ ਡਿਸਪਲ�� ਵ� ਸ਼ਾਮਿਲ ਹਨ, �ੱਥ� �ਰ�।"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "ਸ਼ਬਦ-���, ਦਸਤ�ਤ �ਤ� ਸ�ਨ�ਹ ਲ��� ਦ� ਸੰਰ�ਨਾ �ੱਥ� �ਰ�"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ��� �ੱਥ� ਸੰਰ�ਿਤ �ਰ�"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "�ਪਣ� ਨ�ੱ�ਵਰ� ��ਨ��ਸ਼ਨ ਸਥਾਪਨ �ੱਥ� ਸੰਰ�ਿਤ �ਰ�"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ��ਾ��� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਭਾ�"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਪਸੰਦ �ੰ�ਰ�ਲ"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੱ�ਵਰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
+
+#~ msgid "[Default]"
+#~ msgstr "[ਮ�ਲ]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "ਦਸਤ�ਤ"
+
+#~ msgid "Account Search"
+#~ msgstr "��ਾ��� ���"
+
+#~ msgid "All Account Search"
+#~ msgstr "ਸਭ ��ਾ��� ���"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "��ੱ�ਣਾ ਰੱਦ(_D)"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�(_N)"
+
+#~ msgid "_Move..."
+#~ msgstr "ਭ���(_M)..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "��� ਫ�ਲਡਰ �ਣ-ਪ��ਹਿ�(_U)"
+
+#~ msgid "U_ndelete"
+#~ msgstr "ਨਾ-ਹ�ਾ�(_n)"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "ਸ�ਨ�ਹ� ਤ�� ਨਿਯਮ ਬਣਾ�"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "ਵਿਸ਼� ਤ�� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_S)"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ�� ��� ਫ�ਲਡਰ(_n)"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "ਸਿਰਨਾਵ�� �ੱਤ� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_R)"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "ਵਿਸ਼� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_j)"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "ਭ��ਣ ਵਾਲਿ�� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_d)"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "ਸ�ਨ�ਹ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_c)"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_M)"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "���ਾ� ਦ� ਫਿੱ�(_F)"
+
+#~ msgid "Tag"
+#~ msgstr "���"
+
+#~ msgid "Save As..."
+#~ msgstr "...ਵਾ�� ਸੰਭਾਲ�"
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "ਬਿਨ_ਨਾ�_�ਿੱਤਰ.%s"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
+
+#~ msgid "Open in %s..."
+#~ msgstr "%s ਨਾਲ ��ਲ�ਹ�..."
+
+#~ msgid "message"
+#~ msgstr "ਸ�ਨ�ਹਾ"
+
+#~ msgid "Add address"
+#~ msgstr "�ਡਰ�ੱਸ ����ਹ�"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
+
+#~ msgid "Default width of the message window."
+#~ msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "���ਰ \"�ਲ�\" ਬਾਹ� �ਾਲ� ਹ�ਵ� ਤਾ� �ਹ ਨਾਲ-ਨਾਲ ਹ� ਵ��ਾ��ਾ, ਨਾ �ਿ ਲੰਬ�ਾਰ� ਰ�ਪ ਵਿੱ�।"
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr ""
+#~ "ਲ�ਾਤਾਰ ਪਰ��� �ਯ��/ਯ�� �ਰਦਾ ਹ�, �� �ਫਲਾ�ਨ ਸਿ�ਰ� (sync) �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਾਣ ਲ� "
+#~ "ਲਾ�਼ਮ� ਹ�ਵ�।"
+
+#~ msgid "Message Window default height"
+#~ msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ��ਾ�"
+
+#~ msgid "Message Window default width"
+#~ msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "��ੱ� �ਰਨ ਲ� ਪ�ੱ��, �� ਯ��਼ਰ ਤ�ਰੰਤ ਹ� �ਫਲਾ�ਨ �ਾਣਾ �ਾਹ�ੰਦਾ ਹ�ਵ�"
+
+#~ msgid "Thread the message list."
+#~ msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ।"
+
+#~ msgid "Thread the message-list"
+#~ msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "ਨਾਲ-ਨਾਲ �ਾ� ਫ�ਲਿ� �ਾ�ਾ ਵਰਤ��"
+
+#~ msgid "New Mail Message"
+#~ msgstr "ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "ਪੱਤਰ ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਨ�ੰ �ੱਪਡ�� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>ਦਸਤ�ਤ(_n)</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>ਭਾਸ਼ਾਵਾ�(_L)</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">��ਾ��� �ਾਣ�ਾਰ�</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">ਪ�ਰਮਾਣ�ਿਤਾ</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਨ�ਹ� ਲਿ�ਣ�</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ਸੰਰ�ਨਾ</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">ਮ�ਲ ਵਿਵਹਾਰ</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">ਪੱਤਰ ਹ�ਾ�</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਹ�ੱਡਰ ਵ���(_H)</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">ਲ�ਬਲ</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">�ਿੱਤਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਵ��ਾ�</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਫ��</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਨ�ਹਾ ਰਸ�ਦ</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">��ਣਵ�� �ਾਣ�ਾਰ�</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">��ਣ</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">�ਪ� ਫ��</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">ਪਰਾ�ਸ� ਸ��ਿੰ�</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">ਲ���ਦ� �ਾਣ�ਾਰ�</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਰੱ�ਿ�ਤ MIME (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">ਸ�ਰੱ�ਿ�</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">ਭ��� ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ਸਰਵਰ ਸੰਰ�ਨਾ</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">ਪਰਮਾਣ�ਿਤਾ �ਾ�ਪ(_A)</span>"
+
+#~| msgid "Attachment Reminder"
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "����ਮ���\n"
+#~ "ਲਾ�ਨ ਵਿੱ�\n"
+#~ "ਹਵਾਲਾ"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "����ਮ���\n"
+#~ "ਲਾ�ਨ ਵਿੱ� (���ਲ�ੱ� ਸ�ਾ�ਲ)\n"
+#~ "ਹਵਾਲਾ\n"
+#~ "ਹਵਾਲਾ ਨਹ��"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "ਬਾਲ�ਿ� (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "ਬਾਲ�ਿ� (ISO-8859-4)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "�-ਮ�ਲ ��ਾ���"
+
+#~ msgid ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+#~ msgstr ""
+#~ "�� ਸਰਵਰ �਼�ਰ-ਸ���ਡਰਡ ਪ�ਰ� ਵਰਤਦਾ ਹ�ਵ� ਤਾ� ਸਰਵਰ �ਡਰ�ੱਸ \"ਸਰਵਰ-ਨਾ�:ਪ�ਰ�-ਨੰਬਰ\" ਮ�ਤਾਬ� ਦਿ�।"
+
+#~ msgid "Message Composer"
+#~ msgstr "ਸ�ਨ�ਹਾ ਲ���"
+
+#~ msgid "Signatures Table"
+#~ msgstr "ਦਸਤ�ਤ ��ਬਲ"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>��� ਫ�ਲਡਰ ਸਰ�ਤ</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">ਡਿ���ਲ ਦਸਤ�ਤ</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">���ਰਿਪਸ਼ਨ</span>"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "\"{0}\" ਹ�ਾ�ਣਾ ਹ�?"
+
+#~ msgid "Delete account?"
+#~ msgstr "��ਾ��� ਹ�ਾ�?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "��� ਫ�ਲਡਰ ਵਿੱ��� ਸ�ਨ�ਹ� ਹ�ਾ�"
+
+#~ msgid "Discard changes?"
+#~ msgstr "�� ਤਬਦ�ਲ��� ਰੱਦ �ਰਨ��� ਹਨ?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ�� ਬਣਾ�"
+
+#~ msgid "Querying server"
+#~ msgstr "�ਿ�ਰਿੰ� ਸਰਵਰ"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "ਵਿਸ਼ਾ �ਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� '� ਹ�"
+
+#~ msgid "Subject or Sender contains"
+#~ msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
+
+#~| msgid "Audio inline plugin"
+#~ msgid "Audio Inline"
+#~ msgstr "�ਡ�� �ਨ-ਲਾ�ਨ"
+
+#~| msgid "Copy tool"
+#~ msgid "Copy Tool"
+#~ msgstr "��ਲ �ਾਪ� �ਰ�"
+
+#~ msgid "_Account:"
+#~ msgstr "��ਾ���(_A):"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "ਫ�ਲਡਰ ਨਾ�(_F):"
+
+#~ msgid "_User:"
+#~ msgstr "ਯ��਼ਰ(_U):"
+
+#~ msgid "Secure Password"
+#~ msgstr "ਸ�ਰੱ�ਿ�ਤ ਪਾਸਵਰਡ"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਸ਼��� ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਪਾਸਵਰਡ (NTLM) ਪ�ਰਮਾਣ�ਿਤਾ ਨਾਲ ������।"
+
+#~ msgid "Plaintext Password"
+#~ msgstr "ਸਧਾਰਨ ਪਾਸਵਰਡ"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਸ਼��� ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਨਾਲ ������।"
+
+#~ msgid "Out Of Office"
+#~ msgstr "ਦਫਤਰ�� ਬਾਹਰ"
+
+#~ 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."
+#~ msgstr ""
+#~ "ਹ�ਠਾ� ਨਿਰਧਾਰਿਤ ��ਤਾ ਸ�ਨ�ਹਾ ���ਮ��ਿ� ਹ� �ਹਨਾ� ਸਾਰ� ਪੱਤਰ ਭ��ਣ ਵਾਲਿ�� ਨ�ੰ ਭ�� ਦਿੱਤਾ\n"
+#~ "�ਾਵ��ਾ, �� �ਿ ਤ�ਹਾਡ� ਦਫਤਰ�� ਬਾਹਰ ਹ�ਣ ਦ� ਸ�ਰਤ ਵਿੱ� ਪੱਤਰ ਭ��ਣ।"
+
+#~ msgid "I am out of the office"
+#~ msgstr "ਮ�� ਦ�ਤਰ ਤ�� ਬਾਹਰ ਹਾ�"
+
+#~ msgid "I am in the office"
+#~ msgstr "ਮ�� ਦ�ਤਰ ਵਿੱ� ਹਾ�"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "��ਸ਼���਼ ��ਾ��� ਲ� ਪਾਸਵਰਡ ਤਬਦ�ਲ"
+
+#~ msgid "Change Password"
+#~ msgstr "ਪਾਸਵਰਡ ਤਬਦ�ਲ"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "��ਸ���਼ ��ਾ��� ਲ� ਡ�ਲ���� ਸ��ਿੰ� ਪਰਬੰਧਨ"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "ਡ�ਲ���ਸ਼ਨ ਸਹਾ��"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "ਸਭ ��ਸ਼���਼ ਫ�ਲਡਰਾ� ਦਾ ��ਾਰ ਵ��ਾ�"
+
+#~ msgid "Folders Size"
+#~ msgstr "ਫ�ਲਡਰ ��ਾਰ"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "_OWA URL:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "ਪ�ਰਮਾਣ�ਿਤਾ(_u)"
+
+#~ msgid "Mailbox name is _different than user name"
+#~ msgstr "ਮ�ਲਬਾ�ਸ ਨਾ� ਯ��਼ਰ ਨਾ� ਤ�� ਵੱ�ਰਾ ਹ�(_d)"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "ਮ�ਲਬਾ�ਸ(_M):"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid "Size:"
+#~ msgstr "��ਾਰ:"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਦਾ �ਫਲਾ�ਨ ਢੰ� ਹ�। ਤ�ਸ�� ਹ�ਣ ਫ�ਲਡਰ ਬਣਾ �ਾ� ਸ�ਧ ਨਹ�� ਸ�ਦ� ਹ�।\n"
+#~ "�ਿਰਪਾ �ਰ�� �ਹਨਾ� �ਾਰਵਾ��� ਵਿੱ� �ਨਲਾ�� ਢੰ� ਲ� ਤਬਦ�ਲ �ਰ�।"
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "ਮ���ਦਾ ਪਾਸਵਰਡ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਮ���ਦ ਪ�ਰਾਣ� ਪਾਸਵਰਡ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�। �ਿਰਪਾ �ਰ�� "
+#~ "ਠ�� ਪਾਸਵਰਡ ਦਿ�।"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "ਦ� ਪਾਸਵਰਡ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ। �ਿਰਪਾ �ਰ�� ਪਾਸਵਰਡ ਮ�� ਦਿ�।"
+
+#~ msgid "Confirm Password:"
+#~ msgstr "ਪਾਸਵਰਡ ਪ�ਸ਼��:"
+
+#~ msgid "Current Password:"
+#~ msgstr "ਮ���ਦਾ ਪਾਸਵਰਡ:"
+
+#~ msgid "New Password:"
+#~ msgstr "ਨਵਾ� ਪਾਸਵਰਡ:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ �ਤਮ ਹ� �� ਹ�। �ਿਰਪਾ �ਰ�� �ਪਣਾ ਪਾਸਵਰਡ ਹ�ਣ� ਬਦਲ�।"
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ��ਲ� %d ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���"
+
+#~ msgid "Custom"
+#~ msgstr "ਪਸੰਦ�ਦਾ"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "ਸੰਪਾਦ� (ਪ�ਨ, ਲਿ�ਣ, ਸ�ਧਣ)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "ਲ��� (ਪ�ਨ, ਲਿ�ਣ)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "ਪ���ਲ�ਰਤਾ (ਪ�ਨ ਲ� ਹ�)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ �ਧਿ�ਾਰ"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "%s ਲ� �ਧਿ�ਾਰ"
+
+#~ 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."
+#~ msgstr ""
+#~ "�ਹ ਸ�ਨ�ਹਾ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ���ਮ��ਿ� ਹ� ਤ�ਹਾਨ�ੰ �ਹ �ਾਣ�ਾਰ� ਲ� ਭ��ਿ� �ਿ� ਹ� �ਿ ਤ�ਸ�� �ੱ� ਡ�ਲ���� "
+#~ "ਥਾਪ� �� ਹ�। ਤ�ਸ�� ਹ�ਣ ਮ�ਰ� ਤ�ਰ �ੱਤ� ਸ�ਨ�ਹ� ਭ�� ਸ�ਦ� ਹ�।"
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "ਤ�ਹਾਨ�ੰ ਮ�ਰ� ਫ�ਲਡਰ ਲ� ਹ�ਠ ਦਿੱਤ� �ਧਿ�ਾਰ ਦਿੱਤ� �� ਹਨ:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "ਤ�ਹਾਨ�ੰ ਮ�ਰ��� ਪ�ਰਾ�ਵ�� ���ਮਾ� ਵ��ਣ ਦਾ ਵ� �ਧਿ�ਾਰ ਹ�।"
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "ਪਰ ਤ�ਹਾਨ�ੰ ਮ�ਰ��� ਪ�ਰਾ�ਵ�� ���ਮਾ� ਵ��ਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�।"
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "ਤ�ਹਾਨ�ੰ %s ਲ� �ੱ� ਡ�ਲ���� ਦਾ �ਹ�ਦਾ ਦਿੱਤਾ �ਿ� ਹ�"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "�� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਦ� ਲ� ਪਹ�ੰ� ਨਹ�� ਹ�"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਰ� ਵਿੱ� ��ਦ ਨ�ੰ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਰ� ਵਿੱ� %s ਪ�ਰਤ�ਨਿਧ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "ਪ�ਰਤ�ਨਿਧਾ� ਸ��� �ੱਪਡ�� ਨਹ�� ਹ� ਸ��"
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ ਸ��� ਪ�ਨ ਦ�ਰਾਨ �ਲਤ� ਹ�।"
+
+#~ msgid "C_alendar:"
+#~ msgstr "��ਲੰਡਰ(_a):"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "ਸੰਪਰ�(_n):"
+
+#~ msgid "Delegates"
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+#~ msgstr ""
+#~ "��� ਨਹ��\n"
+#~ "ਰ�ਵਿ�ਰ (��ਵਲ ਪ��ਹਨ ਲ�)\n"
+#~ "ਲ��� (ਪ��ਹਨ, ਬਣਾ�)\n"
+#~ "�ਡ��ਰ (ਪ��ਹਨ, ਬਣਾ�, ਸ�ਧਣ)"
+
+#~ msgid "Permissions for"
+#~ msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "�ਹ ਯ��਼ਰ ਤ�ਹਾਡ� ਤ�ਰ 'ਤ� ਪੱਤਰ ਭ��ਣ �ਤ� ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤ� �ਧਿ�ਾਰਾ�\n"
+#~ "ਨਾਲ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਵਰਤ ਸ�ਣ ਦ� ਯ�� ਹਨ।"
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ ਨਿੱ�� ���ਮਾ� ਨ�ੰ ਵ�� ਨਹ�� ਸ�ਦ� ਹਨ(_D)"
+
+#~ msgid "_Inbox:"
+#~ msgstr "��ਣ-ਬ�ਸਾ(_I):"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "ਸੰ��ਪ �ਧਿ�ਾਰ(_S)"
+
+#~ msgid "Permissions..."
+#~ msgstr "�ਧਿ�ਾਰ..."
+
+#~ msgid "Folder Name"
+#~ msgstr "ਫ�ਲਡਰ ਨਾ�"
+
+#~ msgid "Folder Size"
+#~ msgstr "ਫ�ਲਡਰ ��ਾਰ"
+
+#~ msgid "User"
+#~ msgstr "ਯ��਼ਰ"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣਾ�"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "��ਸ਼���਼ ਫ�ਲਡਰ ਲ��"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "ਫ�ਲਡਰ ਲ� ਮ��ਬਰ ਹ�ਾ�..."
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "�� ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�ਣ� ਹ�?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "\"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�"
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>�ਸ ਸਮ�� ਤ�ਹਾਡ� ਸਥਿਤ� \"ਦਫਤਰ�� ਬਾਹਰ\" ਹ�</b>\n"
+#~ "\n"
+#~ "�� ਤ�ਸ�� �ਸ ਨ�ੰ \"ਦਫਤਰ ਵਿੱ�\" ਨਾਲ ਤਬਦ�ਲ �ਰਨ� �ਾਹ�ੰਦ� ਹ�?"
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b> ਦਫਤਰ�� ਬਾਹਰ ਸ�ਨ�ਹਾ</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>ਸਥਿਤ�:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small> ਹ�ਠਾ� ਨਿਰਧਾਰਿਤ ��ਤਾ ਸ�ਨ�ਹਾ ���ਮ��ਿ� ਹ� �ਹਨਾ� ਸਾਰ� ਪੱਤਰ ਭ��ਣ ਵਾਲਿ�� ਨ�ੰ ਭ�� ਦਿੱਤਾ "
+#~ "�ਾਵ��ਾ,\n"
+#~ "�� �ਿ ਤ�ਹਾਡ� ਦਫਤਰ�� ਬਾਹਰ ਹ�ਣ ਦ� ਸ�ਰਤ ਵਿੱ� ਪੱਤਰ ਭ��ਣ।</small> "
+
+#~ msgid "I am currently in the office"
+#~ msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ ਰਿਹਾ ਹਾ�"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ ਰਿਹਾ ਹਾ�"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "ਨਹ��, ਹਾਲਤ ਨਾ ਬਦਲ�"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "ਦਫਤਰ�� ਬਾਹਰ ਸਹਾ��"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "ਹਾ�, ਸਥਿਤ� ਤਬਦ�ਲ"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "ਪਾਸਵਰਡ ਮਿ�ਦ �ਾਤਮਾ ��ਤਾਵਨ�..."
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ੭ ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���..."
+
+#~ msgid "_Change Password"
+#~ msgstr "ਪਾਸਵਰਡ ਬਦਲ�(_C)"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�।)"
+
+#~ msgid "Add User:"
+#~ msgstr "ਯ��਼ਰ ����:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>�ਧਿ�ਾਰ</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "ਹ�ਾ ਨਹ�� ਸ�ਦ�"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "ਸ�ਧ ਨਹ�� ਸ�ਦ�"
+
+#~ msgid "Create items"
+#~ msgstr "���ਮਾ� ਬਣਾ�"
+
+#~ msgid "Create subfolders"
+#~ msgstr "ਸਬ-ਫ�ਲਡਰ ਬਣਾ�"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "��� ਵ� ���ਮਾ� ਹ�ਾ�"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "�ਪਣ��� ���ਮਾ� ਹ�ਾ�"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "��� ���ਮਾ� ਸ�ਧ�"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "�ਪਣ��� ���ਮਾ� ਦ� ਸ�ਧ"
+
+#~ msgid "Folder contact"
+#~ msgstr "ਫ�ਲਡਰ ਸੰਪਰ�"
+
+#~ msgid "Folder owner"
+#~ msgstr "ਫ�ਲਡਰ ਮਾਲ�"
+
+#~ msgid "Folder visible"
+#~ msgstr "ਫ�ਲਡਰ ਦਿੱ�"
+
+#~ msgid "Read items"
+#~ msgstr "���ਮਾ� ਪ��"
+
+#~ msgid "Role: "
+#~ msgstr "ਭ�ਮਿ�ਾ: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>ਸ�ਨ�ਹਾ ਸ��ਿੰ�</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>�ਰ��ਿੰ� ��ਣ</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "��ਸ਼��� - ਭ��ਣ ��ਣਾ�"
+
+#~ msgid "I_mportance: "
+#~ msgstr "�ਹਿਮ��ਤ(_m):  "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "�ਮ\n"
+#~ "�ੱ�\n"
+#~ "�ੱ�"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "ਸਧਾਰਨ\n"
+#~ "ਨਿੱ��\n"
+#~ "ਪ�ਰਾ�ਵ��\n"
+#~ "��ਪਤ"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "�ਹ ਸ�ਨ�ਹ� ਲ� ਵਾਪਸ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� ਹ�(_d)"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "�ਹ ਸ�ਨ�ਹ� ਲ� �ੱ� ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ� ਹ�(_r)"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "ਡ�ਲ���� ਵਾ�� ਭ���"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "ਸੰਵ�ਦਨਸ਼�ਲਤਾ(_S): "
+
+#~ msgid "_User"
+#~ msgstr "ਯ��਼ਰ(_U)"
+
+#~ msgid "Select User"
+#~ msgstr "ਯ��਼ਰ ��ਣ�"
+
+#~ msgid "Address Book..."
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�..."
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਸੰਪਰ� ਲ� ਮ��ਬਰ ਬਣ�"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ��ਲੰਡਰ ਦ� ਮ��ਬਰ ਬਣ�"
+
+#~ msgid "Activates the Evolution-Exchange extension package."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ-��ਸ���਼ ��ਸ��ਨਸ਼ਨ ਪ���� ����ਵ�� �ਰ�"
+
+#~ msgid "Exchange Operations"
+#~ msgstr "��ਸ਼��� �ਾਰਵਾ���"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� \"��ਸ���਼ ਸਥਾਪਨ\" ��ਬ ਵਰਤ� ਨਹ�� �ਾ ਸ�ਦ�।"
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "ਸੰਰ�ਨਾ ਸਮੱਸਿ�ਵਾ� �ਰ�� ਪਾਸਵਰਡ ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot display folders."
+#~ msgstr "ਫ�ਲਡਰ ਵ��ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "��ਸ���਼ ��ਾ��� \"{0}\" ਲ� ��ਣਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਤ�ਹਾਡ� ਵਲ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰ�� ਮ�� "
+#~ "�ਾਲ� �ਰਨ �ਪਰੰਤ ਹ� ਪਰਭਾਵ� ਹ�ਣ����।"
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਪਰਮਾਣਿਤ ਨਹ�� ਹ� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not change password."
+#~ msgstr "ਪਾਸਵਰਡ ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "��ਸ���਼ �ਾਤਾ ਸੰਰ�ਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�, �ਿ��ਿ\n"
+#~ "�ੱ� �ਣ�ਾਣ �ਲਤ� �� ਹ�। URL, ਯ��਼ਰ ਨਾ� �ਤ� \n"
+#~ "ਪਾਸਵਰਡ ਦ� �ਾ�� �ਰ�� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "��ਸ਼���਼ ਸਰਵਰ ਨਾਲ ��� ਨਹ�� ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "ਸਰਵਰ {0} ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ ਲ� ਫ�ਲਡਰ �ਧਿ�ਾਰਾ� ਨ�ੰ �ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "��ਸ���਼ ਵ�ਬ ਸ��ਰ��਼ ਸਿਸ�ਮ ਨਹ�� ਮਿਲਿ� ਹ�।"
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "ਸਰਵਰ {0} ���ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "{0} ਨ�ੰ ਪ�ਰਤ�ਨਿਧ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "ਫ�ਲਡਰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "ਫ�ਲਡਰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "ਦਫ਼ਤਰ��-ਬਾਹਰ ਹਾਲਤ ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "ਫ�ਲਡਰ �ਧਿ�ਾਰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "ਦਫ਼ਤਰ��-ਬਾਹਰ ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��ਬਰ� ਯ��਼ਰ ਦ� ਮ�ਲ-ਬਾ�ਸ ਨ�ੰ ਲ�ਡ �ਰਨ ਵਾਸਤ� ਮ��-�ਾਲ� ਦ� ਲ�� ਹ�"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "��ਸ���਼ ��ਾ��� �ਫਲਾ�ਨ ਹ�।"
+
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "��ਸ���਼ ��ਨ���ਰ ਨ�ੰ ��ਸ���਼ ਸਰਵਰ �ਤ� ��� ਸਹ�ਲਤਾ� ਲ�\n"
+#~ "ਪਹ�ੰ� ਦ� ਲ�� ਹ�, �� �ਿ �ਯ�� �ਾ� ਬੰਦ �ਾਪਦ��� ਹਨ।\n"
+#~ "(�ਹ ��ਸਰ ਬਿਨਾ� �ਾਰਨ ਹ� ਹ� ਸ�ਦਾ ਹ�)। ਤ�ਹਾਡ�\n"
+#~ "��ਸ���਼ ਪਰਸ਼ਾਸ� ਨ�ੰ ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ��ਨ���ਰ ਦ� ਵਰਤ��\n"
+#~ "�ਰਨ ਦ�ਣ ਲ� �ਹ ਸਹ�ਲਤਾ� ਨ�ੰ ਯ�� �ਰਨਾ\n"
+#~ "ਪਵ��ਾ।\n"
+#~ "\n"
+#~ "�ਪਣ� ��ਸ���਼ ਪਰਸ਼ਾਸ� ਨ�ੰ �ਾਣ�ਾਰ� ਦ�ਣ ਲ�\n"
+#~ "ਹ�ਠ ਦਿੱਤਾ ਸਬੰਧ ਵਰਤ��:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#~ msgid "Folder already exists"
+#~ msgstr "ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "ਫ�ਲਡਰ ਮ���ਦ ਨਹ�� ਹ�"
+
+#~ msgid "Folder offline"
+#~ msgstr "ਫ�ਲਡਰ �ਫਲਾ�ਨ"
+
+#~ msgid "Generic error"
+#~ msgstr "ਸਧਾਰਨ �ਲਤ�"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "�ਲ�ਬਲ ਸ��� ਸਰਵਰ ਪਹ�ੰ� ਵਿੱ� ਨਹ�� ਹ�"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "���ਰ OWA ਵੱ�ਰ� ਮਾਰ� �ੱਤ� �ੱਲ ਰਿਹਾ ਹ� ਤਾ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸੰਰ�ਨਾ ਡਾ�ਲਾ� ਦ� ਦ�ਣਾ ਪਵ��ਾ।"
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "�ਸ ਸਰਵਰ �ੱਤ� {0} ਲ� ��� ਪੱਤਰ-ਬ�ਸਾ ਨਹ�� ਹ�।"
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "ਪ�ਸ਼�� �ਰ� �ਿ ਠ�� URL ਦਿੱਤਾ ਹ� �ਤ� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr "�ਾ�� �ਰ� �ਿ ਸਰਵਰ ਨਾ� ਦ� �ੱ�ਰ ਠ�� ਹਨ �ਤ� ਮ�� ��ਸ਼ਸ਼ �ਰ�।"
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr "�ਾ�� �ਰ� �ਿ ਤ�ਹਾਡਾ ਯ��਼ਰ ਨਾ� �ਤ� ਪਾਸਵਰਡ ਠ�� ਹ� �ਤ� ਮ��-��ਸ਼ਸ਼ �ਰ�।"
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "�ਸ ��ਾ��� ਲ� ��� �ਲ�ਬਲ ਸ��� ਸਰਵਰ ਸੰਰ�ਿਤ ਨਹ�� ਹ�।"
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "{1} �ੱਤ� {0} ਯ��਼ਰ ਲ� ��� ਪੱਤਰ-ਬ�ਸਾ ਨਹ�� ਹ�।"
+
+#~ msgid "No such user {0}"
+#~ msgstr "�ਦਾ� ਦਾ ��� ਯ��਼ਰ {0} ਨਹ��"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "ਪਾਸਵਰਡ ਸਫ਼ਲਤਾਪ�ਰ� ਤਬਦ�ਲ ��ਤਾ �ਿ�।"
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr "�ੱ� ਡ�ਲ���� ID ਦਿ� �ਾ� �ੱ� ਡ�ਲ���� ਵਾ�� ਭ��ਣ ��ਣ ਹ�ਾ ਦਿ�।"
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "ਪ�ਸ਼�� �ਰ� �ਿ �ਲ�ਬਲ ਸ��� ਸਰਵਰ ਨਾ� ਠ�� ਹ�"
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "�ਿਰਪਾ �ਰ�� ਪਰਭਾਵ� ਹ�ਣ ਲ� �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਲਾ�"
+
+#  FIXME: This is just to get the shadow, is there a better way?
+#~ msgid "Please select a user."
+#~ msgstr "�ਿਰਪਾ �ਰ�� �ੱ� ਯ��਼ਰ ��ਣ�।"
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "ਸਰਵਰ ਨ� ਪਾਸਵਰਡ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�, �ਿ��ਿ �ਹ ਬਹ�ਤ �ਮ�਼�ਰ ਹ�।"
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "�ਦ�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰ��� ਤਾ� ��ਸ���਼ ��ਾ��� �ਯ�� �ਰ ਦਿੱਤਾ �ਾਵ��ਾ"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "��ਸ���਼ ��ਾ��� ਨ�ੰ ਤ�ਹਾਡ� ਵਲ�� �ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਤ�� ਬਾ�ਦ ਹ�ਾ�� �ਾਵ��ਾ"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "��ਸ���਼ ਸਰਵਰ ��ਸ���਼ ��ਨ���ਰ ਨਾਲ �ਨ���ਲ ਨਹ�� ਹ�।"
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "ਸਰਵਰ ��ਸ਼���਼ ੫.੫ ਨਾਲ �ੱਲ ਰਿਹਾ ਹ�। ��ਸ਼���਼ ��ਨ���ਰ ਮਾ��ਰ�ਸਾਫ�\n"
+#~ "��ਸ਼���਼ ੨੦੦੦ �ਤ� ੨੦੦੩ ਲ� ਹ� ਸਹਾ�� ਹ�।"
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "�ਸ ਸਮੱਸਿ� ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ ਮੰ�\n"
+#~ "�ਰ ਰਿਹਾ ਹ� �ਿ ਤ�ਸ�� �ਪਣ� ਯ��਼ਰ ਨਾ� ਦ� ਨਾਲ\n"
+#~ "ਵਿੰਡ� ਡ�ਮ�ਨ ਨਾ� ਵ� ਦਿ� (�ਿਵ�� �ਿ &quot;DOMAIN\\user&quot;)।\n"
+#~ "\n"
+#~ "�ਾ� ਤ�ਸ�� ਸਿਰਫ਼ �ਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹ�।"
+
+#~ msgid "Try again with a different password."
+#~ msgstr "�ੱ� ਵੱ�ਰ� ਪਾਸਵਰਡ ਨਾਲ ਮ��-��ਸ਼ਸ਼ �ਰ�।"
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "ਯ��਼ਰ ਨ�ੰ ਪਹ�ੰ� �ੰ�ਰ�ਲ ਸ��� ਵਿੱ� ���ਨ ਲ� �ਸਫ਼ਲ:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਸ�ਧਣ ਲ� �ਸਫ਼ਲ ਹ�।"
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "��� {0} ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr "ਤ�ਸ�� �ਸ ਸਰਵਰ �ੱਤ� �ਪਣ� ਪੱਤਰ ਸੰਭਾਲਣ ਲ� ���ਾ ਭਰਨ ਦ� ਨ��� ਹ�।"
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr "ਤ�ਹਾਨ�ੰ �ੱ� ਸਮ�� ��ਵਲ �ੱ� ਹ� ਡ�ਲ����ਰ ਦ� ਤ�ਰ �ੱਤ� ਸ�ਨ�ਹਾ ਭ��ਣ ਦ� ��਼ਾ�਼ਤ ਹ�।"
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "ਤ�ਸ�� �ਪਣ� �ਪ ਨ�ੰ ਪ�ਰਤ�ਨਿਧ ਨਹ�� ਬਣਾ ਸ�ਦ�"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "ਤ�ਸ�� �ਸ ਸਰਵਰ �ੱਤ� ਪੱਤਰ ਸੰਭਾਲਣ ਲ� �ਪਣ� ���� ਤ�� ਵੱਧ �� ਹ�।"
+
+#~ msgid "You may only configure a single Exchange account."
+#~ msgstr "ਤ�ਸ�� ��ਹ�ਰਾ ��ਸ਼���਼ ��ਾ��� ਹ� ਸੰਰ�ਿਤ �ਰ ਸ�ਦ� ਹ�।"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ��� ਪੱਤਰ ਹ�ਾ�ਣ ਨਾਲ ��� ਥਾ� ਸਾਫ਼ �ਰ�।"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ਤ�ਸ�� ਹ�ਣ ਸ਼ਾ�ਦ ਪੱਤਰ ਭ�� �ਾ� ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ����।"
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "ਤ�ਹਾਡ� ਮ���ਦਾ ਵਰਤ�� : {0} �ਿਬਾ। ਤ�ਸ�� �ਦ�� ਤੱ� ਪੱਤਰ ਨ�ੰ ਭ�� ਸ�ਦ�, �ਦ�� ਤੱ� �ਿ ��� ਪੱਤਰਾ� ਨ�ੰ "
+#~ "ਹ�ਾ�� ਨਹ�� �ਾ�ਦਾ ਹ�।"
+
+#~ msgid "Your password has expired."
+#~ msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ਪ�ੱ� �� ਹ�।"
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} ਨ�ੰ ਪਹ�ੰ� �ੰ�ਰ�ਲ ਸ��� ਵਿੱ� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} ਪਹਿਲਾ� ਹ� ਡ�ਲ���� ਹ�"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} ਪਹਿਲਾ� ਹ� ਸ��� ਵਿੱ� ਹ�"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� �ੰਮਾ� ਲ� ਮ��ਬਰ ਬਣ�"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "ਫ�ਲਡਰ �ਧਿ�ਾਰ ��ੱ� �ਰ�"
+
+#~ msgid "PNG files"
+#~ msgstr "PNG ਫਾ�ਲਾ�"
+
+#~ msgid "_Face"
+#~ msgstr "ਫ�ਸ(_F)"
+
+#~| 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 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 ""
+#~ "�ਪਣ� �ਿਹਰ� ਦ� ���� �ਿਹ� ਤਸਵ�ਰ ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹਿ�� ਨਾਲ ���� �ਰ�\n"
+#~ "\n"
+#~ "ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ (Base-"
+#~ "64) �ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ ਲ� "
+#~ "ਸ�ਨ�ਹਿ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ��ਾ।"
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "ਫ�ਲਡਰ ਮ��ਬਰ� ਹ�ਾ�"
+
+#~ msgid ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+#~ msgstr "IMAP ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� ਹ�ਾ�ਣ ਲ� ਫ�ਲਡਰ ਲ�� ਵਿੱ� ਸੱ�ਾ �ਲਿੱ� �ਰ�"
+
+#~ msgid "Add Novell GroupWise support to Evolution."
+#~ msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼ ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "�ਰ�ੱਪਵਾ�� ��ਾ��� ਸ���ੱਪ"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>�ੰ� ਲਿਸ�:</b>"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>ਨਾ�</b>"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>IMAP ਹ�ੱਡਰ</b>"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "ਹਾਰਡਵ��ਰ �ਬਸ�ਸ਼ਨ ਲ��ਰ ਲ�ਡ ਨਹ�� ਹ�"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "\"hald\" ਸਰਵਿਸ ਲ���ਦ� ਸ�, ਪਰ �ਸ ਵ�ਲ� �ੱਲ ਨਹ�� ਰਹ� ਹ�। ਸਰਵਿਸ ਯ�� �ਰ� �ਤ� �ਹ ਪਰ��ਰਾਮ "
+#~ "ਮ��-�ਾ� �ਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
+
+#~ msgid "Search for an iPod failed"
+#~ msgstr "�ੱ� iPod ��� ਫ�ਲ�ਹ ਹ��"
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਸਿ�ਰ�ਨਾ��਼ �ਰਨ ਲ� �ੱ� iPod ਨਹ�� ਲੱਭਿ� ਹ�। �ਾ� ਤਾ� �ਹ ਤ�ਹਾਡ� ਸਿਸ�ਮ ਨਾਲ ���ਿ� "
+#~ "ਨਹ�� ਹ� �ਾ� �ਹ �ਾਲ� ਨਹ�� ��ਤਾ �ਿ� ਹ�।"
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "iPod ਨਾਲ ਸਿ�ਰ�ਨਾ��਼"
+
+#~| msgid "Synchronize to iPod"
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "�ਪਣਾ ਡਾ�ਾ �ਪਣ� �ਪਲ iPod ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�"
+
+#~ msgid "Disable an account by right-clicking on it in the folder tree."
+#~ msgstr "�ਹ ��ਾ��� ਨ�ੰ ਫ�ਲਡਰ �ਰ� ਵਿੱ� �ਸ �ੱਤ� ਸੱ�ਾ �ਲਿੱ� �ਰ�� �ਯ�� �ਰ�।"
+
+#~ msgid "Specify _filename:"
+#~ msgstr "�ਾਸ ਫਾ�ਲ ਨਾ�(_f):"
+
+#~ msgid "Pl_ay"
+#~ msgstr "�ਲਾ�(_a)"
+
+#~| msgid "Mail to task"
+#~ msgid "Mail-to-Task"
+#~ msgstr "ਪੱਤਰ ਤ�� �ੰਮ"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "ਸੰਪਰ� ਸ��� ਮਾਲ�(_o)"
+
+#~ msgid "Get list _archive"
+#~ msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_a)"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_u)"
+
+#~ msgid "_Post message to list"
+#~ msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
+
+#~ msgid "Mono Loader"
+#~ msgstr "ਮ�ਨ� ਲ�ਡਰ"
+
+#~ msgid "Support plugins written in Mono."
+#~ msgstr "ਸਹਿਯ�� ਪਲੱ��ਨ ਮ�ਨ� ਵਿੱ� ਲਿ���� ���� ਹਨ।"
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "ਸਧਾਰਨ ਹ� ਪਸੰਦ"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">�ਿ�ਾਣਾ</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">ਸਰ�ਤ</span>"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "ਸ�ਰੱ�ਿ�ਤ FTP (SSH)\n"
+#~ "ਪਬਲਿ� FTP\n"
+#~ "FTP (ਬਿਨਾ� ਲਾ��ਨ ਦ�)\n"
+#~ "Windows ਸਾ��\n"
+#~ "WebDAV (HTTP)\n"
+#~ "ਸ�ਰੱ�ਿ�ਤ WebDAV (HTTPS)\n"
+#~ "ਪਸੰਦ�ਦਾ �ਿ�ਾਣਾ"
+
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+#~ msgstr ""
+#~ "ਦਿਨ\n"
+#~ "ਹਫ਼ਤ�\n"
+#~ "ਮਹ�ਨ�"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "ਵ�ਹਲਾ/ਰ��ਿ�"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "�ੱ� ਪਲੱ��ਨ, �� ਹ�ਰ ਪਲੱ��ਨ ਲ�ਡ �ਰਦ� ਹ�, ਪਾ�ਥਨ ਨਾਲ ਲਿ��।"
+
+#~ msgid "Python Loader"
+#~ msgstr "ਪਾ�ਥਨ ਲ�ਡਰ"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�(_S)"
+
+#~| msgid "Selects a single calendar or task source for viewing."
+#~ msgid "Quickly select a single calendar or task list for viewing."
+#~ msgstr "ਤ�ਰੰਤ ਵ��ਣ ਲ� �ੱ� �ੱ�ਲ� ��ਲੰਡਰ �ਾ� �ਾਸ� ਲਿਸ� ��ਣ�।"
+
+#~| msgid "Select one source"
+#~ msgid "Select One Source"
+#~ msgstr "�ੱ� ਸਰ�ਤ ��ਣ�"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ੱਲ"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ੱਲ ਸੰਰ�ਨਾ ਫ���ਰ�"
+
+#~ msgid "Evolution Test"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਾ�� "
+
+#~ msgid "Evolution Test component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ� ਭਾ�"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>ਸਰ�ਰਮ ��ਨ��ਸ਼ਨ</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "ਸਰ�ਰਮ ��ਨ��ਸ਼ਨ ਦਬਾ�"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "�ਹ ��ਨ��ਸ਼ਨ ਬੰਦ �ਰਨ ਲ� �ਤ� �ਫਲਾ�ਨ �ਾਣ ਲ� OK ਦਬਾ�"
+
+#~ msgid "_Import"
+#~ msgstr "�ਯਾਤ(_I)"
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr "�ਨ�ਮ ਪਾ�ਲ� ਤ�ਹਾਡ� ਸਿਸ�ਮ ਤ� �ੰਸ�ਾਲ ਨਹ�� �ਾਪਦਾ ਹ�।"
+
+#~| msgid "Error executing %s."
+#~ msgid "Error executing %s. (%s)"
+#~ msgstr "%s �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: (%s)"
+
+#~ msgid "Work Offline"
+#~ msgstr "�ਫ-ਲਾ�ਨ �ਾ�"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਫਲਾ�ਨ ਹ�ਣ ਦ� �ਾਰਵਾ� �ਧ�ਨ ਹ�।"
+
+#~ msgid "Unknown system error."
+#~ msgstr "�ਣ�ਾਣ ਸਿਸ�ਮ �ਲਤ� ਹ�।"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "�ਲਤ �ਰ��ਮਿੰ�"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "OAF ਤ� ਰ�ਿਸ�ਰ ਨਹ�� ਹ� ਸ�ਿ� ਹ�"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "ਸੰਰ�ਨਾ ਡਾ�ਾਬ�ਸ ਨਹ�� ਲੱਭਾ ਹ�"
+
+#~ msgid "New Test"
+#~ msgstr "ਨਵ�� �ਾ��"
+
+#~ msgid "Import File"
+#~ msgstr "�ਯਾਤ ਫਾ�ਲ"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ਨਹ�� ਹ� ਸ�ਦ�"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ਰ� ਨਹ�� ਹ� ਸ�ਦ� ਹ�।"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "ਤ�ਹਾਡ� ਸਿਸ�ਮ ਦ� ਸੰਰ�ਨਾ �ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹ�:\n"
+#~ "\n"
+#~ "ਵ�ਰਵ� ਲ� ਮੱਦਦ ਵ���।"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "ਤ�ਹਾਡ� ਸਿਸ�ਮ ਦ� ਸੰਰ�ਨਾ �ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ ਨਾਲ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹ�:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "ਵ�ਰਵ� ਲ� ਮੱਦਦ ਵ���।"
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>��ਤਰ ਮ�ੱਲ</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>ਨਿਸ਼ਾਨ</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>�ਸ ਨ� �ਾਰ� ��ਤਾ</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>�ਸ ਨ�ੰ �ਾਰ� ��ਤਾ</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "ਸਿਰ� ਫਰ�� ਵਿੰਡ� ਹ�"
+
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "'%s' ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s\n"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "%s (%s) ਨ�ੰ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�\n"
+
+#~ msgid "Copy"
+#~ msgstr "ਨ�ਲ"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ..."
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "ਨਵਾ� �ਡਰ�ੱਸ ਬ�ੱ� ਫ�ਲਡਰ ਬਣਾ�"
+
+#~ msgid "Cut"
+#~ msgstr "�ੱ��"
+
+#~ msgid "Forward Contact"
+#~ msgstr "ਸੰਪਰ� �ੱ��"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "ਫ�ਲਡਰ ਭ���..."
+
+#~ msgid "Paste"
+#~ msgstr "�ਿਪ�ਾ�"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "VCard �ੰ� ਸੰਭਾਲ�..."
+
+#~ msgid "Select _All"
+#~ msgstr "ਸਭ ��ਣ�(_A)"
+
+#~ msgid "Send message to contact"
+#~ msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���"
+
+#~ msgid "St_op"
+#~ msgstr "ਰ���(_o)"
+
+#~ msgid "Stop"
+#~ msgstr "ਰ���"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "ਫ�ਲਡਰ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� ਨ�ਲ(_C)"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "ਫ�ਲਡਰ ਸੰਪਰ� �ੱਥ� ਭ���(_M)"
+
+#~ msgid "_Rename"
+#~ msgstr "ਨਾ� ਬਦਲ�(_R)"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "ਸੰਪਰ� ਨ�ੰ VCard ਵਾ�� ਸੰਭਾਲ�(_S)..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "ਫ�ਲਡਰ ਸੰਪਰ� ਨ�ੰ VCard ਰਾਹ�� ਵਾ�� ਸੰਭਾਲ� (_S)"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�(_A)"
+
+#~ msgid "Show the working week"
+#~ msgstr "�ਾਰ��ਾਰ� ਹਫਤਾ ਵ��ਾ�"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "ਲਾ� ਸ�ਨ�ਹਿ�� ਲ� ਡ�ਬੱ� �ਨਸ��ਲ ਵ���"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "ਡ�ਬੱ� ਲਾ�(_D)"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਲ� ਨਾਲ-ਨਾਲ ਹ� ਵ��ਾ�"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "��ਣ� ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਿਪ�ਾ�"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "ਸਭ ਸ�ਨ�ਹ� ��ਣ�(_A)"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "ਸਭ ਤ� ਸਿਰ� �ਹ� ਸ�ਨ�ਹ� ��ਣ� �� �ਿ ਮ���ਦਾ ਸਮ�� ਨਹ�� ��ਣ�"
+
+#~ msgid "Not Junk"
+#~ msgstr "ਰੱਦ� ਨਹ��"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ��� ��ਪ�"
+
+#~ msgid "Select _All Text"
+#~ msgstr "ਸਭ ���ਸ� ��ਣ�(_A)"
+
+#~ msgid "_Save Message..."
+#~ msgstr "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�(_S)..."
+
+#~ msgid "Close"
+#~ msgstr "ਬੰਦ �ਰ�"
+
+#~ msgid "Main toolbar"
+#~ msgstr "ਮ�ੱ� ��ਲਬਾਰ"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "��ਣ� ਮ�ਮ� ਦ� ਨ�ਲ"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "��ਣ� ਮ�ਮ� �ੱ��"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "��ਣ� �ੰਮਾ� ਦ� ਨ�ਲ"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "��ਣ� �ੰਮ �ੱ��"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "ਸਮਾਪਤ ਲਿ��(_k)"
+
+#~ msgid "Show task preview window"
+#~ msgstr "�ੰਮ �ਲ� ਵਿੰਡ� ਵ��ਾ�"
+
+#~ msgid "About Evolution..."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ�..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "��ਲਬਾਰ ਦ� �ਲ� ਤਬਦ�ਲ"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr "ਯਾਦ ��ਤ� ਪਾਸਵਰਡ ਭ�ੱਲ ��, �ਸ�ਰ�� ਮ�� ਮੰ�� �ਾਣ��"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "ਵਿੰਡ� ਬ�ਨ �ਹਲ�"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "ਸਫ਼ਾ ਸ�ੱ��ੱਪ(_u)..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "ਮ�ਰ� ਪਸੰਦ(_n)"
+
+#~ msgid "Send / Receive"
+#~ msgstr "ਭ��� / ਲਵ�"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰ ਰਹ� ਹਾ�, ਨ�ੰ ਬਦਲ�"
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "ਹਾਲਤ ਪੱ�� ਵ��ਾ�/�ਹਲ�"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "ਹਾਲਤ ਪੱ�� ਵ��ਾ�/�ਹਲ�"
+
+#~ msgid "Work _Offline"
+#~ msgstr "�ਫ-ਲਾ�ਨ �ਾ�(_O)"
+
+#~ msgid "_About"
+#~ msgstr "�ਸ ਬਾਰ�(_A)"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲ(_F)"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "ਬ�ਨ �ਹਲ�(_H)"
+
+#~ msgid "_Quit"
+#~ msgstr "ਬਾਹਰ(_Q)"
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "ਸਿ�ਰ�ਨਾ��਼ ��ਣ(_S)..."
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>ਸਮਾ� ��ਤਰ</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>��ਣ(_S)</b>"
+
+#~ msgid "Save Custom View"
+#~ msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "����ਮ��� ਪੱ�� �ਹਲ�(_A)"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "�ਣ�ਾਣ �ੱ�ਰ ਸ�ੱ�: %s"
+
+#~ msgid "_Searches"
+#~ msgstr "���(_S)"
+
+#~ msgid "Choose Image"
+#~ msgstr "�ਿੱਤਰ ��ਣ�"
+
+#~ msgid "Empty message"
+#~ msgstr "�ਾਲ� ਸ�ਨ�ਹਾ"
+
+#~ msgid "Reflow model"
+#~ msgstr "ਮ��-ਵਹਾ ਮਾਡਲ"
+
+#~ msgid "Column width"
+#~ msgstr "�ਾਲਮ ���ਾ�"
+
+#~ msgid "Search"
+#~ msgstr "���"
+
+#~ msgid "_Clear"
+#~ msgstr "ਸਾ�(_C)"
+
+#~ msgid "Item ID"
+#~ msgstr "���ਮ ID"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>�ਵਾਬ</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>ਸਥਿਤ� ���</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "�ਮ\n"
+#~ "ਮਲ���ਤ\n"
+#~ "ਲ��ਵਾ�\n"
+#~ "��ਪਤ\n"
+#~ "ਬਹ�ਤ ��ਪਤ\n"
+#~ "ਸਿਰਫ਼ ਤ�ਹਾਡ� ਲ�"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "ਨਾ-ਪ�ਰਭਾਸ਼ਤ\n"
+#~ "�ੱ�\n"
+#~ "ਮਿ�ਰ�\n"
+#~ "�ੱ�"
+
+#~ msgid "Add a column..."
+#~ msgstr "�ਾਲਮ ਸ਼ਾਮਲ..."
+
+#~ msgid "Field Chooser"
+#~ msgstr "��ਤਰ ��ਣ�ਾਰ"
+
+#~ msgid "Tree"
+#~ 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 "�-ਮ�ਲ �ਡਰ�ੱਸ"
 
@@ -23131,12 +25242,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Search filter"
 #~ msgstr "��� ਫਿਲ�ਰ"
 
-#~ msgid "Sub"
-#~ msgstr "�ਧ�ਨ"
-
-#~ msgid "Using email address"
-#~ msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��"
-
 #~ msgid "Whenever Possible"
 #~ msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ�"
 
@@ -23725,9 +25830,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Serbia And Montenegro"
 #~ msgstr "ਸਰਬ�� ��ਡ ਮ�ਨ����ਰ�"
 
-#~ msgid "Seychelles"
-#~ msgstr "ਸ���ਿਲਸ"
-
 #~ msgid "Sierra Leone"
 #~ msgstr "ਸ��ਰ� ਲਿ�ਨ"
 
@@ -23908,39 +26010,6 @@ 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 ��ਾ��� ਸ਼ਾਮਿਲ �ਰ�"
 
@@ -23992,9 +26061,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Immediately follow each other"
 #~ msgstr "ਹ�ਣ� ਹਰ ਬਾ�ਦ �ਰ�"
 
-#~ msgid "Include:"
-#~ msgstr "ਸ਼ਾਮਿਲ:"
-
 #~ msgid "Landscape"
 #~ msgstr "ਲ�ਡਸ��ਪ"
 
@@ -24010,9 +26076,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Number of columns:"
 #~ msgstr "�ਾਲਮਾ� ਦ� �ਿਣਤ�:"
 
-#~ msgid "Options"
-#~ msgstr "��ਣ"
-
 #~ msgid "Orientation"
 #~ msgstr "ਸਥਿਤ�"
 
@@ -24067,21 +26130,6 @@ 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)"
 
@@ -24093,30 +26141,12 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ 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>"
 
@@ -24126,57 +26156,9 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ 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 "���-ਸੰਭਾਲ� ਫਾ�ਲ ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
@@ -24198,21 +26180,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ 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 "ਸ�ਨ�ਹਾ ਲਿ� �ਾ ਰਿਹਾ ਹ�..."
 
@@ -24292,27 +26259,9 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ 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):"
 
@@ -24546,9 +26495,6 @@ 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"
@@ -24563,9 +26509,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "A widget to display in place of the usual expander label"
 #~ msgstr "�ਮ ਫ�ਲਾ� ਲ�ਬਲ ਦ� ਥਾ� ਤ� �ੱ� ਵਿਦ�ਿ� ਵ��ਾ�"
 
-#~ msgid "Indicator Spacing"
-#~ msgstr "ਸੰ��ਤ� ਥਾ�"
-
 #~ msgid "Spacing around expander arrow"
 #~ msgstr "ਫ�ਲਾ� ਤ�ਰ ਦ��ਲ� �ਾਲ� ਥਾ�"
 



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