[evolution/gnome-2-28] Updating translation for typo fix by A S Alam



commit c3e0b86cbb31e256b11bac7b2aa15715a71236cf
Author: A S Alam <aalam users sf net>
Date:   Sun Dec 6 20:16:47 2009 +0530

    Updating translation for typo fix by A S Alam

 po/pa.po | 1107 +++++++++++++++++++++++++-------------------------------------
 1 files changed, 450 insertions(+), 657 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 133d1ad..1fd011a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2009-08-28 13:23+0000\n"
-"PO-Revision-Date: 2009-09-13 11:35+0530\n"
+"POT-Creation-Date: 2009-10-16 14:15+0000\n"
+"PO-Revision-Date: 2009-12-06 19:53+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"
@@ -41,7 +41,7 @@ msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�"
 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 �ਾਰਡ"
+msgstr[1] "ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -379,10 +379,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 "
@@ -527,7 +523,7 @@ msgstr "ਸ਼ਾਮਿਲ(_A)"
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
-msgstr "ਰੱਦ �ਰ�(_D)"
+msgstr "�ਣਡਿੱਠਾ(_D)"
 
 #: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
@@ -587,7 +583,6 @@ 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 "ਸੰਪਰ� �ਤ� ਸਵ�-ਪ�ਰਨ ਸੰਰ�ਨਾ �ੱਥ� ਦਿ��"
 
@@ -835,7 +830,7 @@ msgstr "ਤਬਦ�ਲ ਹ� ਰਿਹਾ ਹ�..."
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
-msgstr "'%s' ਨ�ੰ ਤਬਦ�ਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
+msgstr "'%s' ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -959,7 +954,7 @@ msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/google-account-setup/google-source.c:519
 #: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1031,13 +1026,11 @@ 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 "��ਬਲ �ਾਲਮ:"
 
@@ -1047,7 +1040,7 @@ msgstr "�ਡਰ�ਸ ਬ�ੱ� ਵਿੱ� ���"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
-msgstr "੧"
+msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid ""
@@ -1061,7 +1054,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
-msgstr "à©«"
+msgstr "5"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
@@ -1076,7 +1069,6 @@ 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"
@@ -1100,7 +1092,6 @@ msgid "Lo_gin:"
 msgstr "ਲਾ��ਨ(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-#| msgid "One"
 msgid ""
 "One\n"
 "Sub"
@@ -1131,16 +1122,12 @@ 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"
@@ -1230,7 +1217,7 @@ msgstr "�ਾਰਡ"
 #: ../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-source.c:740
 #: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "ਮਿੰ�"
@@ -1256,7 +1243,6 @@ 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>"
 
@@ -1294,7 +1280,7 @@ msgstr "ਸੰਪਰ�"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:556
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
-msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
+msgstr "ਸੰਪਰ� �ਡ��ਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
@@ -1377,11 +1363,11 @@ msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
-msgstr "ਮ�ੱ� ਸਫਾ(_H):"
+msgstr "ਮ�ੱ� ਸਫ਼ਾ(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
-msgstr "ਪ�ਰਬੰਧ�(_M):"
+msgstr "ਮ�ਨ��ਰ(_M):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
@@ -1410,7 +1396,7 @@ msgstr "�ਾ��ਲ(_T):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
-msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ(_V):"
+msgstr "ਵਿਡ�� �ੱਲਬਾਤ(_V):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
@@ -1463,7 +1449,7 @@ msgstr "AIM"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
-msgstr "�ਾਬਰ"
+msgstr "�ੱਬਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:608
@@ -1537,13 +1523,13 @@ msgstr "ਲ���ਦ� ��ਤਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
-msgstr "ਤਬਦ�ਲ"
+msgstr "ਬਦਲਿ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:551
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
+msgstr "ਸੰਪਰ� ਸੰਪਾਦ� - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
@@ -1579,7 +1565,7 @@ msgstr "%s'%s' �ਾਲ� ਹ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
-msgstr "�ਲਤ ਸੰਬੰਧ"
+msgstr "�ਲਤ ਸੰਪਰ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
@@ -1786,7 +1772,7 @@ msgstr "ਮਿਲਾਨ(_M)"
 msgid "Merge Contact"
 msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../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
@@ -2260,12 +2246,12 @@ msgstr "�ਰਸਰ ਹ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
-msgstr "ਹਮ�ਸ਼ਾ �ਲਾ�ਾਰ� ਵਿੱ� ��ਲ�ਹ�(_O)"
+msgstr "ਲਿੰ� ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
 #: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
-msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
+msgstr "ਲਿੰ� �ਿ�ਾਣਾ �ਾਪ� �ਰ�(_C)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
@@ -2274,7 +2260,7 @@ msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 #: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
-msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
+msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:286
 #: ../addressbook/gui/widgets/eab-contact-display.c:360
@@ -2291,7 +2277,7 @@ msgstr "ਨ�ਸ਼ਾ"
 #: ../addressbook/gui/widgets/eab-contact-display.c:475
 #: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
-msgstr "ਸ��� ਮ��ਬਰ"
+msgstr "ਲਿਸ� ਮ��ਬਰ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
@@ -2307,7 +2293,7 @@ msgstr "ਸਥਿਤ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
-msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
+msgstr "ਵਿਡ�� �ੱਲਬਾਤ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:626
 #: ../calendar/gui/calendar-commands.c:89
@@ -2411,7 +2397,7 @@ msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
-msgstr "ਸਬੰਧ ਨਹ� ਲੱਭਾ"
+msgstr "ਸੰਪਰ� ਨਹ�� ਲੱਭਾ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -2429,7 +2415,7 @@ msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 #: ../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
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2585
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
@@ -2453,7 +2439,7 @@ msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲਾ�਼ਮ� ਹ�"
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
-msgstr "TLS �ਪਲੱਬਧ ਨਹ� ਹ�"
+msgstr "TLS �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
@@ -2558,7 +2544,7 @@ msgstr "�ਹ �ਿ�ਰ� ਨ�ੰ ਸਫਲਤਾਪ�ਰ� ਪ�ਰ
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
-msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
+msgstr "ਲਿਸ� ਸ਼ਾਮਲ �ਰਨ ਲ� �ਲਤ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
 #: ../addressbook/gui/widgets/eab-gui-util.c:685
@@ -2567,7 +2553,7 @@ msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
-msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
+msgstr "ਲਿਸ� ਸ�ਧਣ '� �ਲਤ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
@@ -2591,10 +2577,10 @@ 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"
-"�� ਤ�ਸ�� �ੰਨ� ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
+"ਸੰਪਰ� %d ��ਦ ਹ� %d  ਨਵ�� ਵਿੰਡ� ��ਲ�ਹ ਦ�ਵ��ਾ।\n"
+"�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਵ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 msgstr[1] ""
-"ਸੰਪਰ� %d ��ਦ ਹ� %d �ਰ��� ��ਲ ਦ�ਣ��।\n"
+"ਸੰਪਰ� %d ��ਦ ਹ� %d ਵਿੰਡ��਼ ��ਲ�ਹ ਦ�ਣ��।\n"
 "�� ਤ�ਸ�� �ੰਨ� ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:324
@@ -2617,7 +2603,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
-msgstr "�ੱਪਰ ਲਿ��"
+msgstr "�ੱਤ� ਲਿ��"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
@@ -2640,7 +2626,7 @@ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
-msgstr "ਸ���"
+msgstr "ਲਿਸ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
@@ -2648,7 +2634,7 @@ msgstr "ਸੰਪਰ� ਭ���"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
-msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
+msgstr "ਸੰਪਰ� �ਾਪ� �ਰ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
@@ -2656,7 +2642,7 @@ msgstr "ਸੰਪਰ� ਭ���"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
-msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
+msgstr "ਸੰਪਰ� ਦ� �ਾਪ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
@@ -2692,7 +2678,7 @@ msgstr "�ਾਰਡ ਵ��ਾ�"
 #: ../calendar/importers/icalendar-importer.c:310
 #: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
-msgstr "�ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
+msgstr "�ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
 #: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
@@ -2700,7 +2686,7 @@ msgstr "���ਲ�ੱ� CSV �ਾ� ��ਬ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
-msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ਯਾਤ�ਾਰ"
+msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ੰਪ�ਰ�ਰ"
 
 #: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
@@ -2716,7 +2702,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਾ� ��ਬ (.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ੰਪ�ਰ�ਰ"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -2724,7 +2710,7 @@ msgstr "LDAP ਡਾ�ਾ �ੰਤਰ ਤਬਦ�ਲ� ਫਾਰਮ�� (.l
 
 #: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ੰਪ�ਰ�ਰ"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
@@ -2738,7 +2724,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
-msgstr "ਫਾ�ਲ ਨਹ�� ��ਲ� �ਾ ਸ�� ਹ�"
+msgstr "ਫਾ�ਲ ਨਹ�� ��ਲ�ਹ� �ਾ ਸ�� ਹ�"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
@@ -2746,7 +2732,7 @@ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� ਸ��� ਨ�ੰ ਪ�ਰ
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
-msgstr "�ਿਤਾਬ ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
+msgstr "�ਿਤਾਬ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
@@ -2758,7 +2744,7 @@ msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
-msgstr "ਸਥਾਨ� �ਡਰ�ੱਸ ਫ�ਲਡਰਾ� ਦ� ਸ���"
+msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਫ�ਲਡਰਾ� ਦ� ਸ���"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
@@ -3242,22 +3228,22 @@ msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�
 
 #: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
-msgstr "ਮ�ਲ ਪਹਿਲ:"
+msgstr "ਡਿਫਾਲ� ਪਹਿਲ:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1091
 #: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
-msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1136
 #: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
-msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
-msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
+msgstr "��ਲੰਡਰ �ਤ� �ੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:819
@@ -3311,7 +3297,7 @@ 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/gnome-cal.c:1714 ../calendar/gui/print.c:2010
 #: ../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
@@ -3351,7 +3337,7 @@ msgstr[1] "ਮਿੰ�"
 #: ../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-source.c:741
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
@@ -3373,8 +3359,8 @@ 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/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
@@ -3409,32 +3395,32 @@ msgstr "ਬ��ਾਰ(_S)"
 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-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1566
 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:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No description available."
 msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No location information available."
 msgstr "��� �ਿ�ਾਣਾ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
 #, 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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1666
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
 #: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3446,7 +3432,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ੱ� ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱ��ਿੱ� ਬ�ਸਾ ਹ�\n"
 "ਵ��ਾ ਸ����।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3462,9 +3448,9 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਸ �ਾਰ� ਨ�ੰ �ਲਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
 msgid "Do not ask me about this program again."
-msgstr "�ਸ �ਾਰ� ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
+msgstr "�ਸ ਪਰ��ਰਾਮ ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
@@ -3567,7 +3553,6 @@ msgid "Default appointment reminder"
 msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-#| msgid "Default reminder units"
 msgid "Default recurrence count"
 msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
 
@@ -3621,11 +3606,11 @@ msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "�ਾਰ��ਾਰ� ਦਿਨ �ੰਤ ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
+msgstr "�ਾਰ��ਾਰ� ਦਿਨ �ੰਤ ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� 0 ਤ�� 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
+msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� 0 ਤ�� 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -3672,11 +3657,11 @@ msgstr "ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
-msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, ੦ ਤ�� ੫੯"
+msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, 0 ਤ�� 59"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
-msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, ੦ ਤ�� ੫੯"
+msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, 0 ਤ�� 59"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
@@ -3703,7 +3688,7 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
+"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
@@ -3711,7 +3696,7 @@ msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
+"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
@@ -3743,17 +3728,14 @@ msgstr ""
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#| msgid "Print this calendar"
 msgid "Primary calendar"
 msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#| msgid "New memo list"
 msgid "Primary memo list"
 msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-#| msgid "New task list"
 msgid "Primary task list"
 msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
 
@@ -3907,7 +3889,6 @@ msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"day
 msgstr "�ਾਸ� �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-#| msgid "_Use system defaults"
 msgid "Use system timezone"
 msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
 
@@ -3981,7 +3962,7 @@ msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� ੪ �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
+msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� 4 �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -4013,14 +3994,13 @@ msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
-msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
+msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� �ੰ�ਾ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
 
 #: ../calendar/gui/cal-editor-utils.c:100
-#| msgid "Invalid contact."
 msgid "Invalid object"
 msgstr "�ਲਤ �ਬ����"
 
@@ -4046,7 +4026,7 @@ msgstr "�ਿ�ਾਣਾ ਵਿੱ� ਸ਼ਾਮਿਲ"
 
 #: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
-msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
+msgstr "�ੱ�� 7 ਦਿਨ ਦ��� �ਾਸ�ਾ�"
 
 #: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
@@ -4070,7 +4050,7 @@ msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
 
 #: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
-msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
+msgstr "��ਲ� 7 ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
 
 #: ../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
@@ -4096,7 +4076,7 @@ msgstr "�ਸ ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਸ�
 #: ../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-source.c:742
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
@@ -4108,7 +4088,7 @@ msgstr "ਦਿਨ"
 #: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
 #: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
-msgstr "ਵ�ੱਬ ਤ�"
+msgstr "ਵ�ੱਬ �ੱਤ�"
 
 #: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
@@ -4129,7 +4109,7 @@ msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)"
 #: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
 #: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
-msgstr "ਨ�ਲ(_C)..."
+msgstr "�ਾਪ� �ਰ�(_C)..."
 
 #: ../calendar/gui/calendar-component.c:632
 #: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
@@ -4303,7 +4283,7 @@ msgstr "ਨਿੱ��"
 #: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
 #: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
-msgstr "ਸਰਵ�ਨ�"
+msgstr "ਪਬਲਿ�"
 
 #: ../calendar/gui/caltypes.xml.h:16
 #: ../calendar/gui/dialogs/event-editor.c:304
@@ -4422,11 +4402,11 @@ msgstr "ਨ�ੰ ਭ���:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
-msgstr "�ਰ��ਮਿੰ�(_A):"
+msgstr "�ਰ��ਮ���(_A):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
-msgstr "�ਾਰ�(_P):"
+msgstr "ਪਰ��ਰਾਮ(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
@@ -4437,7 +4417,6 @@ msgid "_Sound:"
 msgstr "�ਵਾ�(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-#| msgid "before"
 msgid ""
 "before\n"
 "after"
@@ -4450,10 +4429,6 @@ 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"
@@ -4464,10 +4439,6 @@ msgstr ""
 "ਦਿਨ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#| msgid ""
-#| "Minutes\n"
-#| "Hours\n"
-#| "Days"
 msgid ""
 "minutes\n"
 "hours\n"
@@ -4478,7 +4449,6 @@ msgstr ""
 "ਦਿਨ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-#| msgid "start of appointment"
 msgid ""
 "start of appointment\n"
 "end of appointment"
@@ -4517,7 +4487,7 @@ msgstr "ਫਾ�ਲ ����"
 #: ../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
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:946
 #: ../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
@@ -4536,12 +4506,10 @@ msgid "Selected Calendars for Alarms"
 msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#| msgid "Time zone:"
 msgid "Time and date:"
 msgstr "ਸਮਾ� �ਤ� ਮਿਤ�:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
-#| msgid "Date:"
 msgid "Date only:"
 msgstr "��ਵਲ ਮਿਤ�:"
 
@@ -4557,19 +4525,18 @@ msgid ""
 "10 minutes\n"
 "05 minutes"
 msgstr ""
-"੬੦ ਮਿੰ�\n"
-"੩੦ ਮਿੰ�\n"
-"੧੫ ਮਿੰ�\n"
-"੧੦ ਮਿੰ�\n"
-"੦੫ ਮਿੰ�"
+"60 ਮਿੰ�\n"
+"30 ਮਿੰ�\n"
+"15 ਮਿੰ�\n"
+"10 ਮਿੰ�\n"
+"05 ਮਿੰ�"
 
 #: ../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>"
+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>"
 
@@ -4580,7 +4547,6 @@ 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>"
 
@@ -4615,7 +4581,6 @@ msgid "Display"
 msgstr "ਡਿਸਪਲ��"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#| msgid "Show display alarms in notification tray"
 msgid "Display alarms in _notification area only"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���(_n)"
 
@@ -4746,7 +4711,6 @@ msgid "Tuesday"
 msgstr "ਮੰ�ਲਵਾਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#| msgid "Show the second time zone"
 msgid "Use s_ystem time zone"
 msgstr "ਸਿਸ�ਮ ਸਮਾ� ��ਤਰ ਵਰਤ��(_y)"
 
@@ -4767,11 +4731,11 @@ msgstr "�ਾਰ�� ਦਿਨ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
-msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
+msgstr "_12 �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
-msgstr "_੨੪ �ੰ��"
+msgstr "_24 �ੰ��"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
@@ -4937,28 +4901,27 @@ 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:189 ../calendar/gui/print.c:2386
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2390
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2392
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2397
 msgid " (Due "
 msgstr " (ਬਾ�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2399
 msgid "Due "
 msgstr "ਬਾ�� "
 
 #: ../calendar/gui/dialogs/comp-editor.c:224
-#| msgid "Save attachments"
 msgid "Could not save attachments"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
@@ -5500,7 +5463,6 @@ msgstr ""
 "b"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#| msgid "until"
 msgid ""
 "for\n"
 "until"
@@ -5508,7 +5470,7 @@ msgstr ""
 "ਲ�\n"
 "�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2506
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
@@ -5639,7 +5601,6 @@ msgstr "��ਥਾ"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1039
-#| msgid "Width"
 msgid "fifth"
 msgstr "ਪੰ�ਵਾ�"
 
@@ -5663,7 +5624,7 @@ msgstr "ਹ�ਰ ਮਿਤ�"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
-msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
+msgstr "1ਲ� ਤ�� 10ਵਾ�"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -5671,7 +5632,7 @@ msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
-msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
+msgstr "11ਵ�� ਤ�� 20ਵਾ�"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -5679,7 +5640,7 @@ msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
-msgstr "੨੧ਵ�� ਤ�� ੩੧ਵਾ�"
+msgstr "21ਵ�� ਤ�� 31ਵਾ�"
 
 #. 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
@@ -5773,7 +5734,6 @@ 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)"
 
@@ -5865,8 +5825,6 @@ 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 "�ਾਸ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
@@ -5977,27 +5935,22 @@ 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)"
 
@@ -6008,7 +5961,7 @@ 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:170 ../filter/filter-rule.c:863
 msgid "Untitled"
 msgstr "ਬਿਨਾ� ਨਾ�"
 
@@ -6054,7 +6007,7 @@ msgstr "ਸਥਿਤ�:"
 #: ../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
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2579
 msgid "In Progress"
 msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 
@@ -6066,7 +6019,7 @@ msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 #: ../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
+#: ../calendar/gui/print.c:2582 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
@@ -6075,7 +6028,7 @@ msgstr "ਸਮਾਪਤ"
 #: ../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/e-calendar-table.c:658 ../calendar/gui/print.c:2576
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
@@ -6091,7 +6044,7 @@ 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/e-cal-model.c:1081 ../calendar/gui/e-calendar-table.c:586
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
@@ -6116,7 +6069,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 "��ਰ� ਸ�ਧ"
 
@@ -6146,7 +6098,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1087
 #: ../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
@@ -6154,7 +6106,7 @@ msgstr ""
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1087
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6176,11 +6128,11 @@ msgstr "ਨਹ�"
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1083
 msgid "Recurring"
 msgstr "�ਵਿਰਤ�"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1085
 msgid "Assigned"
 msgstr "�ਾਰ� ��ਤ�"
 
@@ -6217,47 +6169,47 @@ msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
 #: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
-msgstr "੦%"
+msgstr "0%"
 
 #: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
-msgstr "੧੦%"
+msgstr "10%"
 
 #: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
-msgstr "੨੦%"
+msgstr "20%"
 
 #: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
-msgstr "੩੦%"
+msgstr "30%"
 
 #: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
-msgstr "੪੦%"
+msgstr "40%"
 
 #: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
-msgstr "੫੦%"
+msgstr "50%"
 
 #: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
-msgstr "੬੦%"
+msgstr "60%"
 
 #: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
-msgstr "੭੦%"
+msgstr "70%"
 
 #: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
-msgstr "੮੦%"
+msgstr "80%"
 
 #: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
-msgstr "੯੦%"
+msgstr "90%"
 
 #: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
-msgstr "੧੦੦%"
+msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:897
 #: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
@@ -6282,7 +6234,7 @@ msgstr "ਨਵਾ� �ੰਮ(_T)"
 
 #: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
-msgstr "ਵ�ੱਬ ਸਫਾ ��ਲ�(_W)"
+msgstr "ਵ�ੱਬ ਸਫ਼ਾ ��ਲ�ਹ�(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1593
 #: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
@@ -6496,7 +6448,7 @@ msgid "Needs action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. 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:2449 ../calendar/gui/print.c:2538
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
@@ -6547,7 +6499,7 @@ msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 #. 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-week-view-main-item.c:359 ../calendar/gui/print.c:1703
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -6877,7 +6829,7 @@ msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��
 
 #: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
-msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
+msgstr "�ੱਪਡ�� ਪ�ਰਨ\n"
 
 #: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
@@ -6902,11 +6854,11 @@ msgstr "ਦਰਸ਼� ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� �
 
 #: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
-msgstr "��ਾ� ਭ���!\n"
+msgstr "���ਮ ਭ���!\n"
 
 #: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
-msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
+msgstr "���ਮ ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
 
 #: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
@@ -7074,13 +7026,13 @@ msgstr "%A, %B %d, %Y"
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
 #: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
 #: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
@@ -7194,7 +7146,7 @@ msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 #: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
-msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
+msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ�ਹ ਰਿਹਾ ਹ�"
 
 #: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
@@ -7207,7 +7159,7 @@ msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 #: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "%s ਤ� �ੰਮ ��ਲ ਰਿਹਾ ਹ�"
+msgstr "%s ਤ� �ੰਮ ��ਲ�ਹ ਰਿਹਾ ਹ�"
 
 #: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
@@ -7227,7 +7179,7 @@ msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1684
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -7263,7 +7215,7 @@ msgstr "%s �ੱਤ� ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 msgid "Opening %s"
 msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/gnome-cal.c:4012
+#: ../calendar/gui/gnome-cal.c:4018
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -7377,7 +7329,7 @@ msgstr "ਪ�ਰਤ�ਨਿਧ�"
 #: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
-msgstr "ਨਵ�ਨ"
+msgstr "�ੱਪਡ��"
 
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
@@ -7539,127 +7491,127 @@ msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ
 
 #: ../calendar/gui/print.c:511
 msgid "1st"
-msgstr "੧ਲਾ�"
+msgstr "1ਲਾ�"
 
 #: ../calendar/gui/print.c:511
 msgid "2nd"
-msgstr "੨�ਾ"
+msgstr "2�ਾ"
 
 #: ../calendar/gui/print.c:511
 msgid "3rd"
-msgstr "੩�ਾ"
+msgstr "3�ਾ"
 
 #: ../calendar/gui/print.c:511
 msgid "4th"
-msgstr "੪ਵਾ�"
+msgstr "4ਵਾ�"
 
 #: ../calendar/gui/print.c:511
 msgid "5th"
-msgstr "੫ਵਾ�"
+msgstr "5ਵਾ�"
 
 #: ../calendar/gui/print.c:512
 msgid "6th"
-msgstr "੬ਵਾ�"
+msgstr "6ਵਾ�"
 
 #: ../calendar/gui/print.c:512
 msgid "7th"
-msgstr "੭ਵਾ�"
+msgstr "7ਵਾ�"
 
 #: ../calendar/gui/print.c:512
 msgid "8th"
-msgstr "੮ਵਾ�"
+msgstr "8ਵਾ�"
 
 #: ../calendar/gui/print.c:512
 msgid "9th"
-msgstr "੯ਵਾ�"
+msgstr "9ਵਾ�"
 
 #: ../calendar/gui/print.c:512
 msgid "10th"
-msgstr "੧੦ਵਾ�"
+msgstr "10ਵਾ�"
 
 #: ../calendar/gui/print.c:513
 msgid "11th"
-msgstr "੧੧ਵਾ�"
+msgstr "11ਵਾ�"
 
 #: ../calendar/gui/print.c:513
 msgid "12th"
-msgstr "੧੨ਵਾ�"
+msgstr "12ਵਾ�"
 
 #: ../calendar/gui/print.c:513
 msgid "13th"
-msgstr "੧੩ਵਾ�"
+msgstr "13ਵਾ�"
 
 #: ../calendar/gui/print.c:513
 msgid "14th"
-msgstr "੧੪ਵਾ�"
+msgstr "14ਵਾ�"
 
 #: ../calendar/gui/print.c:513
 msgid "15th"
-msgstr "੧੫ਵਾ�"
+msgstr "15ਵਾ�"
 
 #: ../calendar/gui/print.c:514
 msgid "16th"
-msgstr "੧੬ਵਾ�"
+msgstr "16ਵਾ�"
 
 #: ../calendar/gui/print.c:514
 msgid "17th"
-msgstr "੧੭ਵਾ�"
+msgstr "17ਵਾ�"
 
 #: ../calendar/gui/print.c:514
 msgid "18th"
-msgstr "੧੮ਵਾ�"
+msgstr "18ਵਾ�"
 
 #: ../calendar/gui/print.c:514
 msgid "19th"
-msgstr "੧੯ਵਾ�"
+msgstr "19ਵਾ�"
 
 #: ../calendar/gui/print.c:514
 msgid "20th"
-msgstr "੨੦ਵਾ�"
+msgstr "20ਵਾ�"
 
 #: ../calendar/gui/print.c:515
 msgid "21st"
-msgstr "੨੧ਵਾ�"
+msgstr "21ਵਾ�"
 
 #: ../calendar/gui/print.c:515
 msgid "22nd"
-msgstr "੨੨ਵਾ�"
+msgstr "22ਵਾ�"
 
 #: ../calendar/gui/print.c:515
 msgid "23rd"
-msgstr "੨੩ਵਾ�"
+msgstr "23ਵਾ�"
 
 #: ../calendar/gui/print.c:515
 msgid "24th"
-msgstr "੨੪ਵਾ�"
+msgstr "24ਵਾ�"
 
 #: ../calendar/gui/print.c:515
 msgid "25th"
-msgstr "੨੫ਵਾ�"
+msgstr "25ਵਾ�"
 
 #: ../calendar/gui/print.c:516
 msgid "26th"
-msgstr "੨੬ਵਾ�"
+msgstr "26ਵਾ�"
 
 #: ../calendar/gui/print.c:516
 msgid "27th"
-msgstr "੨੭ਵਾ�"
+msgstr "27ਵਾ�"
 
 #: ../calendar/gui/print.c:516
 msgid "28th"
-msgstr "੨੮ਵਾ�"
+msgstr "28ਵਾ�"
 
 #: ../calendar/gui/print.c:516
 msgid "29th"
-msgstr "੨੯ਵਾ�"
+msgstr "29ਵਾ�"
 
 #: ../calendar/gui/print.c:516
 msgid "30th"
-msgstr "੩੦ਵਾ�"
+msgstr "30ਵਾ�"
 
 #: ../calendar/gui/print.c:517
 msgid "31st"
-msgstr "੩੧ਵਾ�"
+msgstr "31ਵਾ�"
 
 #: ../calendar/gui/print.c:593
 msgid "Su"
@@ -7687,51 +7639,51 @@ msgstr "ਸ਼�ੱ�ਰ"
 
 #: ../calendar/gui/print.c:594
 msgid "Sa"
-msgstr "ਸ਼ਨਿ�ੱਰ"
+msgstr "ਸ਼ਨਿੱ�ਰ"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2502
 msgid "Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2504
 msgid "Task"
 msgstr "�ਾਸ�"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2529
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2552
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2592
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2606
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2621
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2632
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2645
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2656
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
@@ -7859,7 +7811,7 @@ msgstr "iCalendar ਫਾ�ਲਾ� (.ics)"
 
 #: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ੰਪ�ਰ�ਰ"
 
 #: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
@@ -7871,7 +7823,7 @@ msgstr "vCalendar ਫਾ�ਲਾ� (.vcf)"
 
 #: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ੰਪ�ਰ�ਰ"
 
 #: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
@@ -7879,7 +7831,7 @@ msgstr "��ਲੰਡਰ ��ਨਾਵਾ�"
 
 #: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ਼ਲ ��ਲੰਡਰ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ਼ਲ ��ਲੰਡਰ �ੰਪ�ਰ�ਰ"
 
 #  * These are the timezone names from the Olson timezone data.
 #  * We only place them here so gettext picks them up for translation.
@@ -8575,7 +8527,7 @@ msgstr "�ਮਰ��ਾ/��ਰ��ਲਾ"
 
 #: ../calendar/zones.h:192
 msgid "America/Vancouver"
-msgstr "�ਮਰ��ਾ/ਵਾ����ਵ�ਰ"
+msgstr "�ਮਰ��ਾ/ਵ�ਨ��ਰਵਰ"
 
 #: ../calendar/zones.h:193
 msgid "America/Whitehorse"
@@ -8667,7 +8619,7 @@ msgstr "�ਸ਼��/ਬ�ਦਾਦ"
 
 #: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
-msgstr "�ਸ਼��/ਬਹਿਰਾਨ"
+msgstr "�ਸ਼��/ਬਹਿਰ�ਨ"
 
 #: ../calendar/zones.h:216
 msgid "Asia/Baku"
@@ -8691,7 +8643,7 @@ msgstr "�ਸ਼��/ਬਰ�ਨ�"
 
 #: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
-msgstr "�ਸ਼��/�ੱਲ�ਤਾ"
+msgstr "�ਸ਼��/�ਲ�ੱਤਾ"
 
 #: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
@@ -8747,7 +8699,7 @@ msgstr "�ਸ਼��/�ਰ���ਸ�"
 
 #: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
-msgstr "�ਸ਼��/�ਸਤਾਲਬ�ਲ"
+msgstr "�ਸ਼��/�ਸਤਾ�ਬ�ਲ"
 
 #: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
@@ -8763,7 +8715,7 @@ msgstr "�ਸ਼��/��ਰ�ਸ਼�ਲਮ"
 
 #: ../calendar/zones.h:239
 msgid "Asia/Kabul"
-msgstr "�ਸ਼��/�ਾਬਲ"
+msgstr "�ਸ਼��/�ਾਬ�ਲ"
 
 #: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
@@ -8779,7 +8731,7 @@ msgstr "�ਸ਼��/�ਾਸ਼�ਾਰ"
 
 #: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
-msgstr "�ਸ਼��/�ਾਠਮੰਡ�"
+msgstr "�ਸ਼��/�ਾਠਮਾ�ਡ�"
 
 #: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
@@ -8859,7 +8811,7 @@ msgstr "�ਸ਼��/����ਲ�ਰਡਾ"
 
 #: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
-msgstr "�ਸ਼��/ਰੰ�ਾਨ�"
+msgstr "�ਸ਼��/ਰੰ�ਾਨ�ੰ"
 
 #: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
@@ -8947,51 +8899,51 @@ msgstr "�ਸ਼��/ਯ�ਰ�ਵਾਨ"
 
 #: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
-msgstr "��ਲਾ�ਾ/���ਰ�ਸ"
+msgstr "��ਲਾ��ਾ/���ਰ�ਸ"
 
 #: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
-msgstr "��ਲਾ�ਾ/ਬਾਰਮ�ਦਾ"
+msgstr "��ਲਾ��ਾ/ਬਾਰਮ�ਦਾ"
 
 #: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
-msgstr "��ਲਾ�ਾ/�ਾਨਾਰ�"
+msgstr "��ਲਾ��ਾ/�ਾਨਾਰ�"
 
 #: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
-msgstr "��ਲਾ�ਾ/�ਾਪ� ਵਾਰਡ�"
+msgstr "��ਲਾ��ਾ/�ਾਪ� ਵਾਰਡ�"
 
 #: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
-msgstr "��ਲਾ�ਾ/ਫਾ�ਰ��"
+msgstr "��ਲਾ��ਾ/ਫਾ�ਰ��"
 
 #: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
-msgstr "��ਲਾ�ਾ/�ਾਨ ਮ�ਯਾਨ"
+msgstr "��ਲਾ��ਾ/�ਾਨ ਮ�ਯਾਨ"
 
 #: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
-msgstr "��ਲਾ�ਾ/ਮਾਡ��ਰਾ"
+msgstr "��ਲਾ��ਾ/ਮਾਡ��ਰਾ"
 
 #: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
-msgstr "�ਲਾ��ਿ�/ਰ����ਾਵਿ�"
+msgstr "��ਾਲਾ��ਾ/ਰ����ਾਵਿ�"
 
 #: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
-msgstr "��ਲਾ�ਾ/ਦੱ�ਣ� �ਾਰ���"
+msgstr "��ਲਾ��ਾ/ਦੱ�ਣ� �ਾਰ���"
 
 #: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
-msgstr "���ਲਾ�ਿ�ਾ/ਸ��� ਹ�ਲ�ਨਾ"
+msgstr "��ਲਾ��ਾ/ਸ��� ਹ�ਲ�ਨਾ"
 
 #: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
-msgstr "��ਲਾ�ਾ/ਸ�ਾਲ�ਨ"
+msgstr "��ਲਾ��ਾ/ਸ�ਾਲ�ਨ"
 
 #: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
-msgstr "�ਸ�ਰ�ਲ��/�ਡ�ਲਾਡ�"
+msgstr "�ਸ�ਰ�ਲ��/�ਡ�ਲ��ਡ"
 
 #: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
@@ -9023,7 +8975,7 @@ msgstr "�ਸ�ਰ�ਲ��/ਮ�ਲਬ�ਰਨ"
 
 #: ../calendar/zones.h:304
 msgid "Australia/Perth"
-msgstr "�ਸ�ਰ�ਲ��/ਪਰਥ"
+msgstr "�ਸ�ਰ�ਲ��/ਪਰਥ"
 
 #: ../calendar/zones.h:305
 msgid "Australia/Sydney"
@@ -9091,7 +9043,7 @@ msgstr "ਯ�ਰਪ/ਹ�ਲਸ����"
 
 #: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
-msgstr "ਯ�ਰਪ/�ਸਤਾਲਬ�ਲ"
+msgstr "ਯ�ਰਪ/�ਸਤਾ�ਬ�ਲ"
 
 #: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
@@ -9239,43 +9191,43 @@ msgstr "�ੰਡ��/��ਾਨਾੱਰ�ਵ�"
 
 #: ../calendar/zones.h:358
 msgid "Indian/Chagos"
-msgstr "�ੰਡ��/ਸ਼ਾ���ਸ"
+msgstr "�ੰਡ��ਨ/ਸ਼ਾ���ਸ"
 
 #: ../calendar/zones.h:359
 msgid "Indian/Christmas"
-msgstr "�ੰਡ��/��ਰਿਸਮਸ"
+msgstr "�ੰਡ��ਨ/��ਰਿਸਮਸ"
 
 #: ../calendar/zones.h:360
 msgid "Indian/Cocos"
-msgstr "�ੰਡ��/����ਸ"
+msgstr "�ੰਡ��ਨ/����ਸ"
 
 #: ../calendar/zones.h:361
 msgid "Indian/Comoro"
-msgstr "�ੰਡ��/�ਾਮ�ਰ�"
+msgstr "�ੰਡ��ਨ/�ਾਮ�ਰ�"
 
 #: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
-msgstr "�ੰਡ��/�ਿਰ���ਲ�ਨ"
+msgstr "�ੰਡ��ਨ/�ਿਰ���ਲ�ਨ"
 
 #: ../calendar/zones.h:363
 msgid "Indian/Mahe"
-msgstr "�ੰਡ��/ਮਾਹ�"
+msgstr "�ੰਡ��ਨ/ਮਾਹ�"
 
 #: ../calendar/zones.h:364
 msgid "Indian/Maldives"
-msgstr "�ੰਡ��/ਮਾਲਦ�ਵ"
+msgstr "�ੰਡ��ਨ/ਮਾਲਦ�ਵ"
 
 #: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
-msgstr "�ੰਡ��/ਮਾ�ਰ����ਸ"
+msgstr "�ੰਡ��ਨ/ਮਾ�ਰ����ਸ"
 
 #: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
-msgstr "�ੰਡ��/ਮਾ����"
+msgstr "�ੰਡ��ਨ/ਮਾ����"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "�ੰਡ��/ਰ�ਯ�ਨ��ਨ"
+msgstr "�ੰਡ��ਨ/ਰ�ਯ�ਨ��ਨ"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -9379,7 +9331,7 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਨ��ਮ��"
 
 #: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
-msgstr "ਪ�ਰਸ਼ਾਤ/ਪ��� ਪ���"
+msgstr "ਪ�ਰਸ਼ਾਤ/ਪਾ�� ਪਾ��"
 
 #: ../calendar/zones.h:394
 msgid "Pacific/Palau"
@@ -9427,16 +9379,12 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਵ���"
 
 #: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
-msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
+msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲ�ਸ਼"
 
 #: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "ਸੰਪਾਦ� ਤ�� ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
-
 #: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
@@ -9444,7 +9392,7 @@ msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 #: ../composer/e-composer-actions.c:317
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
-msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
+msgstr "ਫਾ�ਲ ���� �ਰ�"
 
 #: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
@@ -9554,7 +9502,7 @@ msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
 #: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
+msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ���ਰਿਪ� �ਰ�"
 
 #: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
@@ -9601,12 +9549,10 @@ msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
 #: ../composer/e-composer-header.c:120
-#| msgid "Sho_w: "
 msgid "Show"
 msgstr "ਵ���"
 
 #: ../composer/e-composer-header.c:123
-#| msgid "_Hide"
 msgid "Hide"
 msgstr "�ਹਲ�"
 
@@ -9691,25 +9637,28 @@ msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
 #: ../composer/e-composer-private.c:208
-#| msgid "Save Draft"
 msgid "Save draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-msg-composer.c:807
+#: ../composer/e-msg-composer.c:808
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰ� ਸ�ਨ�ਹ� ਲ� ਦਸਤ�ਤ ਨਹ� ��ਤ� �ਾ ਸ�ਦ�: �ਸ ��ਾ��� ਲ� ��� ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:815
 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:1293
+msgid "Unable to retrieve message from editor"
+msgstr "ਸੰਪਾਦ� ਤ�� ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
+
+#: ../composer/e-msg-composer.c:1367 ../composer/e-msg-composer.c:2206
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3364
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9753,7 +9702,7 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"�ਸ ਲ��� �ਰ��� ਨ�ੰ ਬੰਦ �ਰਨ ਨਾਲ ਬਣ� �ਾ ਰਹ� ਵਿੰਡ� ਬੰਦ �ਰਨ ਨਾਲ ਤਬਦ�ਲ��� ਹਮ�ਸ਼ਾ ਲ� ਰੱਦ ਹ� "
+"�ਸ �ੰਪ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਬੰਦ �ਰਨ ਨਾਲ ਬਣ� �ਾ ਰਹ� ਵਿੰਡ� ਬੰਦ �ਰਨ ਨਾਲ ਤਬਦ�ਲ��� ਹਮ�ਸ਼ਾ ਲ� ਰੱਦ ਹ� "
 "�ਾਣ����, �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਸ�ਨ�ਹ� ਨ�ੰ ਡਰਾਫ� ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਦ� ਨਹ��। �ਹ ਫਿਰ �ਿਸ� ਦਿਨ ਸ�ਨ�ਹ� ਨ�ੰ ਮ�� "
 "ਲਿ�ਣ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�।"
 
@@ -9767,7 +9716,7 @@ msgstr "ਸ�ਨ�ਹਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "ਦਸਤ�ਤ ਫਾ�ਲ਼ &quot;{0}&quot; ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
+msgstr "ਦਸਤ�ਤ ਫਾ�ਲ਼ &quot;{0}&quot; ਨ�ੰ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
@@ -9791,14 +9740,14 @@ msgstr "ਡਾ�ਨਲ�ਡ �ਾਰ� ਹ�। �� ਤ�ਸ�� ਪ
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "���ਮ��ਿ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ� �ਿ��ਿ &quot;{1}&quot;"
+msgstr "���ਮ��ਿ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�, �ਿ���ਿ &quot;{1}&quot;"
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� ��ਾਨ� ਬੰਦ ਹ� �� ਸ�, �ਦ�� �ਿ ਤ�ਸ�� �ੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ� ਰਹ� ਸ�।ਪੱਤਰ ਮ��-ਪ�ਰਾਪਤ "
+"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� ��ਾਨ� ਬੰਦ ਹ� �� ਸ�, �ਦ�� �ਿ ਤ�ਸ�� �ੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ� ਰਹ� ਸ�। ਪੱਤਰ ਮ��-ਪ�ਰਾਪਤ "
 "�ਰਨ ਨਾਲ ਤ�ਹਾਨ�ੰ �ਸ ��ਾ� ਤ�� ਮ�� �ਾਲ� �ਰਨ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�, �ਿੱਥ� �ੱਡਿ� ਸ�।"
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -9863,25 +9812,31 @@ msgstr "�ਡ��ਿੰ� �ਾਰ� ਰੱ��(_C)"
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
-msgstr "ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
+msgstr "ਮ��-ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
-msgstr "ਪ�ਰਾਪਤ(_R)"
+msgstr "ਮ��-ਪ�ਰਾਪਤ(_R)"
 
 #: ../composer/mail-composer.error.xml.h:33
 msgid "_Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:627
+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-commands.c:1035
 msgid "Groupware Suite"
-msgstr "ਸਮ�ਹਿ� ਸਰ�ਪ"
+msgstr "�ਰ�ੱਪਵ��ਰ ਸ��"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ���, ਸੰਪਰ� �ਤ� ਸ਼�ਡਿ�ਲ ਦਾ ਪਰਬੰਧ �ਰ�"
 
@@ -9894,40 +9849,36 @@ msgid "calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
 #: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "�ੱ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
-msgstr "�ੱਲ�ਹ"
+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 "ਫਾਰਮ��:"
 
@@ -10042,7 +9993,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:695
 msgid "Autogenerated"
 msgstr "ਸਵ�-ਨਿਰਮਤ"
 
@@ -10066,7 +10017,7 @@ msgstr "ਫਾ�ਲ \"{0}\" ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�ਦ�
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
-msgstr "�� ਤ�ਸ�� �ੱਪਰ ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+msgstr "�� ਤ�ਸ�� �ੱਤ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists \"{0}\"."
@@ -10074,7 +10025,7 @@ msgstr "ਫਾ�ਲ ਮ���ਦ \"{0}\" ਹ�।"
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
-msgstr "�ੱਪਰ ਲ਼ਿ��?"
+msgstr "ਫਾ�ਲ �ੱਤ� ਲਿ�ਣਾ?"
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
@@ -10082,7 +10033,7 @@ msgstr "�ੱਤ� ਲਿ��(_O)"
 
 #: ../e-util/e-util.c:133
 msgid "Could not open the link."
-msgstr "ਸਬੰਧ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
+msgstr "ਲਿੰ� ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
 #: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
@@ -10148,98 +10099,98 @@ msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "੧ ਸ�ਿੰ� ਪਹਿਲਾ�"
+msgstr[0] "1 ਸ�ਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਸ�ਿੰ� ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸ�ਿੰ�"
+msgstr[0] "��ਣ ਵਾਲਾ 1 ਸ�ਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸ�ਿੰ�"
 
 #: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "੧ ਮਿੰ� ਪਹਿਲਾ�"
+msgstr[0] "1 ਮਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਿੰ� ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਿੰ�"
+msgstr[0] "��ਣ ਵਾਲਾ 1 ਮਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਿੰ�"
 
 #: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "੧ �ੰ�ਾ ਪਹਿਲਾ�"
+msgstr[0] "1 �ੰ�ਾ ਪਹਿਲਾ�"
 msgstr[1] "%d �ੰ�ਾ ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� ੧ �ੰ�ਾ"
+msgstr[0] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� 1 �ੰ�ਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� %d �ੰ��"
 
 #: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾ�"
+msgstr[0] "1 ਦਿਨ ਪਹਿਲਾ�"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "��ਣ ਵਾਲ� ੧ ਦਿਨ"
+msgstr[0] "��ਣ ਵਾਲ� 1 ਦਿਨ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਦਿਨ"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾ�"
+msgstr[0] "1 ਹਫਤਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� ੧ ਹਫ਼ਤਾ"
+msgstr[0] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� 1 ਹਫ਼ਤਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� %d ਹਫ਼ਤ�"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "੧ ਮਹ�ਨਾ ਪਹਿਲਾ�"
+msgstr[0] "1 ਮਹ�ਨਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਹ�ਨ� ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਹ�ਨਾ"
+msgstr[0] "��ਣ ਵਾਲਾ 1 ਮਹ�ਨਾ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਹ�ਨ�"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾ�"
+msgstr[0] "1 ਸਾਲ ਪਹਿਲਾ�"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾ�"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸਾਲ"
+msgstr[0] "��ਣ ਵਾਲਾ 1 ਸਾਲ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸਾਲ"
 
 #: ../filter/filter-datespec.c:294
@@ -10269,62 +10220,62 @@ msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 msgid "Test"
 msgstr "�ਾ��"
 
-#: ../filter/filter-rule.c:854
+#: ../filter/filter-rule.c:858
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾ�(_u):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/filter-rule.c:886
 msgid "Find items that meet the following conditions"
 msgstr "���ਮਾ� ਲੱਭ�, �� �ਿ ਹ�ਠ ਦਿੱਤ� ਸ�ਮਾਵਾ� ਨ�ੰ ਪ�ਰ� �ਰਦ� ਹ�ਵ�"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:926
 msgid "If all conditions are met"
 msgstr "���ਰ ਸਭ ਸ�ਮਾ ਮ�ਲ �ਾਣ ਤਾ�"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:926
 msgid "If any conditions are met"
 msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "��ਾ� ���(_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "�ਵਾਬ"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "�ਵਾਬ ਤ� ਮ�ੱਢਲ�"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "��� �ਵਾਬ �ਾ� ਮ�ੱਢਲਾ ਨਹ��"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:948
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "�ਲਤ ਨਿਯਮਿਤ ਸਮ��ਾਰਨ &quot;{0}&quot; ਹ�।"
+msgstr "�ਲਤ ਨਿਯਮਿਤ ਸਮ��ਰਨ &quot;{0}&quot; ਹ�।"
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
@@ -10387,7 +10338,7 @@ msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨਿਰਧਾਰਿਤ ਮਿਤ� ਦ� ੧੨:੦੦ ਸਵ�ਰ\n"
+"ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨਿਰਧਾਰਿਤ ਮਿਤ� ਦ� 12:00 ਸਵ�ਰ\n"
 "ਨਾਲ �ਾ��� �ਾਵ���।"
 
 #: ../filter/filter.glade.h:7
@@ -10407,7 +10358,6 @@ msgstr ""
 " ਨਾਲ ਮਿਲਾ�� �ਾਵ��ਾ।"
 
 #: ../filter/filter.glade.h:12
-#| msgid "in the future"
 msgid ""
 "ago\n"
 "in the future"
@@ -10426,15 +10376,13 @@ msgid ""
 "years"
 msgstr ""
 "ਸ�ਿੰ�\n"
-"ਮਿੰ� "
-"�ੰ��\n"
+"ਮਿੰ� �ੰ��\n"
 "ਦਿਨ\n"
 "ਹਫ਼ਤ�\n"
 "ਮਹ�ਨ�\n"
 "ਸਾਲ"
 
 #: ../filter/filter.glade.h:21
-#| msgid "a time relative to the current time"
 msgid ""
 "the current time\n"
 "the time you specify\n"
@@ -10542,9 +10490,8 @@ 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"
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
 msgid "%d attached messages"
 msgstr "%d ਸ�ਨ�ਹ� ���� ��ਤ�"
 
@@ -10557,13 +10504,11 @@ msgstr[1] "����ਮ���"
 
 #: ../mail/e-mail-attachment-bar.c:615
 #: ../widgets/misc/e-attachment-paned.c:607
-#| msgid "Month View"
 msgid "Icon View"
 msgstr "���ਾਨ �ਲ�"
 
 #: ../mail/e-mail-attachment-bar.c:616
 #: ../widgets/misc/e-attachment-paned.c:608
-#| msgid "_List View"
 msgid "List View"
 msgstr "ਲਿਸ� �ਲ�"
 
@@ -10574,7 +10519,6 @@ msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
 #: ../mail/e-mail-search-bar.c:520
-#| msgid "Close this window"
 msgid "Close the find bar"
 msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
 
@@ -10583,7 +10527,6 @@ msgid "Fin_d:"
 msgstr "���(_d):"
 
 #: ../mail/e-mail-search-bar.c:540
-#| msgid "Always search"
 msgid "Clear the search"
 msgstr "��� ਸਾਫ਼ �ਰ�"
 
@@ -10604,7 +10547,6 @@ msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
 
 #: ../mail/e-mail-search-bar.c:587
-#| msgid "M_atch case"
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦ� ਸਭ(_c)"
 
@@ -10650,7 +10592,7 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 "\n"
-"�ਿਰਪਾ �ਰ�� ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਪ�ਰ� ਪ� ਲਵ�\n"
+"�ਿਰਪਾ �ਰ�� ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਪ�ਰ� ਪ��ਹ ਲਵ�,\n"
 "�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ\n"
 "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
 
@@ -10808,7 +10750,7 @@ msgstr "ਸਮਾਪਤ "
 
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
@@ -10871,7 +10813,6 @@ msgid "Follow Up"
 msgstr "ਪਿੱ�� �ਾ�"
 
 #: ../mail/em-filter-i18n.h:29
-#| msgid "Forward"
 msgid "Forward to"
 msgstr "�ੱ��"
 
@@ -10941,7 +10882,6 @@ msgid "Message is not Junk"
 msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਨਹ� ਹ�"
 
 #: ../mail/em-filter-i18n.h:50
-#| msgid "Message contains"
 msgid "Message Location"
 msgstr "ਸ�ਨ�ਹਾ �ਿ�ਾਣਾ"
 
@@ -11081,7 +11021,7 @@ msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
 
 #: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
-msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
+msgstr "��ਰ� 5 ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
 
 #: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
@@ -11107,8 +11047,8 @@ msgstr "ਸਭ ��ਾ��� ���"
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "ਨਾ ਪ�� ਸ�ਨ�ਹ�:"
-msgstr[1] "ਨਾ ਪ�ਿ� ਸ�ਨ�ਹ�:"
+msgstr[0] "ਨਾ ਪ��ਹ� ਸ�ਨ�ਹ�:"
+msgstr[1] "ਨਾ ਪ��ਹਿ� ਸ�ਨ�ਹ�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
@@ -11140,7 +11080,7 @@ msgstr "��ਣ-ਬ�ਸਾ"
 #: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
-msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
+msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸ਼ਤਾ"
 
 #: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -11202,9 +11142,8 @@ msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
 #.
-#: ../mail/em-folder-tree.c:318, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u)"
+#: ../mail/em-folder-tree.c:318
+#, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
@@ -11239,7 +11178,7 @@ msgstr "�ੱਪਰ� ਸੰਭਾਲ ਤ�� ਸ�ਨ�ਹਾ ਹ�ਾ
 
 #: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)"
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)"
 
 #: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
@@ -11261,7 +11200,7 @@ msgstr "\"%s\" ਵਿੱ� ਫ�ਲਡਰ ਦ� �ਾ�� ��ਤ� �
 
 #: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
-msgstr "ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�(_N)"
+msgstr "ਨਵ�� ਵਿੰਡ� ਵਿੱ� ��ਲ�ਹ�(_N)"
 
 #. FIXME: need to disable for nochildren folders
 #: ../mail/em-folder-tree.c:2112
@@ -11302,7 +11241,7 @@ msgstr "ਫ�ਲਡਰ ��ਣ�"
 
 #: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
-msgstr "ਨ�ਲ(_o)"
+msgstr "�ਾਪ� �ਰ�(_o)"
 
 #: ../mail/em-folder-utils.c:537
 #: ../plugins/groupwise-features/share-folder-common.c:144
@@ -11320,7 +11259,7 @@ msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
-msgstr "ਨਿਰਧਾਰਿਤ �ਰ� ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
+msgstr "ਦੱਸ� ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
 
 #: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
@@ -11345,7 +11284,7 @@ msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
 #: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)..."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
 
 #: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
@@ -11395,11 +11334,11 @@ msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
 
 #: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
-msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
+msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_e)"
 
 #: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
-msgstr "ਸ�ਨ�ਹ� ਤ�� ਨਿਯਮ ਬਣਾ�"
+msgstr "ਸ�ਨ�ਹ� ਤ�� ਨਿਯਮ ਬਣਾ�(_t)"
 
 #. 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
@@ -11440,11 +11379,11 @@ msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿ
 #. 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
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
 msgid "Default"
-msgstr "ਮ�ਲ"
+msgstr "ਡਿਫਾਲ�"
 
 #: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
@@ -11581,7 +11520,6 @@ msgid "This certificate is not viewable"
 msgstr "�ਹ ਸਰ��ਫਿ��� ਵ��ਣਯ�� ਨਹ�� ਹ�"
 
 #: ../mail/em-format-html-display.c:980
-#| msgid "Completed On"
 msgid "Completed on"
 msgstr "ਸਮਾਪਤ "
 
@@ -11640,7 +11578,7 @@ msgstr "%2$d ਵਿੱ��� %1$d ਸਫ਼ਾ"
 #: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
-msgstr "%s ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
+msgstr "`%s' ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
 #: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
@@ -11723,7 +11661,7 @@ msgstr "ਮਿਤ�"
 
 #: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
-msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
+msgstr " ਨਿ��਼�ਰ�ੱਪ"
 
 #: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:4
@@ -11837,7 +11775,6 @@ msgid "No Junk plugin available"
 msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
 
 #: ../mail/em-mailer-prefs.c:1455
-#| msgid "Table header"
 msgid "Date header:"
 msgstr "ਮਿਤ� ਹ�ੱਡਰ:"
 
@@ -11854,7 +11791,7 @@ msgstr "ਬਾ�ਦ ਵਿੱ�"
 
 #: ../mail/em-migrate.c:1128
 msgid "Migration"
-msgstr "ਤਬਦ�ਲ"
+msgstr "ਮਾ��ਰ�ਸ਼ਨ"
 
 #: ../mail/em-migrate.c:1573
 #, c-format
@@ -11878,7 +11815,7 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
+"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ 1.0 ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
 "\n"
 "�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
@@ -12037,7 +11974,7 @@ msgstr "ਸ�ਮਿਤ ਸਾ��਼ ਦਾ ���ਸ� ਭਾ� ਵ�
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
-msgstr "ਪ�ਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
+msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
@@ -12119,7 +12056,7 @@ msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
-msgstr "ਡਿਫਾਲ� �ੱ�� ਭ��ਣ ਦ� ਸ�ਾ�ਲ"
+msgstr "ਡਿਫਾਲ� �ੱ�� ਭ��ਣ ਦ� ਸ�ਾ�ਲ"
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
@@ -12232,8 +12169,8 @@ 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
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -12244,7 +12181,6 @@ 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."
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "�ਦ�� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਿਸ਼ਾਨਬੱਧ ��ਤਾ �ਾਵ� ਤਾ� ਪ�ੱ�ਣ ਨ�ੰ ਯ��/�ਯ�� �ਰਦਾ ਹ�।"
 
@@ -12285,10 +12221,6 @@ 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."
 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, "
@@ -12316,7 +12248,7 @@ msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
-"���ਰ ਯ��਼ਰ ਨ� ੧੦ �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
+"���ਰ ਯ��਼ਰ ਨ� 10 �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
 "�ਾਹ�ੰਦਾ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:64
@@ -12339,8 +12271,8 @@ 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
 msgid ""
@@ -12448,19 +12380,19 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ�"
+msgstr "ਲਾ� ਫਿਲ�ਰ �ਾਰਵਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
-msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
+msgstr "ਨਿਰਧਾਰਿਤ ਲਾ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
+msgstr "ਲਾ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
+msgstr "ਲਾ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
@@ -12480,15 +12412,15 @@ msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�
 
 #: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
-msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ��ਾ�"
+msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਮ�ਲ ��ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
-msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�"
+msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਮ�ਲ ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ਼�ਲ� (\"normal\", \"full headers\", \"source\")"
+msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ�ਾ�ਲ (\"normal\", \"full headers\", \"source\")"
 
 #: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
@@ -12540,7 +12472,7 @@ msgstr "���ਰ ਸਿਰਫ Bcc ��ਤਰ ਹ� ਭਰਿ� ਹ�ਵ
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� ੧੦ ਸ�ਨ�ਹ� ��ਲਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
+msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� 10 ਸ�ਨ�ਹ� ��ਲ�ਹਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
 #: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
@@ -12567,7 +12499,6 @@ msgid "Put personalized signatures at the top of replies"
 msgstr "�ਵਾਬ ਦ� �ੱਤ� ਨਿੱ�� ਦਸਤ�ਤ ਦਿ�"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-#| msgid "Start _typing at the bottom on replying"
 msgid "Put the cursor at the bottom of replies"
 msgstr "�ਵਾਬਾ� ਦ� ਹ�ਠਾ� �ਰਸਰ ਰੱ��"
 
@@ -12628,7 +12559,6 @@ msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਨ�ੰ ਭ��ਣ ਦ�ਰਾਨ \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#| msgid "Also encrypt to sel_f when sending encrypted messages"
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
@@ -12649,7 +12579,6 @@ msgid "Show deleted messages in the message-list"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ���"
 
 #: ../mail/evolution-mail.schemas.in.h:134
-#| msgid "_Show image animations"
 msgid "Show image animations"
 msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
 
@@ -12662,32 +12591,32 @@ 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
 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
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
-"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
+"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
-"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
+"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
@@ -12775,7 +12704,7 @@ msgid ""
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "�ਹ ���ਸ� ਭਾ� ਦਾ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਤਹਿ �ਰਦਾ ਹ�, �ਿਸ ਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਮ�ਤਾਬ� ਫਾਰਮ�� ��ਤਾ �ਾ ਸ�ਦਾ "
-"ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"ਹ�। ਡਿਫਾਲ� 4 (੪) MB / 4096 KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
@@ -12893,11 +12822,11 @@ msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
-msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
+msgstr "ਸਿਰਫ ਲ��ਲ ਸਪਮ �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
 #: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
-msgstr "ਨਾਲ-ਨਾਲ �ਾ� ਫ�ਲਿ� �ਾ�ਾ ਵਰਤ��"
+msgstr "ਨਾਲ-ਨਾਲ �ਾ� ਫ�ਲਿ� ਲ���� ਵਰਤ��"
 
 #: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
@@ -12905,8 +12834,8 @@ msgid ""
 "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
 msgid ""
@@ -12914,8 +12843,8 @@ msgid ""
 "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
 msgid "Variable width font"
@@ -12951,11 +12880,11 @@ msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ
 
 #: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
-msgstr "�ਲਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਲਮ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ੰਪ�ਰ�ਰ"
 
 #: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
@@ -12989,7 +12918,7 @@ msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ
 #: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
-msgstr "`%s' �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "`%s' �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/importers/mail-importer.c:371
 #, c-format
@@ -13002,7 +12931,7 @@ msgstr "ਪਾ�ਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ
 
 #: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ੰਪ�ਰ�ਰ"
 
 #: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
@@ -13099,7 +13028,7 @@ msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
 
 #: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
-msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
+msgstr "ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
 
 #: ../mail/mail-component.c:960
 msgid "New Mail Folder"
@@ -13276,7 +13205,6 @@ msgid "Always request rea_d receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
 #: ../mail/mail-config.glade.h:45
-#| msgid "Attachment Reminder"
 msgid ""
 "Attachment\n"
 "Inline\n"
@@ -13329,7 +13257,7 @@ msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�
 
 #: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
-msgstr "I �ਿਸਮ ਲ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
+msgstr "�ਦ�� ਮ�� ਲਿ�ਾ� ਤਾ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
 
 #: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
@@ -13369,11 +13297,11 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:71
 msgid "De_fault"
-msgstr "ਮ�ਲ(_f)"
+msgstr "ਡਿਫਾਲ�(_f)"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
-msgstr "ਮ�ਲ �ੱ�ਰ ���ਡਿੰ�(_n):"
+msgstr "ਡਿਫਾਲ� �ੱ�ਰ ���ਡਿੰ�(_n):"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
@@ -13528,20 +13456,16 @@ 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 ""
@@ -13625,7 +13549,6 @@ msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
 #: ../mail/mail-config.glade.h:142
-#| msgid "Server _Type: "
 msgid "Server _Type:"
 msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
@@ -13654,7 +13577,6 @@ msgid "Start _typing at the bottom on replying"
 msgstr "�ਦ�� �ਵਾਬ ਦ�ਣਾ ਹ�ਵ� ਤਾ� ਹ�ਠਾ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�(_t)"
 
 #: ../mail/mail-config.glade.h:149
-#| msgid "T_ype: "
 msgid "T_ype:"
 msgstr "�ਿਸਮ(_y):"
 
@@ -13665,10 +13587,6 @@ msgid ""
 msgstr "ਭਾਸ਼ਾਵਾ� ਦ� ਲਿਸ�, ਸਿਰਫ �ਹਨਾ� ਨ�ੰ ਵ��ਾ�ਦ� ਹ�, �ਿਨਾ� ਲ� ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
 #: ../mail/mail-config.glade.h:151
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used\n"
-#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used for display purposes only."
@@ -13693,7 +13611,7 @@ 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
+#: ../plugins/google-account-setup/google-source.c:701
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
@@ -13704,10 +13622,6 @@ 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"
@@ -13755,7 +13669,7 @@ msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਹ� ਵ�
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
-msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਮ�ਲ ਬਣਾ�(_M)"
+msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਡਿਫਾਲ� ਬਣਾ�(_M)"
 
 #: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
@@ -13763,7 +13677,7 @@ msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
-msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ�ਿ� ਬਣਾ�(_M)"
+msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�(_M)"
 
 #: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
@@ -13800,7 +13714,7 @@ msgstr "��ਣ�(_S)..."
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
-msgstr "�ਿੱਤਰ ਸ��ਵਤਾ ਵ��ਾ�(_S)"
+msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���(_S)"
 
 #: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
@@ -13820,7 +13734,7 @@ msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
 #: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
-msgstr "ਹ�ਰ �ਾਰ� ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
+msgstr "ਹ�ਰ �ਪਲ���ਸ਼ਨ ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
 #: ../mail/mail-config.glade.h:194
 msgid "addresses"
@@ -13860,11 +13774,11 @@ msgstr "ਸਭ ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:6
 msgid "All local and active remote folders"
-msgstr "ਸਭ ਸਥਾਨ� �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
+msgstr "ਸਭ ਲ��ਲ �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
-msgstr "ਸਭ ਸਥਾਨ� ਫ�ਲਡਰ"
+msgstr "ਸਭ ਲ��ਲ ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Co_mpleted"
@@ -13949,7 +13863,7 @@ msgstr ""
 #: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ਸਥਾਨ� `Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
+msgstr "ਲ��ਲ `Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
 
 #: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
@@ -14041,7 +13955,7 @@ msgstr "'%s' ਵਿੱ� ਰੱਦ� �ਾਲ� ��ਤਾ �ਾ ਰਿ
 
 #: ../mail/mail-ops.c:1741
 msgid "Local Folders"
-msgstr "ਸਥਾਨ� ਫ�ਲਡਰ"
+msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 
 #: ../mail/mail-ops.c:1822
 #, c-format
@@ -14073,7 +13987,7 @@ msgstr ""
 
 #: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
-msgstr "ਨੱਥ� ਸੰਭਾਲ�"
+msgstr "����ਮ��� ਸੰਭਾਲ�"
 
 #: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
@@ -14106,7 +14020,7 @@ msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤ
 
 #: ../mail/mail-ops.c:2536
 msgid "Checking Service"
-msgstr "ਸ�ਵਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
+msgstr "ਸਰਵਿਸ ��ੱ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
 #: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
@@ -14131,7 +14045,7 @@ msgstr "�ਡ�� �ਾਰ�..."
 #: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
-msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
+msgstr "ਨਵ�� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
 
 #: ../mail/mail-session.c:210
 #, c-format
@@ -14140,7 +14054,7 @@ msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
 #: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
-msgstr "ਪਾਸਵਰਡ ਦਿ�"
+msgstr "ਸ਼ਬਦ ਦਿ�"
 
 #: ../mail/mail-session.c:215
 #: ../plugins/exchange-operations/exchange-config-listener.c:705
@@ -14168,26 +14082,26 @@ msgstr "ਦਸਤ�ਤ ਸ�ਧ"
 msgid "_Signature Name:"
 msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:134
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ�`%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:164
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:270
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:272
 msgid "Forwarded message"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:312
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "�ਲਤ ਫ�ਲਡਰ: `%s'"
@@ -14368,7 +14282,7 @@ 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."
 msgstr ""
-"ਲਾ�ਸ��ਸ ਫਾ�ਲ \"{0}\" ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ੰਸ�ਾਲ�ਸ਼ਨ ਸਮੱਸਿ� ਹ�। ਤ�ਸ�� �ਹ �ਪਲੱਬਧ "
+"ਲਾ�ਸ��ਸ ਫਾ�ਲ \"{0}\" ਨ�ੰ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ੰਸ�ਾਲ�ਸ਼ਨ ਸਮੱਸਿ� ਹ�। ਤ�ਸ�� �ਹ �ਪਲੱਬਧ "
 "�ਰਤਾ ਨ�ੰ ਵਰਤਣ ਦ� ਤੱਦ ਤੱ� ਯ�� ਨਹ�� ਹ� ਸ�ਦ�, �ਦ ਤੱ� ਲਾ�ਸ��ਸ ਨਾਲ ਸਹਿਮਤ ਨਹ�� ਹ�ੰਦ�।"
 
 #: ../mail/mail.error.xml.h:35
@@ -14447,7 +14361,7 @@ msgstr "�ਯ�� ਨਾ �ਰ�"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਸਥਾਨ� ਸਮ�ਾਲ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
+msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਲ��ਲ ਸਮ�ਾਲ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -14544,7 +14458,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
-msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ�� ਬਣਾ�"
+msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
@@ -14560,7 +14474,7 @@ msgstr "�ੱ�� ਸਮ�� �ੰਨ� ਸ�ਨ�ਹ� ��ਲਣ 
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
-msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
+msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ��ੱ� �ਰ� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
@@ -14588,7 +14502,7 @@ msgstr "�ਸ ਦਸਤ�ਤ ਲ� ਵਿਲੱ�ਣ ਨਾ� ਦਿ� �
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
-msgstr "�ਿਰਪਾ �ਰ�� �ਡ���।"
+msgstr "�ਡ��� ��।"
 
 #: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
@@ -14604,7 +14518,7 @@ msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ�ਾ� ਦ�
 
 #: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
-msgstr "ਪ�ਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+msgstr "ਪ��ਹਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
 #: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
@@ -14734,7 +14648,7 @@ msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ �ਤ� �ਸ ਦ� 
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
-msgstr "�ਰ�ੱਪਵਾ�ਸ ਸਰਵਰ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ ਹ�।"
+msgstr "�ਰ�ੱਪਵਾ�ਸ ਸਰਵਰ ਨਾਲ ��ਨ��� ਵਿੱ� �ਸਫਲ ਹ�।"
 
 #: ../mail/mail.error.xml.h:120
 msgid ""
@@ -14750,11 +14664,11 @@ msgstr "ਲਾ�ਸ��ਸ ਫਾ�ਲ ਪ�ਨ ਵਿੱ� �ਯ�� 
 
 #: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
-msgstr "ਮ�ਲ ਵਰਤ��(_D)"
+msgstr "ਡਿਫਾਲ� ਵਰਤ��(_D)"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "ਮ�ਲ ਡਰਾਫ� ਫ�ਲਡਰ ਵਰਤਿ� �ਾਵ�?"
+msgstr "ਡਿਫਾਲ� ਡਰਾਫ� ਫ�ਲਡਰ ਵਰਤਿ� �ਾਵ�?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
@@ -14802,7 +14716,7 @@ msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ \"{0}\" 'ਤ� \"{0}\" ਦ� ਤ�ਰ
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
-msgstr "��ਲ�ਹ�(_A)"
+msgstr "����(_A)"
 
 #: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
@@ -14846,7 +14760,7 @@ msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
 #: ../mail/message-list.c:1060
 msgid "Lowest"
-msgstr "ਨਿ�ਨਤਮ"
+msgstr "ਸਭ ਤ�� �ੱ�"
 
 #: ../mail/message-list.c:1061
 msgid "Lower"
@@ -14935,7 +14849,7 @@ msgstr "ਭ��� ਸ�ਨ�ਹ�"
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
-msgstr "��ਾਰ"
+msgstr "��ਾਰ"
 
 #: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
@@ -14998,7 +14912,6 @@ msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:6
-#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
@@ -15011,7 +14924,6 @@ msgid "Subject or Sender contains"
 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 "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
@@ -15066,7 +14978,6 @@ msgid "_Edit Message"
 msgstr "ਸ�ਨ�ਹਾ ਸ�ਧ(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#| msgid "Audio inline plugin"
 msgid "Audio Inline"
 msgstr "�ਡ�� �ਨ-ਲਾ�ਨ"
 
@@ -15095,17 +15006,13 @@ msgid "Restore from backup"
 msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
 #: ../plugins/backup-restore/backup-restore.c:289
-#| msgid ""
-#| "You can restore Evolution from your backup. It can restore all the Mails, "
-#| "Calendars, Tasks, Memos, Contacts. \n"
-#| "It also restores all your personal settings, mail filters etc."
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. 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"
@@ -15223,12 +15130,10 @@ 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 "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
@@ -15299,7 +15204,6 @@ msgstr "���ਮ��ਿ� ਸੰਪਰ�"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:646
-#| msgid "_Auto-create address book entries when replying to messages"
 msgid "Create _address book entries when sending mails"
 msgstr "ਪੱਤਰ ਭ��ਣ ਸਮ�� ��ਦ ਹ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ���ਰ� ਬਣਾ ਲਵ�(_A)"
 
@@ -15330,10 +15234,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"
@@ -15381,10 +15281,9 @@ msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
 msgstr ""
-"ਸ�ਨ�ਹ� ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ UTF-੮ ਤ�� ਯ�ਨ�ਫਾ� ਸਪਮ/ਹਮ ���ਨ ਵਿੱ� ਬਦਲ�, �� �ਿ ਵੱ�ਰ� �ੱ�ਰ ਸ�ੱ� ਤ�� ��ਦ� ਹਨ।"
+"ਸ�ਨ�ਹ� ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ UTF-8 ਤ�� ਯ�ਨ�ਫਾ� ਸਪਮ/ਹਮ ���ਨ ਵਿੱ� ਬਦਲ�, �� �ਿ ਵੱ�ਰ� �ੱ�ਰ ਸ�ੱ� ਤ�� ��ਦ� ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#| msgid "Bogofilter junk plugin"
 msgid "Bogofilter Junk Filter"
 msgstr "Bogofilter �ੰ� ਫਿਲ�ਰ"
 
@@ -15393,7 +15292,6 @@ 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 ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
@@ -15416,16 +15314,16 @@ msgstr "_SSL ਵਰਤ��"
 #: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:718
 #: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
-msgstr "ਮ��-ਤਾ�ਾ(_f):"
+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-source.c:743
 #: ../plugins/google-account-setup/google-contacts-source.c:333
 msgid "weeks"
 msgstr "ਹਫਤ�"
@@ -15435,27 +15333,22 @@ 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 +15357,6 @@ msgid "On file change"
 msgstr "ਫਾ�ਲ ਬਦਲਣ ਸਮ��"
 
 #: ../plugins/calendar-file/calendar-file.c:281
-#| msgid "Personal"
 msgid "Periodically"
 msgstr "ਨਿਯਮਤ"
 
@@ -15493,7 +15385,6 @@ msgid "Add web calendars to Evolution."
 msgstr "ਵ�ੱਬ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-#| msgid "Calendars"
 msgid "Web Calendars"
 msgstr "ਵ�ੱਬ ��ਲੰਡਰ"
 
@@ -15558,12 +15449,10 @@ msgid "Weather Calendars"
 msgstr "ਮ�ਸਮ ��ਲੰਡਰ"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-#| msgid "Copy tool"
 msgid "Copy Tool"
 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 "���਼ਾ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�।"
 
@@ -15576,12 +15465,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,11 +15476,6 @@ 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
 msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
@@ -15666,7 +15548,6 @@ 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 "ਬਾਹਰ �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਲ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਸ਼ਾਮਲ �ਰ�।"
 
@@ -15750,12 +15631,12 @@ msgstr "ਮ�� ਦ�ਤਰ ਵਿੱ� ਹਾ�"
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
-msgstr "��ਸ਼���਼ ��ਾ��� ਲ� ਪਾਸਵਰਡ ਤਬਦ�ਲ"
+msgstr "��ਸ਼���਼ ��ਾ��� ਲ� ਪਾਸਵਰਡ ਬਦਲ�"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
-msgstr "ਪਾਸਵਰਡ ਤਬਦ�ਲ"
+msgstr "ਪਾਸਵਰਡ ਬਦਲ�"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:347
@@ -15876,15 +15757,15 @@ msgstr "ਪਸੰਦ�ਦਾ"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
-msgstr "ਸੰਪਾਦ� (ਪ�ਨ, ਲਿ�ਣ, ਸ�ਧਣ)"
+msgstr "ਸੰਪਾਦ� (ਪ��ਹਨ, ਲਿ�ਣ, ਸ�ਧਣ)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
-msgstr "ਲ��� (ਪ�ਨ, ਲਿ�ਣ)"
+msgstr "ਲ��� (ਪ��ਹਨ, ਲਿ�ਣ)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
-msgstr "ਪ���ਲ�ਰਤਾ (ਪ�ਨ ਲ� ਹ�)"
+msgstr "ਪ���ਲ�ਰਤਾ (ਪ��ਹਨ ਲ� ਹ�)"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:225
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
@@ -16087,7 +15968,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b> ਦਫਤਰ�� ਬਾਹਰ ਸ�ਨ�ਹਾ</b>"
+msgstr "<b>ਦਫਤਰ�� ਬਾਹਰ ਸ�ਨ�ਹਾ:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
@@ -16109,7 +15990,7 @@ msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
-msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ ਵਿੱ� �ੰਮ �ਰ ਰਿਹਾ ਹਾ�"
+msgstr "�ਸ ਸਮ�� ਮ�� ਦਫਤਰ�� ਬਾਹਰ ਹਾ�"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
@@ -16121,7 +16002,7 @@ msgstr "ਦਫਤਰ�� ਬਾਹਰ ਸਹਾ��"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
-msgstr "ਹਾ�, ਸਥਿਤ� ਤਬਦ�ਲ"
+msgstr "ਹਾ�, ਸਥਿਤ� ਬਦਲ�"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
@@ -16129,7 +16010,7 @@ msgstr "ਪਾਸਵਰਡ ਮਿ�ਦ �ਾਤਮਾ ��ਤਾਵਨ�...
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ੭ ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���..."
+msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ 7 ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -16141,7 +16022,7 @@ msgstr "(�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�।)"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
-msgstr "ਯ��਼ਰ ����:"
+msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
@@ -16200,7 +16081,7 @@ msgstr "ਫ�ਲਡਰ ਦਿੱ�"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
-msgstr "���ਮਾ� ਪ��"
+msgstr "���ਮਾ� ਪ��ਹ�"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Role: "
@@ -16514,7 +16395,7 @@ msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
-"ਸਰਵਰ ��ਸ਼���਼ ੫.੫ ਨਾਲ �ੱਲ ਰਿਹਾ ਹ�। ��ਸ਼���਼ ��ਨ���ਰ ਮਾ��ਰ�ਸਾਫ�\n"
+"ਸਰਵਰ ��ਸ਼���਼ 5.5 ਨਾਲ �ੱਲ ਰਿਹਾ ਹ�। ��ਸ਼���਼ ��ਨ���ਰ ਮਾ��ਰ�ਸਾਫ�\n"
 "��ਸ਼���਼ ੨੦੦੦ �ਤ� ੨੦੦੩ ਲ� ਹ� ਸਹਾ�� ਹ�।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
@@ -16548,7 +16429,7 @@ 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/google-account-setup/google-source.c:624
 #: ../plugins/mail-to-task/mail-to-task.c:599
 #: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
@@ -16650,9 +16531,6 @@ 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 +16549,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 +16557,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 ""
@@ -16696,9 +16573,6 @@ msgid "Command to be executed to launch the editor: "
 msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
 
 #: ../plugins/external-editor/external-editor.c:110
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim\""
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16708,13 +16582,12 @@ msgstr ""
 
 #: ../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"
-msgstr "�ੱ� (੪੮*੪੮) png ��ਾਰ ��ਣ� < ੭੦੦ਬਾ��"
+msgstr "�ੱ� (48*48) png ��ਾਰ ��ਣ� < 700ਬਾ��"
 
 #: ../plugins/face/face.c:69
 msgid "PNG files"
@@ -16725,10 +16598,6 @@ msgid "_Face"
 msgstr "ਫ�ਸ(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-#| msgid ""
-#| "Attach Face header to outgoing messages. First time the user needs to "
-#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
-#| "evolution/faces This will be used in messages that are sent further."
 msgid ""
 "Attach a small picture of your face to outgoing messages.\n"
 "\n"
@@ -16738,9 +16607,9 @@ msgid ""
 msgstr ""
 "�ਪਣ� �ਿਹਰ� ਦ� ���� �ਿਹ� ਤਸਵ�ਰ ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹਿ�� ਨਾਲ ���� �ਰ�\n"
 "\n"
-"ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� "
-"ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ (Base-64) �ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� "
-"ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ ਲ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ��ਾ।"
+"ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ (Base-64) "
+"�ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ ਲ� ਸ�ਨ�ਹਿ�� ਵਿੱ� "
+"ਵਰਤਿ� �ਾਵ��ਾ।"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
@@ -16759,17 +16628,17 @@ msgstr "IMAP ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� ਹ�ਾ�ਣ ਲ�
 msgid "_Unsubscribe"
 msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-source.c:82
 #: ../plugins/google-account-setup/google-contacts-source.c:51
 msgid "Google"
 msgstr "���ਲ"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-source.c:518
 #, 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:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16778,11 +16647,11 @@ msgstr ""
 "���ਲ ਸਰਵਰ ਤ�� ਡਾ�ਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:759
 msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:794
 msgid "Retrieve _list"
 msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_l)"
 
@@ -16796,7 +16665,6 @@ 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 "���ਲ ��ਲੰਡਰ"
 
@@ -16904,7 +16772,6 @@ 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 +16841,18 @@ 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 ?"
 msgstr "�� ਤ�ਸ�� ਮ��ਿੰ� ਮ��-ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#| msgid "Are you sure you want to delete this meeting?"
 msgid "Do you want to resend the recurring meeting ?"
 msgstr "�� ਤ�ਸ�� ਮ��-ਹ�ਣ ਵਾਲ� ਮ��ਿੰ� ਫ�ਰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#| msgid "Do you want to recover unfinished messages?"
 msgid "Do you want to retract the original item ?"
 msgstr "�� ਤ�ਸ�� �ਸਲ� ���ਮਾ� ਨ�ੰ ਮ��-�ਾ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/org-gnome-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 +16869,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
@@ -17024,7 +16887,6 @@ msgid "Accept Tentatively"
 msgstr "��਼ਮਾ�ਸ� �ਰ��"
 
 #: ../plugins/groupwise-features/process-meeting.c:319
-#| msgid "_Delegate Meeting..."
 msgid "Rese_nd Meeting..."
 msgstr "ਮ��ਿੰ� ਮ��-ਭ���(_n)..."
 
@@ -17160,7 +17022,7 @@ msgstr "ਯ��਼ਰ"
 
 #: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
-msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਨਿਰਧਾਨ"
+msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਸ�ੱ� �ਰ�"
 
 #: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
@@ -17290,7 +17152,6 @@ msgstr ""
 "�ਹ ��ਣ�, �� ਤ�ਹਾਡ� ��ਲ ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ ਨਹ�� ਹਨ"
 
 #: ../plugins/imap-features/imap-headers.glade.h:10
-#| msgid "Fetch A_ll Headers"
 msgid "_Fetch All Headers"
 msgstr "ਸਭ ਹ�ੱਡਰ ਲਵ�(_F)"
 
@@ -17336,7 +17197,6 @@ 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 ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�"
 
@@ -17378,7 +17238,6 @@ msgid "Unable to find this memo in any memo list"
 msgstr "�ਿਸ� ਮ�ਮ� ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:839
-#| msgid "Opening calendar"
 msgid "Opening the calendar. Please wait.."
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�। �ਡ��� ��..."
 
@@ -17979,12 +17838,10 @@ msgid "_Inherit reminder"
 msgstr "�ੰਹ�ਰਿ� ਰ�ਮਾ�ਡਰ(_I)"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-#| msgid "_Memos"
 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 "ਪੱਤਰ ਸ�ਨ�ਹਿ�� ਵਿੱ� \"���ਸ�/��ਲੰਡਰ\" ਮਾ�ਮ ਭਾ� ਵ���"
 
@@ -18169,7 +18026,6 @@ 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 "�ਦ�� ਵ� ਨਵਾ� ਸ�ਨ�ਹ� �ਵ� ਤਾ� ਤ�ਹਾਨ�ੰ ਸ��ਨਾ ਦ�ਵ�।"
 
@@ -18178,9 +18034,7 @@ msgstr "�ਦ�� ਵ� ਨਵਾ� ਸ�ਨ�ਹ� �ਵ� ਤਾ�
 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
 #, c-format
@@ -18195,7 +18049,8 @@ 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
 msgid ""
@@ -18217,7 +18072,8 @@ msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 msgstr ""
-"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� "
+"�ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:423
 msgid ""
@@ -18227,7 +18083,8 @@ msgid_plural ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 msgstr[0] ""
-"��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� �ੱ� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵਾ� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+"��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� �ੱ� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵਾ� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� "
+"ਹ�?"
 msgstr[1] ""
 "��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
@@ -18253,12 +18110,13 @@ msgid_plural ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 msgstr[0] ""
-"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹ�। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹ�। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� "
+"ਹ�?"
 msgstr[1] ""
-"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� "
+"�ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:494
-#| msgid "No Summary"
 msgid "[No Summary]"
 msgstr "[ਸੰ��ਪ ਨਹ��]"
 
@@ -18266,8 +18124,8 @@ msgstr "[ਸੰ��ਪ ਨਹ��]"
 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:570
+#, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ਪਰ�ਸ�ਸ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��: %s"
 
@@ -18277,9 +18135,6 @@ 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."
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18292,70 +18147,57 @@ msgid ""
 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."
 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:821
+#, 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/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"
 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/org-gnome-mail-to-task.eplug.xml.h:4
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-#| msgid "Create a new task"
 msgid "Create a _Task"
 msgstr "�ਾਸ� ਬਣਾ�(_T)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
-#| msgid "_Create new view"
 msgid "Create an _Event"
 msgstr "�ਵ��� ਬਣਾ�(_E)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-#| msgid "Mail to task"
 msgid "Mail-to-Task"
 msgstr "ਪੱਤਰ ਤ�� �ੰਮ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
-#| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new event from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� �ਵ��� ਬਣਾ�"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-#| msgid "Create a new meeting request"
 msgid "Create a new meeting from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
-#| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new memo from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
-#| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new task from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� �ਾਸ� ਬਣਾ�"
 
@@ -18381,9 +18223,6 @@ msgid "Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-#| msgid ""
-#| "Provide actions for common mailing list commands (subscribe, "
-#| "unsubscribe...)."
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "�ਮ ਮ�ਲਿੰ� ਸ��� �ਮਾ�ਡਾ� (ਮ��ਬਰ ਬਣ�, ਹ��,...) �ਪਲੱਬਧ �ਰਵਾ�ਦਾ ਹ�।"
 
@@ -18537,12 +18376,10 @@ msgstr ""
 "ਫ�ਲਡਰ ਵ�?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:166
-#| msgid "Current Folder and _Subfolders"
 msgid "In Current Folder and _Subfolders"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� ਵਿੱ�(_S)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:180
-#| msgid "Current _Folder Only"
 msgid "In Current _Folder Only"
 msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ�(_F)"
 
@@ -18555,7 +18392,6 @@ 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 "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
@@ -18568,7 +18404,6 @@ 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 "ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਪਲੱ��ਨ ਪਰਬੰਧ।"
 
@@ -18613,7 +18448,6 @@ 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 "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 
@@ -18685,7 +18519,6 @@ 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 "��ਲੰਡਰ ਵ�ੱਬ �ੱਤ� ਪਬਲਿਸ਼ �ਰ�।"
 
@@ -18694,13 +18527,13 @@ 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:337
+#, 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:97
+#, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: �ਣ�ਾਣ �ਲਤ�"
 
@@ -18724,7 +18557,6 @@ msgid "Are you sure you want to remove this location?"
 msgstr "�� ਤ�ਸ�� �ਹ �ਿ�ਾਣਾ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/publish-calendar/publish-calendar.c:788
-#| msgid "Could not create message."
 msgid "Could not create publish thread."
 msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�।"
 
@@ -18785,7 +18617,6 @@ msgid "Service _type:"
 msgstr "ਸਰਵਿਸ �ਿਸਮ(_T): "
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr "ਸਮਾ� �ੰਤਰਾਲ(_d):"
 
@@ -18910,12 +18741,10 @@ 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 �ੰ� ਫਿਲ�ਰ"
 
@@ -18976,27 +18805,22 @@ msgid "Modified"
 msgstr "ਸ�ਧਿ�"
 
 #: ../plugins/save-calendar/csv-format.c:523
-#| msgid "Advanced options for the CSV format"
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ਫਾਰਮ�� ਲ� ਤ�ਨ��� ��ਣਾ�(_d)"
 
 #: ../plugins/save-calendar/csv-format.c:530
-#| msgid "Prepend a header"
 msgid "Prepend a _header"
 msgstr "ਹ�ੱਡਰ �ੱ�� ����(_h)"
 
 #: ../plugins/save-calendar/csv-format.c:539
-#| msgid "Value delimiter:"
 msgid "_Value delimiter:"
 msgstr "ਮ�ੱਲ ਸ�ਮਾ(_V):"
 
 #: ../plugins/save-calendar/csv-format.c:546
-#| msgid "Record delimiter:"
 msgid "_Record delimiter:"
 msgstr "ਰਿ�ਾਰਡ ਸ�ਮਾ(_R):"
 
 #: ../plugins/save-calendar/csv-format.c:553
-#| msgid "Encapsulate values with:"
 msgid "_Encapsulate values with:"
 msgstr "ਮ�ੱਲ �ਸ ਨਾਲ ਢੱ��(_E):"
 
@@ -19009,7 +18833,6 @@ 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 "��ਣ� ��ਲੰਡਰ �ਾ� �ਾਸ� ਲਿਸ� ਨ�ੰ ਡਿਸ� 'ਤ� ਸੰਭਾਲ�।"
 
@@ -19031,7 +18854,6 @@ msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮ�� (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:104
-#| msgid "Format"
 msgid "_Format:"
 msgstr "ਫਾਰਮ��(_F):"
 
@@ -19040,12 +18862,10 @@ 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 "�ੱ� ਸਰ�ਤ ��ਣ�"
 
@@ -19116,7 +18936,6 @@ 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 "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
 
@@ -19160,12 +18979,10 @@ 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"
 
@@ -19183,26 +19000,21 @@ msgid "Show Compact vCard"
 msgstr "ਥ��ਾ vCard ਵ���"
 
 #: ../plugins/vcard-inline/vcard-inline.c:222
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
 msgid "There is one other contact."
 msgstr "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:231, c-format
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, 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"
 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 ਸੰਪਰ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
@@ -19302,12 +19114,10 @@ msgstr ""
 "keyring �ਾ� ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾ�ਲ ਤ�� ਲਿ� �ਾ�ਦਾ ਹ�।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-#| msgid "Insert Attachment"
 msgid "Initial attachment view"
 msgstr "ਸ਼�ਰ��ਤ� ����ਮ��� �ਲ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-#| msgid "Install the shared folder"
 msgid "Initial file chooser folder"
 msgstr "ਸ਼�ਰ��ਤ� ਫਾ�ਲ ��ਣ�ਾਰ ਫ�ਲਡਰ"
 
@@ -19595,8 +19405,8 @@ msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "�ਨ�ਮ ਪਾ�ਲ� ਤ�ਹਾਡ� ਸਿਸ�ਮ ਤ� �ੰਸ�ਾਲ ਨਹ�� �ਾਪਦਾ ਹ�।"
 
-#: ../shell/e-shell-window-commands.c:78, c-format
-#| msgid "Error executing %s."
+#: ../shell/e-shell-window-commands.c:78
+#, c-format
 msgid "Error executing %s. (%s)"
 msgstr "%s �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: (%s)"
 
@@ -19611,26 +19421,26 @@ 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-commands.c:1026
 msgid "translator-credits"
 msgstr ""
 "�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/";
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-commands.c:1037
 msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
-#: ../shell/e-shell-window-commands.c:1163
+#: ../shell/e-shell-window-commands.c:1251
 msgid "_Work Online"
 msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1264 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1189
+#: ../shell/e-shell-window-commands.c:1277
 msgid "Work Offline"
 msgstr "�ਫ-ਲਾ�ਨ �ਾ�"
 
@@ -21961,15 +21771,12 @@ 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"
 
@@ -21981,38 +21788,37 @@ msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ
 msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1923, c-format
-#| msgid "Could not load address book"
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../widgets/misc/e-attachment.c:1926, c-format
-#| msgid "Could not open the link."
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
 msgid "Could not load the attachment"
 msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2190, c-format
-#| msgid "Could not open source"
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2193, c-format
-#| msgid "Could not open the link."
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
 msgid "Could not open the attachment"
 msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
 #: ../widgets/misc/e-attachment.c:2635
-#| msgid "Attachment Reminder"
 msgid "Attachment contents not loaded"
 msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../widgets/misc/e-attachment.c:2712, c-format
-#| msgid "Could not execute '%s': %s\n"
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2715, c-format
-#| msgid "Select folder to save all attachments"
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
 msgid "Could not save the attachment"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
@@ -22021,46 +21827,38 @@ msgid "Attachment Properties"
 msgstr "����ਮ��� ਵਿਸ਼�ਸਤਾ"
 
 #: ../widgets/misc/e-attachment-dialog.c:328
-#| msgid "F_ilename:"
 msgid "_Filename:"
 msgstr "ਫਾ�ਲਨਾ�(_F):"
 
 #: ../widgets/misc/e-attachment-dialog.c:363
-#| msgid "MIME Type"
 msgid "MIME Type:"
 msgstr "MIME �ਾ�ਪ:"
 
 #: ../widgets/misc/e-attachment-handler-image.c:95
-#| msgid "Set as _Background"
 msgid "Could not set as background"
 msgstr "ਬ���ਰਾ��ਡ ਸ�ੱ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
-#| msgid "Could not open the link."
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "����ਮ��� ਭ��� ਨਹ�� �ਾ ਸ��"
 msgstr[1] "����ਮ���ਾ� ਭ����� ਨਹ�� �ਾ ਸ����"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
-#| msgid "Send To:"
 msgid "_Send To..."
 msgstr "...ਨ�ੰ ਭ���(_S)..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
-#| msgid "Select folder to save selected attachments..."
 msgid "Send the selected attachments somewhere"
 msgstr "��ਣ� ����ਮ��� �ਿਤ� ਭ���"
 
 #: ../widgets/misc/e-attachment-icon-view.c:480
 #: ../widgets/misc/e-attachment-tree-view.c:517
-#| msgid "Loading..."
 msgid "Loading"
 msgstr "ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�..."
 
 #: ../widgets/misc/e-attachment-icon-view.c:492
 #: ../widgets/misc/e-attachment-tree-view.c:529
-#| msgid "Shading"
 msgid "Saving"
 msgstr "ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
 
@@ -22074,8 +21872,6 @@ msgid "Show _Attachment Bar"
 msgstr "����ਮ��� ਪੱ�� ਵ���(_A)"
 
 #: ../widgets/misc/e-attachment-store.c:541
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgid "Add Attachment"
 msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
 
@@ -22084,7 +21880,6 @@ msgid "A_ttach"
 msgstr "����(_t)"
 
 #: ../widgets/misc/e-attachment-store.c:607
-#| msgid "Save attachments"
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "����ਮ��� ਸੰਭਾਲ�"
@@ -22095,17 +21890,16 @@ 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: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 ਵਿੱ� ��ਲ�ਹ�"
 
@@ -22583,7 +22377,6 @@ msgid "_All information"
 msgstr "ਸਭ �ਾਣ�ਾਰ�(_A)"
 
 #: ../widgets/misc/e-send-options.glade.h:30
-#| msgid "_Classification"
 msgid "_Classification:"
 msgstr "ਵਰ���ਰਨ(_C):"
 



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