[evolution/gnome-2-30] complete Translation for Punjabi by A S Alam

[Amanpreet Singh Alam <aman src gnome org>]

commit d23b50f2a3159544ed8b5c6e5f6bcf28ed289590
Author: A S Alam <aalam users sf net>
Date:   Sun Mar 28 09:20:19 2010 +0530

    complete Translation for Punjabi by A S Alam

 po/pa.po |  468 +++++++++++---------------------------------------------------
 1 files changed, 78 insertions(+), 390 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index a99f41e..c6c0a9c 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: 2010-03-17 15:37+0000\n"
-"PO-Revision-Date: 2010-03-20 23:13+0530\n"
+"POT-Creation-Date: 2010-03-27 10:09+0000\n"
+"PO-Revision-Date: 2010-03-28 09:12+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
@@ -2540,11 +2540,11 @@ msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
+msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� ਮ�ਮ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
+msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� �ਾਸ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2595,7 +2595,7 @@ msgstr "ਮ�ਮ� ਲ���� ਸ�ਾ�ਲ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (horizontal)"
-msgstr ""
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Memo preview pane position (vertical)"
@@ -2647,15 +2647,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
@@ -2800,6 +2800,9 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਮ�ਮ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
+"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
+"�ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
@@ -2807,6 +2810,9 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਾਸ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
+"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
+"�ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
@@ -6150,11 +6156,11 @@ msgstr "iCalendar �ਾਣ�ਾਰ�"
 
 #: ../calendar/gui/itip-utils.c:832
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "ਸਰ�ਤ ਬ�ੱ� �ਰਨ ਲ� �ਸਮਰੱਥ, ਨਵਾ� �ਵ��� ਪਹਿਲਾ� ਦ� �ਿਸ� ਨਾਲ ��ਰਾ ਰਿਹਾ ਹ�।"
 
 #: ../calendar/gui/itip-utils.c:834
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "ਸਰ�ਤ ਬ�ੱ� �ਰਨ ਲ� �ਸਮਰੱਥ, �ਲਤ�: "
 
 #: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
@@ -8205,22 +8211,18 @@ msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
 #: ../composer/e-composer-private.c:199
-#| msgid "Copy the selection"
 msgid "Undo the last action"
 msgstr "ਪਿ�ਲ� �ਾਰਵਾ� ਵਾਪਸ ਲਵ�"
 
 #: ../composer/e-composer-private.c:203
-#| msgid "Send Latest Information"
 msgid "Redo the last undone action"
 msgstr "��ਰ� ਵਾਪਸ ��ਤ� �ਾਰਵਾ� ਨ�ੰ ਮ��-�ਰ�"
 
 #: ../composer/e-composer-private.c:207
-#| msgid "Search filter"
 msgid "Search for text"
 msgstr "���ਸ� ����"
 
 #: ../composer/e-composer-private.c:211
-#| msgid "Search for an iPod failed"
 msgid "Search for and replace text"
 msgstr "���ਸ� ਦ� ��� �ਰ� �ਤ� ਬਦਲ�"
 
@@ -8389,37 +8391,31 @@ msgid "Run Anjal in a window"
 msgstr "�ੰ�ਾਲ ਵਿੰਡ� ਵਿੱ� �ਲਾ�"
 
 #: ../capplet/anjal-settings-main.c:203
-#| msgid "Mark as _default memo list"
 msgid "Make Anjal the default email client"
 msgstr "�ੰ�ਾਲ ਨ�ੰ ਡਿਫਾਲ� �ਮ�ਲ �ਲਾ�� ਬਣਾ�"
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplet/anjal-settings-main.c:210
 msgid "ID of the socket to embed in"
-msgstr ""
+msgstr "ਵਿ�� ਸ਼ਾਮਲ �ਰਨ ਲ� ਸਾ�� ਦਾ ID"
 
 #: ../capplet/anjal-settings-main.c:211
-#| msgid "sort"
 msgid "socket"
 msgstr "ਸਾ��"
 
 #: ../capplet/anjal-settings-main.c:225
-#| msgid "Default Mail Client"
 msgid "Anjal email client"
 msgstr "�ੰ�ਾਲ �ਮ�ਲ �ਲਾ��"
 
 #: ../capplet/settings/mail-view.c:244
-#| msgid "New _Task"
 msgid "New Tab"
 msgstr "ਨਵ�� ��ਬ"
 
 #: ../capplet/settings/mail-account-view.c:56
-#| msgid "Please choose another name."
 msgid "Please enter your full name."
 msgstr "�ਪਣਾ ਪ�ਰਾ ਨਾ� ਦਿ�।"
 
 #: ../capplet/settings/mail-account-view.c:57
-#| msgid "Using email address"
 msgid "Please enter your email address."
 msgstr "�ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��।"
 
@@ -8428,57 +8424,47 @@ msgid "The email address you have entered is invalid."
 msgstr "ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ �ਮ�ਲ �ਡਰ�ੱਸ ਢ�ੱ�ਵਾ� ਨਹ�� ਹ�।"
 
 #: ../capplet/settings/mail-account-view.c:224
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">ਨਿੱ�� ਵ�ਰਵਾ:</span>"
 
 #: ../capplet/settings/mail-account-view.c:229
-#| msgid "_Name:"
 msgid "Name:"
 msgstr "ਨਾ�:"
 
 #: ../capplet/settings/mail-account-view.c:238
-#| msgid "Email address"
 msgid "Email address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ:"
 
 #: ../capplet/settings/mail-account-view.c:248
-#| msgid "<span weight=\"bold\">General</span>"
 msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">ਲ�ਣ ਵ�ਰਵਾ:</span>"
 
 #: ../capplet/settings/mail-account-view.c:253
 #: ../capplet/settings/mail-account-view.c:303
-#| msgid "Server _Type:"
 msgid "Server type:"
 msgstr "ਸਰਵਰ �ਿਸਮ:"
 
 #: ../capplet/settings/mail-account-view.c:262
 #: ../capplet/settings/mail-account-view.c:312
-#| msgid "Server Message:"
 msgid "Server address:"
 msgstr "ਸਰਵਰ �ਡਰ�ੱਸ:"
 
 #: ../capplet/settings/mail-account-view.c:272
 #: ../capplet/settings/mail-account-view.c:322
-#| msgid "Us_ername:"
 msgid "Username:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
 #: ../capplet/settings/mail-account-view.c:281
 #: ../capplet/settings/mail-account-view.c:331
-#| msgid "No encryption"
 msgid "Use encryption:"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਵਰਤ��:"
 
 #: ../capplet/settings/mail-account-view.c:286
 #: ../capplet/settings/mail-account-view.c:336
-#| msgid "Never"
 msgid "never"
 msgstr "�ਦ� ਨਹ��"
 
 #: ../capplet/settings/mail-account-view.c:298
-#| msgid "<span weight=\"bold\">General</span>"
 msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">ਭ��ਣ ਵ�ਰਵਾ:</span>"
 
@@ -8488,6 +8474,9 @@ msgid ""
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
+"�ਮ�ਲ �ਪਲ���ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ ਵਾਸਤ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸ���ੱਪ �ਰਨ ਦ� ਲ�� ਹ�। �ਪਣਾ �ਮ�ਲ "
+"�ਡਰ�ੱਸ �ਤ� ਪਾਸਵਰਡ ਹ�ਠਾ� ਭਰ� ��� �ਸ�� ਸਭ ਸ��ਿੰ� �ਪਣ� �ਪ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰਾ���। "
+"�� �ਸ�� �ਹ ਸਭ ��� ���ਮ��ਿ� ਨਾ �ਰ ਸ�� ਤਾ� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸਰਵਰ ਬਾਰ� �ਾਣ�ਾਰ� ਵ� ਦ�ਣ� ਪਵ���।"
 
 #: ../capplet/settings/mail-account-view.c:357
 msgid ""
@@ -8495,9 +8484,11 @@ msgid ""
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
+"�ਫਸ�ਸ, �ਸ�� ਤ�ਹਾਡ� ਮ�ਲ ਲ� ���ਮ��ਿ� ਸ��ਿੰ� ਨਹ�� ਲ� ਸ��। �ਹ ਹ�ਠਾ� ਦਰ� �ਰ� ��। "
+"�ਸ�� ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤ� �� �ਾਣ�ਾਰ� ਮ�ਤਾਬ� ਪ�ਰਾ ਵ�ਰਵਾ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ ਤਾ� ��ਤ� ਹ�, ਪਰ "
+"ਤ�ਹਾਨ�ੰ �ਹਨਾ� ਨ�ੰ ਬਦਲਣਾ ਵ� ਪ� ਸ�ਦਾ ਹ�।"
 
 #: ../capplet/settings/mail-account-view.c:359
-#| msgid "You may only configure a single Exchange account."
 msgid "You can specify more options to configure the account."
 msgstr "ਤ�ਸ�� ��ਾ��� ਸੰਰ�ਨਾ ਲ� ਹ�ਰ ��ਣਾ� ਦ� ਸ�ਦ� ਹ�।"
 
@@ -8506,6 +8497,8 @@ msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
+"ਹ�ਣ ਤ�ਹਾਨ�ੰ ਮ�ਲ ਭ��ਣ ਲ� ਸ��ਿੰ� ਦ�ਣ ਦ� ਲ�� ਹ�। �ਸ�� ��� �ੰਦਾ�਼ਾ ਲ�ਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ��ੱ�� ਹਾ�, ਪਰ ਤ�ਹਾਨ�ੰ "
+"�ਹ ��ੱ� �ਰ ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਿ �ਹ ਠ�� ਹਨ।"
 
 #: ../capplet/settings/mail-account-view.c:362
 msgid "You can specify your default settings for your account."
@@ -8516,6 +8509,8 @@ msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr ""
+"ਸਮਾ� ਹ� ��ੱ� �ਰਨ ਦਾ, �ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਸ�� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ�� �ਤ� ਤ�ਹਾਡ��� "
+"ਮ�ਲਾ� ਲ�ਣ��� ਸ਼�ਰ� �ਰ��।"
 
 #: ../capplet/settings/mail-account-view.c:378
 #: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
@@ -8524,60 +8519,49 @@ msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
 #: ../capplet/settings/mail-account-view.c:378
-#| msgid "Receiving Email"
 msgid "Next - Receiving mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਲ�ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Email"
 msgid "Receiving mail"
 msgstr "�ਮ�ਲ ਲ�ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:379
 #: ../capplet/settings/mail-account-view.c:380
-#| msgid "Sending Email"
 msgid "Next - Sending mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਭ��ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:379
-#| msgid "Identity"
 msgid "Back - Identity"
 msgstr "ਪਿੱ�� - ਪ�ਾਣ"
 
 #: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Options"
 msgid "Next - Receiving options"
 msgstr "�ੱ�� - ਲ�ਣ ��ਣਾ�"
 
 #: ../capplet/settings/mail-account-view.c:380
-#| msgid "Receiving Options"
 msgid "Receiving options"
 msgstr "ਲ�ਣ ��ਣਾ�"
 
 #: ../capplet/settings/mail-account-view.c:380
 #: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Email"
 msgid "Back - Receiving mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਲ�ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:382
-#| msgid "Sending Email"
 msgid "Sending mail"
 msgstr "ਮ�ਲ ਭ��ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:382
 #: ../capplet/settings/mail-account-view.c:383
-#| msgid "Delete account?"
 msgid "Next - Review account"
 msgstr "�ੱ�� - ��ਾ��� ਪ�ਤਾਲ"
 
 #: ../capplet/settings/mail-account-view.c:382
-#| msgid "Defaults"
 msgid "Next - Defaults"
 msgstr "�ੱ�� - ਡਿਫਾਲ�"
 
 #: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Options"
 msgid "Back - Receiving options"
 msgstr "ਪਿੱ�� - ਲ�ਣ ��ਣਾ�"
 
@@ -8587,49 +8571,40 @@ msgid "Defaults"
 msgstr "ਮ�ਲ"
 
 #: ../capplet/settings/mail-account-view.c:383
-#| msgid "Sending Email"
 msgid "Back - Sending mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਭ��ਣ���"
 
 #: ../capplet/settings/mail-account-view.c:385
-#| msgid "Delete account?"
 msgid "Review account"
 msgstr "��ਾ��� ਪ�ਤਾਲ"
 
 #: ../capplet/settings/mail-account-view.c:385
-#| msgid "Fiji"
 msgid "Finish"
 msgstr "ਮ��ੰਮਲ"
 
 #: ../capplet/settings/mail-account-view.c:385
-#| msgid "Ascending"
 msgid "Back - Sending"
 msgstr "ਪਿੱ�� - ਭ��ਣਾ"
 
 #: ../capplet/settings/mail-account-view.c:719
 #: ../capplet/settings/mail-settings-view.c:266
-#| msgid "Close"
 msgid "Close Tab"
 msgstr "��ਬ ਬੰਦ �ਰ�"
 
 #: ../capplet/settings/mail-account-view.c:729
-#| msgid "Account Editor"
 msgid "Account Wizard"
 msgstr "��ਾ��� ਸਹਾ��"
 
 #: ../capplet/settings/mail-capplet-shell.c:284
-#| msgid "Evolution Account Assistant"
 msgid "Evolution account assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
 #: ../capplet/settings/mail-capplet-shell.c:320
 #: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
 msgid "Email Settings"
 msgstr "�ਮ�ਲ ਸ��ਿੰ�"
 
 #: ../capplet/settings/mail-capplet-shell.c:334
-#| msgid "_Quit"
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
@@ -8657,17 +8632,14 @@ msgid "Modify"
 msgstr "ਸ�ਧ"
 
 #: ../capplet/settings/mail-settings-view.c:150
-#| msgid "Add IM Account"
 msgid "Add a new account"
 msgstr "ਨਵਾ� ��ਾ��� ਸ਼ਾਮਲ"
 
 #: ../capplet/settings/mail-settings-view.c:185
-#| msgid "<span weight=\"bold\">Account Information</span>"
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span size=\"large\" weight=\"bold\">��ਾ��� ਪਰਬੰਧ</span>"
 
 #: ../capplet/settings/mail-settings-view.c:276
-#| msgid "Junk Settings"
 msgid "Settings"
 msgstr "ਸ��ਿੰ�"
 
@@ -8697,7 +8669,6 @@ msgid "Manage your email, contacts and schedule"
 msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ���, ਸੰਪਰ� �ਤ� ਸ਼�ਡਿ�ਲ ਦਾ ਪਰਬੰਧ �ਰ�"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "�ਮ�ਲ ��ਾ��� ਸੰਰ�ਨਾ"
 
@@ -10399,12 +10370,11 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 #: ../mail/em-composer-utils.c:1578
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr ""
+msgstr "ਤ�ਹਾਡਾ %s ਵੱਲ ਸ�ਨ�ਹਾ \"%s\" ਬਾਰ�, �� %s ਨ�ੰ ਭ��ਿ� ਸ�, ਪ��ਹਿ� �ਾ ��ੱ�ਿ� ਹ�।"
 
 #. Translators: %s is the subject of the email message
 #: ../mail/em-composer-utils.c:1626
 #, c-format
-#| msgid "Mail Notification Properties"
 msgid "Delivery Notification for: \"%s\""
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ: \"%s\""
 
@@ -11727,6 +11697,8 @@ msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
+"ਸਹ�� ਸ�ੱ� �ਰ�, �� ਤ�ਸ�� ਮ�ਲ ਲਿ�ਣ ਦ� ਦ�ਰਾਨ, �ਪਣ� ਦਸਤ�ਤਾ� ਤ�� ਪਹਿਲਾ� ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ "
+"ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
@@ -11782,7 +11754,7 @@ msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
 
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show original \"Date\" header value."
-msgstr ""
+msgstr "�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਮ�ੱਲ ਵ���।"
 
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
@@ -11848,6 +11820,8 @@ msgid ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
+"�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਵ��� (ਲ��ਲ ਸਮ�� ਨਾਲ, �� ਸਮਾ� ��ਤਰ ਵੱ�ਰਾ ਹ�ਵ�)। ਨਹ�� ਤਾ� ਹਮ�ਸ਼ਾ \"ਮਿਤ�\" "
+"ਹ�ੱਡਰ ਮ�ੱਲ ਯ��਼ਰ ਵਲ�� ਦੱਸ� ਫਾਰਮ�� ਨਾਲ �ਤ� ਲ��ਲ ਸਮਾ� ��ਤਰ ਵ���।"
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
@@ -11900,6 +11874,9 @@ msgid ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸ�ਨ�ਹਾ ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
+"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
+"�ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
@@ -13455,9 +13432,6 @@ msgid ""
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
 
 #: ../mail/mail.error.xml.h:61
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ ਦ� ਸਾਰ� ਸਮੱ�ਰ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
@@ -13573,7 +13547,6 @@ msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰ \"{0}\" �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
 #: ../mail/mail.error.xml.h:87
-#| msgid "Cannot delete folder \"{0}\"."
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
 
@@ -13663,12 +13636,16 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
+"�ੱ�� ਦਿੱਤ� ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ ਢ�ੱ�ਵ�� ਮ�ਲ �ਡਰ�ੱਸ ਵ��� ਪ�ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ�:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
+"�ੱ�� ਦਿੱਤ� ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ ਢ�ੱ�ਵ�� ਮ�ਲ �ਡਰ�ੱਸ ਵ��� ਪ�ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ�:\n"
+"{0}"
 
 #  mail:signature-notscript secondary
 #: ../mail/mail.error.xml.h:113
@@ -14063,7 +14040,7 @@ msgstr "ਸੰਪਰ� ਲ���� ਸ�ਾ�ਲ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Contact preview pane position (horizontal)"
-msgstr ""
+msgstr "ਸੰਪਰ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid "Contact preview pane position (vertical)"
@@ -14079,11 +14056,11 @@ msgstr "ਮ��ੰਮਲ URI ਸ��� ਲ� EFolderList XML ਹ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
+msgstr "ਸੰਪਰ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
+msgstr "ਸੰਪਰ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
@@ -14091,7 +14068,7 @@ msgstr "�ਡਰ�ੱਸ ਨਾਲ ���-ਪ�ਰਾ ਨਾ� ਵ��
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show preview pane"
-msgstr "�ਲ� ਪ�ਨ ਵ��ਾ�"
+msgstr "�ਲ� ਪ�ਨ ਵ���"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid ""
@@ -14100,6 +14077,9 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸੰਪਰ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
+"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
+"�ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
@@ -14198,7 +14178,7 @@ msgstr "ਮ���ਦਾ �ਲ�"
 
 #: ../modules/addressbook/e-book-shell-content.c:365
 msgid "The currently selected address book view"
-msgstr ""
+msgstr "ਮ���ਦਾ ��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� �ਲ�"
 
 #: ../modules/addressbook/e-book-shell-content.c:374
 msgid "Previewed Contact"
@@ -14279,7 +14259,6 @@ msgid "Source Selector Widget"
 msgstr "ਸਰ�ਤ ��ਣ�ਾਰ� ਵਿਦ��ੱ�"
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:182
-#| msgid "Couldn't get list of address books"
 msgid "This widget displays groups of address books"
 msgstr "�ਹ ਵਿਦ��ੱ� �ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
 
@@ -14293,7 +14272,6 @@ msgid "Co_py All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� �ਾਪ� (_p)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:664
-#| msgid "Copy the contacts of the selected folder into another folder"
 msgid "Copy the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ� ਦ� �ਾਪ� ਹ�ਰ ਨ�ੰ ਭ���"
 
@@ -14310,7 +14288,6 @@ msgid "Mo_ve All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ���(_v)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:678
-#| msgid "Move the contacts of the selected folder into another folder"
 msgid "Move the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ ਹ�ਰਾ� ਵਿੱ� ਭ���"
 
@@ -14323,7 +14300,6 @@ msgid "Address _Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ (_B)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:692
-#| msgid "Change the properties of the selected folder"
 msgid "Show properties of the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਵ���"
 
@@ -14336,22 +14312,18 @@ msgid "_Rename..."
 msgstr "ਨਾ� ਬਦਲ�(_R)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:699
-#| msgid "Rename the selected folder"
 msgid "Rename the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦਾ ਨਾ� ਬਦਲ�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:704
-#| msgid "S_ave Address Book As VCard"
 msgid "S_ave Address Book as vCard"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� vC_ard ਵਾ�� ਸੰਭਾਲ�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:706
-#| msgid "Save the contacts of the selected folder as VCard"
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ vCard ਵਾ�� ਸੰਭਾਲ�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:713
-#| msgid "Stop Loading"
 msgid "Stop loading"
 msgstr "ਲ�ਡ �ਰਨਾ ਰ���"
 
@@ -14372,7 +14344,6 @@ msgid "_Find in Contact..."
 msgstr "ਸੰਪਰ� ਵਿੱ� ���(_F)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:734
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed contact"
 msgstr "ਦਿੱਸ ਰਹ� ਸੰਪਰ� ਵਿੱ� ���ਸ� ਦ� ���"
 
@@ -14389,7 +14360,6 @@ msgid "_Move Contact To..."
 msgstr "ਸੰਪਰ� �ੱਥ� ਭ���(_M)..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:748
-#| msgid "Move selected contacts to another folder"
 msgid "Move selected contacts to another address book"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ���"
 
@@ -14472,7 +14442,6 @@ msgid "_Vertical View"
 msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:869
-#| msgid "Show contact preview window"
 msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਸੰਪਰ� �ਲ� ਵ���"
 
@@ -14504,7 +14473,6 @@ msgid "Print all shown contacts"
 msgstr "ਸਭ ਦਿ�ਾ� ਦਿੰਦ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:934
-#| msgid "Previews the contacts to be printed"
 msgid "Preview the contacts to be printed"
 msgstr "ਪਰਿੰ� �ਾਣ ਵਾਲ� ਸੰਪਰ�ਾ� ਦ� �ਲ�"
 
@@ -14517,7 +14485,6 @@ msgid "Save as vCard..."
 msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:958
-#| msgid "Save selected contacts as a VCard"
 msgid "Save selected contacts as a vCard"
 msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
 
@@ -14630,7 +14597,7 @@ msgstr "ਸਹਾ�� ��� �ਧਾਰ"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using distinguished name (DN)"
-msgstr ""
+msgstr "ਵਿੱਲਣ ਨਾ� (DN) ਵਰਤ��"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
 msgid "Using email address"
@@ -14806,7 +14773,7 @@ msgstr "ਡਾ�ਾ ਨ�ਵ����ਰ ਵਿਦ��ੱ�"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:742
 msgid "This widget displays a miniature calendar"
-msgstr ""
+msgstr "�ਹ ਵਿਦ��ੱ� ਮਿੰਨ���ਰ ��ਲੰਡਰ ਵ��ਾ��ਦਾ ਹ�"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:751
 msgid "Default Calendar Client"
@@ -14818,12 +14785,11 @@ msgstr "��ਲੰਡਰ �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:762
 msgid "This widget displays groups of calendars"
-msgstr ""
+msgstr "�ਹ ਵਿਦ��ੱ� ��ਲੰਡਰਾ� ਦਾ �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
 
 #. Translators: The string field is a URI.
 #: ../modules/calendar/e-cal-shell-sidebar.c:950
 #, c-format
-#| msgid "Opening calendar"
 msgid "Opening calendar at %s"
 msgstr "%s ਤ�� ��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -14866,7 +14832,6 @@ msgstr "�ਵ���"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
 #: ../modules/calendar/e-task-shell-view-actions.c:611
-#| msgid "Select a Calendar"
 msgid "Save as iCalendar"
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�"
 
@@ -14876,22 +14841,18 @@ msgid "_Copy..."
 msgstr "�ਾਪ� �ਰ�(_C)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1237
-#| msgid "Select a Calendar"
 msgid "D_elete Calendar"
 msgstr "��ਲੰਡਰ ਹ�ਾ�(_e)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1239
-#| msgid "Delete the selected folder"
 msgid "Delete the selected calendar"
 msgstr "��ਣਿ� ��ਲੰਡਰ ਹ�ਾ�"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1246
-#| msgid "Go back"
 msgid "Go Back"
 msgstr "ਪਿੱ�� �ਾ�"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1253
-#| msgid "Go forward"
 msgid "Go Forward"
 msgstr "�ੱ�� �ਾ�"
 
@@ -14931,12 +14892,10 @@ msgid "Re_fresh"
 msgstr "ਮ��-ਤਾ�ਾ(_f)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1295
-#| msgid "Rename the selected folder"
 msgid "Refresh the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਤਾ�਼ਾ �ਰ�"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#| msgid "Rename the selected folder"
 msgid "Rename the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
@@ -14981,7 +14940,6 @@ msgid "New All Day _Event..."
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ���(_E)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#| msgid "Create a new all-day appointment"
 msgid "Create a new all day event"
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ��� ਬਣਾ�"
 
@@ -15027,7 +14985,6 @@ msgstr "�ਵਾਬ(_R)"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#| msgid "Save as vCard..."
 msgid "Save as iCalendar..."
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�..."
 
@@ -15036,17 +14993,14 @@ msgid "_Schedule Meeting..."
 msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#| msgid "Purge old appointments and meetings"
 msgid "Converts an appointment to a meeting"
 msgstr "ਮ�ਲਾ�ਾਤ ਨ�ੰ ਮ��ਿੰ� ਵਿੱ� ਬਦਲ�"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1426
-#| msgid "New _Appointment..."
 msgid "Conv_ert to Appointment..."
 msgstr "ਮ�ਲਾ�ਤਾ '� ਬਦਲ�(_e)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1428
-#| msgid "%s at the end of the appointment"
 msgid "Converts a meeting to an appointment"
 msgstr "ਮ��ਿੰ� ਨ�ੰ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਬਦਲ�"
 
@@ -15083,7 +15037,6 @@ msgid "Show one week"
 msgstr "�ੱ� ਹ�ਤਾ ਵ���"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1580
-#| msgid "Show one week"
 msgid "Show one work week"
 msgstr "�ੱ� �ੰਮ ਹਫ਼ਤਾ ਵ���"
 
@@ -15112,7 +15065,6 @@ msgid "Print this calendar"
 msgstr "�ਹ ��ਲੰਡਰ ਪਰਿੰ� �ਰ�"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1659
-#| msgid "Previews the calendar to be printed"
 msgid "Preview the calendar to be printed"
 msgstr "ਪਰਿੰ� ਹ�ਣ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
 
@@ -15190,7 +15142,6 @@ msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
 #: ../modules/calendar/e-task-shell-view-actions.c:757
-#| msgid "Mark selected tasks as complete"
 msgid "Mark selected tasks as incomplete"
 msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
 
@@ -15251,7 +15202,6 @@ msgid "Create a new memo list"
 msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
 
 #: ../modules/calendar/e-memo-shell-backend.c:588
-#| msgid "Primary memo list"
 msgid "The registry of memo lists"
 msgstr "ਮ�ਮ� ਲਿਸ�ਾ� ਦ� ਰ�ਿਸ�ਰ�"
 
@@ -15273,7 +15223,6 @@ msgstr "ਡਿਫਾਲ� ਮ�ਮ� �ਲਾ��"
 
 #  mail:async-error-nodescribe primary
 #: ../modules/calendar/e-memo-shell-sidebar.c:678
-#| msgid "Cannot perform the operation."
 msgid "Default client for memo operations"
 msgstr "ਮ�ਮ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
 
@@ -15301,17 +15250,14 @@ msgid "_Find in Memo..."
 msgstr "ਮ�ਮ� '� ���(_F)..."
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:563
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed memo"
 msgstr "ਦਿੱਸ ਰਹ� ਮ�ਮ� ਵਿੱ� ���ਸ� ਦ� ���"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:582
-#| msgid "_New Memo List"
 msgid "D_elete Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ� ਹ�ਾ�(_e)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:584
-#| msgid "Delete selected memos"
 msgid "Delete the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਹ�ਾ�"
 
@@ -15320,17 +15266,14 @@ msgid "_New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:605
-#| msgid "Delete selected memos"
 msgid "Refresh the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:612
-#| msgid "Rename the selected folder"
 msgid "Rename the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:617
-#| msgid "Show _only this Memo List"
 msgid "Show _Only This Memo List"
 msgstr "��ਵਲ �ਹ ਮ�ਮ� ਲਿਸ� ਵ���(_O)"
 
@@ -15339,17 +15282,14 @@ msgid "Memo _Preview"
 msgstr "ਮ�ਮ� �ਲ�(_P)"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:698
-#| msgid "Show preview pane"
 msgid "Show memo preview pane"
 msgstr "ਮ�ਮ� �ਲ� ਪ�ਨ ਵ���"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:719
-#| msgid "Show message preview below the message list"
 msgid "Show memo preview below the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਹ�ਠਾ� ਮ�ਮ� �ਲ� ਵ���"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
-#| msgid "Show message preview below the message list"
 msgid "Show memo preview alongside the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਮ�ਮ� �ਲ� ਵ���"
 
@@ -15358,7 +15298,6 @@ msgid "Print the list of memos"
 msgstr "ਮ�ਮ� ਦ� ਸ��� ਪਰਿੰ� �ਰ�"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:791
-#| msgid "Previews the list of memos to be printed"
 msgid "Preview the list of memos to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਮ�ਮ� ਦ� ਸ��� ਦ� �ਲ�"
 
@@ -15408,7 +15347,6 @@ msgid "Create a new task list"
 msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
 
 #: ../modules/calendar/e-task-shell-backend.c:598
-#| msgid "Primary task list"
 msgid "The registry of task lists"
 msgstr "�ੰਮ ਲਿਸ� ਦ� ਰ�ਿ�ਰ�"
 
@@ -15447,7 +15385,6 @@ msgid "Default Task Client"
 msgstr "ਡਿਫਾਲ� �ਾਸ� �ਲਾ��"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:678
-#| msgid "Default value for thread expand state"
 msgid "Default client for task operations"
 msgstr "�ਾਸ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
 
@@ -15487,7 +15424,6 @@ msgid "_Find in Task..."
 msgstr "�ਾਸ� '� ���(_F)..."
 
 #: ../modules/calendar/e-task-shell-view-actions.c:687
-#| msgid "Search for text in the body of the displayed message"
 msgid "Search for text in the displayed task"
 msgstr "ਦਿੱਸ ਰਹ� �ਾਸ� ਵਿੱ� ���ਸ� ਦ� ���"
 
@@ -15496,12 +15432,10 @@ msgid "Copy..."
 msgstr "�ਾਪ�..."
 
 #: ../modules/calendar/e-task-shell-view-actions.c:706
-#| msgid "Select a Task List"
 msgid "D_elete Task List"
 msgstr "�ੰਮ ਲਿਸ� ਹ�ਾ�(_e)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:708
-#| msgid "Delete selected tasks"
 msgid "Delete the selected task list"
 msgstr "��ਣ� �ੰਮ ਲਿਸ� ਹ�ਾ�"
 
@@ -15514,17 +15448,14 @@ msgid "Refresh the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:736
-#| msgid "Rename the selected folder"
 msgid "Rename the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:741
-#| msgid "Show _only this Task List"
 msgid "Show _Only This Task List"
 msgstr "�ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:755
-#| msgid "_Mark as Incomplete"
 msgid "Mar_k as Incomplete"
 msgstr "�ਧ�ਰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
@@ -15537,17 +15468,14 @@ msgid "Task _Preview"
 msgstr "�ੰਮ �ਲ�(_P)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:862
-#| msgid "Show preview pane"
 msgid "Show task preview pane"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:883
-#| msgid "Show message preview below the message list"
 msgid "Show task preview below the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਹ�ਠਾ� �ਾਸ� �ਲ� ਵ���"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:890
-#| msgid "Show message preview below the message list"
 msgid "Show task preview alongside the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਨਾਲ �ਾਸ� �ਲ� ਵ���"
 
@@ -15576,7 +15504,6 @@ msgid "Print the list of tasks"
 msgstr "�ੰਮ ਸ��� ਪਰਿੰ� �ਰ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:990
-#| msgid "Previews the list of tasks to be printed"
 msgid "Preview the list of tasks to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਰ� ਸ��� ਦ� �ਲ�"
 
@@ -15652,7 +15579,7 @@ msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ"
 
 #: ../modules/mail/e-mail-shell-content.c:680
 msgid "Whether to group messages by threads"
-msgstr ""
+msgstr "�� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮਾਮਲ� ਰਾਹ�� �ਰ�ੱਪ �ਰਨਾ ਹ�"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:855
 #: ../modules/mail/e-mail-shell-view.c:875
@@ -15664,7 +15591,6 @@ msgid "Disable this account"
 msgstr "�ਹ ��ਾ��� �ਯ��"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:864
-#| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਤ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�"
 
@@ -15677,7 +15603,6 @@ msgid "_Download Messages for Offline Usage"
 msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:878
-#| msgid "Download messages of accounts/folders marked for offline"
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਮਾਰ� ��ਤ� ��ਾ��� �ਤ� ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
 
@@ -15762,7 +15687,6 @@ msgid "_Unsubscribe"
 msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:969
-#| msgid "Rename the selected folder"
 msgid "Unsubscribe from the selected folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ ਹ�ਾ�"
 
@@ -15771,7 +15695,6 @@ msgid "Empty _Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_T)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:976
-#| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ��ਾ��� ਤ�� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
@@ -15840,7 +15763,6 @@ msgid "Search F_olders"
 msgstr "ਫ�ਲਡਰ ���(_o)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1062
-#| msgid "Create or edit Search Folder definitions"
 msgid "Create or edit search folder definitions"
 msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
@@ -15877,7 +15799,6 @@ msgid "Show Message _Preview"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ���(_P)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1158
-#| msgid "Show message preview window"
 msgid "Show message preview pane"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ���"
 
@@ -15886,7 +15807,6 @@ msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1166
-#| msgid "Threaded Message list"
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
 
@@ -15895,7 +15815,6 @@ msgid "Show message preview below the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1194
-#| msgid "Show message preview below the message list"
 msgid "Show message preview alongside the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਨਾਲ ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
@@ -15936,7 +15855,6 @@ msgid "Unread Messages"
 msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1310
-#| msgid "Subject or Addresses contains"
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
@@ -16090,7 +16008,6 @@ msgid "_Date header:"
 msgstr "ਮਿਤ� ਹ�ੱਡਰ(_D):"
 
 #: ../modules/mail/em-mailer-prefs.c:1154
-#| msgid "Show _Original Size"
 msgid "Show _original header value"
 msgstr "�ਸਲ� ਹ�ੱਡਰ ਮ�ੱਲ ਵ���(_o)"
 
@@ -16168,7 +16085,6 @@ msgid "Inline Audio"
 msgstr "ਲਾ�ਨ '� �ਡ��"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#| msgid "Play audio attachments directly from Evolution."
 msgid "Play audio attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਤ�� �ਡ�� ����ਮ��� ਸਿੱਧ��� �ਲਾ�।"
 
@@ -16194,9 +16110,8 @@ msgid ""
 "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"
@@ -16219,7 +16134,6 @@ msgid "_Backup Settings..."
 msgstr "ਬ���ੱਪ ਸ��ਿੰ�(_B)..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਵਿੱ� ਬ���ੱਪ ਲਵ�"
 
@@ -16228,7 +16142,6 @@ msgid "R_estore Settings..."
 msgstr "ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
-#| msgid "Backup and restore Evolution data and settings"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
@@ -16444,7 +16357,7 @@ msgstr ""
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
-msgstr ""
+msgstr "Bogofilter �ਪਲੱਬਧ ਨਹ�� ਹ�। ਪਹਿਲਾ� �ਹ �ੰਸ�ਾਲ �ਰ�।"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
@@ -16496,11 +16409,11 @@ msgstr "Bogfilter ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ
 
 #: ../plugins/caldav/caldav-browse-server.c:198
 msgid "Authentication failed. Server requires correct login."
-msgstr ""
+msgstr "ਪਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��। ਸਰਵਰ ਲ� ਢ�ੱ�ਵਾ� ਲਾ��ਨ �ਾਹ�ਦਾ ਹ�।"
 
 #: ../plugins/caldav/caldav-browse-server.c:200
 msgid "Given URL cannot be found."
-msgstr ""
+msgstr "ਦਿੱਤਾ URL ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ।"
 
 #: ../plugins/caldav/caldav-browse-server.c:204
 #, c-format
@@ -16508,6 +16421,8 @@ msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
+"ਸਰਵਰ ਨ� �ਣ�ਾਣ ਡਾ�ਾ ਭ��ਿ� ਹ�।\n"
+"%d - %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:204
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
@@ -16517,39 +16432,30 @@ msgstr "�ਣ�ਾਣ� �ਲਤ�"
 #  FIXME: domain/code
 #: ../plugins/caldav/caldav-browse-server.c:334
 #: ../plugins/caldav/caldav-browse-server.c:585
-#| msgid "Failed to update delegates:"
 msgid "Failed to parse server response."
 msgstr "ਸਰਵਰ �ਵਾਬ ਪਾਰਸ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
 #: ../plugins/caldav/caldav-browse-server.c:428
-#| msgid "Ends"
 msgid "Events"
 msgstr "�ਵ���"
 
 #: ../plugins/caldav/caldav-browse-server.c:450
-#| msgid "New calendar"
 msgid "User's calendars"
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ"
 
 #: ../plugins/caldav/caldav-browse-server.c:558
 #: ../plugins/caldav/caldav-browse-server.c:629
-#| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to get server URL."
 msgstr "ਸਰਵਰ URL ਲ�ਣ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
 #: ../plugins/caldav/caldav-browse-server.c:627
 #: ../plugins/caldav/caldav-browse-server.c:668
 #: ../plugins/caldav/caldav-browse-server.c:1272
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
 msgid "Searching for user's calendars..."
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
 #  FIXME: domain/code
 #: ../plugins/caldav/caldav-browse-server.c:666
-#| msgid "Unable to find any calendars"
 msgid "Could not find any user calendar."
 msgstr "ਯ��਼ਰ ��ਲੰਡਰ ਨਹ�� ਲੱਭਿ� �ਾ ਸ�ਿ�।"
 
@@ -16565,40 +16471,29 @@ msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ��ਡ %d ਨਾਲ ਫ�ਲ
 
 #: ../plugins/caldav/caldav-browse-server.c:799
 #, c-format
-#| msgid "Enter password for %s (user %s)"
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr "<b>%2$s</b> ਸਰਵਰ �ੱਤ� <b>%1$s</b> ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
 #: ../plugins/caldav/caldav-browse-server.c:856
 #, c-format
-#| msgid ""
-#| "Cannot create output file: %s:\n"
-#| " %s"
 msgid "Cannot create soup message for URL '%s'"
 msgstr "URL '%s' ਲ� soup ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1091
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
 msgid "Searching folder content..."
 msgstr "ਫ�ਲਡਰ ਸਮੱ�ਰ� ���� �ਾ ਰਹ� ਹ�..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1134
-#| msgid "Local Calendars"
 msgid "List of available calendars:"
 msgstr "�ਪਲੱਬਧ ��ਲੰਡਰਾ� ਦ� ਲਿਸ�:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1171
-#| msgid "Hula Support"
 msgid "Supports"
 msgstr "ਸਹਿਯ��"
 
 #: ../plugins/caldav/caldav-browse-server.c:1249
 #, c-format
-#| msgid "Failed to create pipe: %s"
 msgid "Failed to create thread: %s"
 msgstr "ਥਰਿੱਡ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
@@ -16741,7 +16636,6 @@ msgstr "�ੱ� �ਿ�ਾਣਾ ��ਣ�"
 #. Translators: "None" location for a weather calendar
 #: ../plugins/calendar-weather/calendar-weather.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:371
-#| msgid "None"
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "��� ਨਹ��"
@@ -16768,12 +16662,10 @@ msgstr "ਮ�ਸਮ ��ਲੰਡਰ"
 
 #: ../plugins/contacts-map/contacts-map.c:55
 #: ../plugins/contacts-map/contacts-map.c:201
-#| msgid "Contacts: "
 msgid "Contacts map"
 msgstr "ਸੰਪਰ� ਨ�ਸ਼ਾ"
 
 #: ../plugins/contacts-map/contacts-map.c:56
-#| msgid "Send a message to the selected contacts"
 msgid "Show a map of all the contacts"
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਲ� ਨ�ਸ਼ਾ ਵ���"
 
@@ -16782,7 +16674,6 @@ msgid "Add a map showing the location of contacts when possible."
 msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ� ਤਾ� ਸੰਪਰ�ਾ� ਦਾ �ਿ�ਾਣਾ ਵ��ਾ�ਣ ਲ� ਨ�ਸ਼ਾ ����।"
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#| msgid "No contacts"
 msgid "Map for contacts"
 msgstr "ਸੰਪਰ�ਾ� ਲ� ਮ�ਪ"
 
@@ -16811,7 +16702,6 @@ msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
 #: ../plugins/default-source/default-source.c:88
-#| msgid "Show autocompleted name with an address"
 msgid "A_utocomplete with this address book"
 msgstr "�ਸ �ਡਰ�ੱਸ ਬ�ੱ� ਨਾਲ ���-ਪ�ਰਨ(_u)"
 
@@ -16872,7 +16762,6 @@ msgstr "ਬਹ�ਤ ��ਪਤ"
 #. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
 #. indicating the header will not be added to a mail message
 #: ../plugins/email-custom-header/email-custom-header.c:379
-#| msgid "None"
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "��� ਨਹ��"
@@ -16997,14 +16886,14 @@ msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
+"�� ਭ��� �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਿਹਰਾ ਤਸਵ�ਰ ਮ�ਲ ਰ�ਪ ਵਿੱ� ���ਨ� ਹ�। ਤਸਵ�ਰ ਨ�ੰ �ਹ �ਲਿੱ� �ਰਨ ਤ�� "
+"ਪਹਿਲਾ� ਸ�ੱ� �ਰਨ ਦ� ਲ�� ਹ�, ਨਹ�� ਤਾ� ��� ਨਹ�� ਹ�ਵ��ਾ।"
 
 #: ../plugins/face/face.c:286
-#| msgid "Select a (48*48) png of size < 700bytes"
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "�ੱ�  png ਤਸਵ�ਰ ��ਣ� ( ੭੨੦ < ਬਾ��  ��ਾਰ ਦਾ ਵਧ�� ੪੮*੪੮)"
 
 #: ../plugins/face/face.c:296
-#| msgid "Importing files"
 msgid "Image files"
 msgstr "ਤਸਵ�ਰ ਫਾ�ਲਾ�"
 
@@ -17017,36 +16906,30 @@ msgid "Load new _Face picture"
 msgstr "ਨਵ�� �ਿਹਰਾ ਤਸਵ�ਰ ਲ�ਡ �ਰ�(_F)"
 
 #: ../plugins/face/face.c:415
-#| msgid "Include:"
 msgid "Include _Face"
 msgstr "�ਿਹਰਾ ਸ਼ਾਮਲ(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Attach a small picture of your face to outgoing messages."
-msgstr ""
+msgstr "ਭ��� �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਪਣ� �ਿਹਰ� ਦ� ���� �ਿਹਾ ਤਸਵ�ਰ ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:1
-#| msgid "Table header"
 msgid "Failed Read"
 msgstr "ਪ��ਹਨ ਲ� ਫ�ਲ�ਹ"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-#| msgid "Invalid Date Value"
 msgid "Invalid Image Size"
 msgstr "�ਢ�ੱ�ਵਾ� �ਿੱਤਰ ��ਾਰ"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-#| msgid "_No image"
 msgid "Not an image"
 msgstr "�ਿੱਤਰ ਨਹ��"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-#| msgid "Please select an image for this contact"
 msgid "Please select an image of size 48 * 48"
 msgstr "੪੮ * ੪੮ ��ਾਰ ਦਾ �ਿੱਤਰ ��ਣ� ��"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-#| msgid "The item could not be sent!\n"
 msgid "The file cannot be read"
 msgstr "ਫਾ�ਲ ਪ��ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
 
@@ -17139,17 +17022,6 @@ msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
 #: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
-#| msgid ""
-#| "The user '%s' has shared a folder with you\n"
-#| "\n"
-#| "Message from '%s'\n"
-#| "\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
-#| "\n"
-#| "Click 'Forward' to install the shared folder\n"
-#| "\n"
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17195,7 +17067,6 @@ msgid "Email:"
 msgstr "�ਮ�ਲ:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:2
-#| msgid "_Junk List"
 msgid "Junk List:"
 msgstr "�ੰ� ਲਿਸ�:"
 
@@ -17223,15 +17094,12 @@ msgid "Message Retract"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
 #: ../plugins/groupwise-features/mail-retract.c:86
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
-"�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਮ��-�ਰ�ਸ ��ਤਾ �ਾਵ��ਾ। �� ਤ�ਸ�� "
-"�ਹ �ਰਨ ਲ� ਯ��ਨ� ਹ�?"
+"�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਮ��-�ਰ�ਸ ��ਤਾ �ਾਵ��ਾ। �� ਤ�ਸ�� �ਹ "
+"�ਰਨ ਲ� ਯ��ਨ� ਹ�?"
 
 #: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
@@ -17315,17 +17183,14 @@ 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 "Do you want to resend the meeting ?"
 msgid "Do you want to resend the meeting?"
 msgstr "�� ਤ�ਸ�� ਮ��ਿੰ� ਮ��-ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#| msgid "Do you want to resend the recurring meeting ?"
 msgid "Do you want to resend the recurring meeting?"
 msgstr "�� ਤ�ਸ�� ਮ��-ਹ�ਣ ਵਾਲ� ਮ��ਿੰ� ਫ�ਰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#| msgid "Do you want to retract the original item ?"
 msgid "Do you want to retract the original item?"
 msgstr "�� ਤ�ਸ�� �ਸਲ� ���ਮ ਨ�ੰ ਮ��-�ਾ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
@@ -17550,12 +17415,10 @@ msgid "Hula Support"
 msgstr "ਹ�ਲਾ ਸਹਿਯ��"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-#| msgid "Inline"
 msgid "Inline Image"
 msgstr "�ਨਲਾ�ਨ �ਿੱਤਰ"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-#| msgid "Show vCards directly in mail messages."
 msgid "View image attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� �ਿੱਤਰ ����ਮ��� ਵ���।"
 
@@ -17732,12 +17595,10 @@ msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰ
 
 #. Translators: This is a default filename for a calendar.
 #: ../plugins/itip-formatter/itip-formatter.c:1529
-#| msgid "Calendars"
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1534
-#| msgid "New Calendar"
 msgid "Save Calendar"
 msgstr "��ਲੰਡਰ ਸੰਭਾਲ�"
 
@@ -17775,9 +17636,7 @@ msgstr "ਨੱਥ� ��ਲੰਡਰ ਵਿੱ� �� ���ਮਾ� 
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr ""
-"�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ੰਪ�ਰ� "
-"�ਰਨਾ ਪਵ��ਾ"
+msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ੰਪ�ਰ� �ਰਨਾ ਪਵ��ਾ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
@@ -18164,7 +18023,6 @@ msgid "All day:"
 msgstr "ਸਾਰਾ ਦਿਨ:"
 
 #: ../plugins/itip-formatter/itip-view.c:686
-#| msgid "Sta_rt date:"
 msgid "Start day:"
 msgstr "ਦਿਨ ਸ਼�ਰ�:"
 
@@ -18175,8 +18033,6 @@ msgid "Start time:"
 msgstr "ਸ਼�ਰ� ਸਮਾ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:698
-#| msgid "%d day"
-#| msgid_plural "%d days"
 msgid "End day:"
 msgstr "ਦਿਨ �ੰਤ:"
 
@@ -18337,8 +18193,6 @@ msgid "Play sound when new messages arrive."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਥ�ਮ ਸਾ��ਡ ਫਾ�ਲ।"
 
@@ -18359,7 +18213,6 @@ msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਸਾ��ਡ ਫਾ�ਲ।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-#| msgid "Use underline"
 msgid "Use sound theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��"
 
@@ -18406,14 +18259,12 @@ msgstr[1] ""
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
 #: ../plugins/mail-notification/mail-notification.c:506
 #, c-format
-#| msgid "From %s:"
 msgid "From: %s"
 msgstr "ਵਲ��: %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:518
 #, c-format
-#| msgid "Subject:"
 msgid "Subject: %s"
 msgstr "ਵਿਸ਼ਾ: %s"
 
@@ -18450,12 +18301,10 @@ msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
 #: ../plugins/mail-notification/mail-notification.c:869
-#| msgid "Use underline"
 msgid "Use sound _theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��(_t)"
 
 #: ../plugins/mail-notification/mail-notification.c:888
-#| msgid "Play _sound file"
 msgid "Play _file:"
 msgstr "ਫਾ�ਲ �ਲਾ�(_f):"
 
@@ -18694,7 +18543,6 @@ msgid "_Unsubscribe from List"
 msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:320
-#| msgid "Unsubscribe to the mailing list this message belongs to"
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�, �� ਸਬੰਧਿਤ ਹ�"
 
@@ -18875,7 +18723,6 @@ msgid "Let Evolution choose the best part to show."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ��ਣਨ ਦਿ� �ਿ ਵ��ਾ�ਣ ਲ� �� ਸਭ ਤ�� ਵਧ�� ਹ�।"
 
 #: ../plugins/prefer-plain/prefer-plain.c:202
-#| msgid "Show HTML if present"
 msgid "Show plain text if present"
 msgstr "�� ਮ���ਦ ਹ�ਵ� ਤਾ� ਪਲ�ਨ ���ਸ� ਵ���"
 
@@ -18886,7 +18733,6 @@ msgid ""
 msgstr "ਪਲ�ਨ ���ਸ� ਭਾ� ਵ���, �� ਮ���ਦ ਹ�ਵ�, ਨਹ�� ਤਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਵਧ�� ਢੰ� ��ਣਨ ਦਿ�।"
 
 #: ../plugins/prefer-plain/prefer-plain.c:203
-#| msgid "Only ever show PLAIN"
 msgid "Only ever show plain text"
 msgstr "ਹਮ�ਸ਼ਾ ਪਲ�ਨ ���ਸ� ਹ� ਵ���"
 
@@ -19013,12 +18859,10 @@ msgid "_Publish Calendar Information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ� ਪਰ�ਾਸ਼ਤ(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#| msgid "Custom Notification"
 msgid "Custom Location"
 msgstr "ਪਸੰਦ�ਦਾ �ਿ�ਾਣਾ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
-#| msgid "Day"
 msgid "Daily"
 msgstr "ਰ��਼ਾਨਾ"
 
@@ -19027,10 +18871,6 @@ msgid "FTP (with login)"
 msgstr "FTP (ਲਾ��ਨ ਨਾਲ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#| msgid ""
-#| "Daily\n"
-#| "Weekly\n"
-#| "Manual (via Actions menu)"
 msgid "Manual (via Actions menu)"
 msgstr "��ਦ (��ਸ਼ਨ ਮ�ਨ� ਰਾਹ��)"
 
@@ -19039,7 +18879,6 @@ msgid "P_ort:"
 msgstr "ਪ�ਰ�(_o):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
-#| msgid "Public"
 msgid "Public FTP"
 msgstr "ਪਬਲਿ� FTP"
 
@@ -19064,7 +18903,6 @@ msgid "Service _type:"
 msgstr "ਸਰਵਿਸ �ਿਸਮ(_T): "
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-#| msgid "Source"
 msgid "Sources"
 msgstr "ਸਰ�ਤ"
 
@@ -19073,17 +18911,14 @@ msgid "Time _duration:"
 msgstr "ਸਮਾ� �ੰਤਰਾਲ(_d):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-#| msgid "WebDAV"
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#| msgid "Week"
 msgid "Weekly"
 msgstr "ਹਫ਼ਤ�ਵਾਰ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#| msgid "_Window"
 msgid "Windows share"
 msgstr "Windows ਸਾ��"
 
@@ -19108,7 +18943,6 @@ msgid "_Username:"
 msgstr "ਯ��਼ਰ ਨਾ�(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-#| msgid "Call"
 msgid "iCal"
 msgstr "iCal"
 
@@ -19159,7 +18993,6 @@ msgstr "SpamAssassin ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ, �ਲਤ� ��ਡ
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-#| msgid "SpamAssassin is not available."
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin �ਪਲੱਬਧ ਨਹ�� ਹ�। �ਹ ਪਹਿਲਾ� �ੰਸ�ਾਲ �ਰ�।"
 
@@ -19293,17 +19126,14 @@ msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾ�ਲ ��ਣ�"
 
 #: ../plugins/save-calendar/save-calendar.c:325
-#| msgid "Save the selected messages as a text file"
 msgid "Save the selected calendar to disk"
 msgstr "��ਣ� ��ਲੰਡਰ ਨ�ੰ ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
 #: ../plugins/save-calendar/save-calendar.c:356
-#| msgid "Save the selected messages as a text file"
 msgid "Save the selected memo list to disk"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
 #: ../plugins/save-calendar/save-calendar.c:387
-#| msgid "Save a calendar or task list to disk."
 msgid "Save the selected task list to disk"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
@@ -19386,7 +19216,6 @@ msgid "Drafts based template plugin"
 msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
 
 #: ../plugins/templates/templates.c:617
-#| msgid "No title"
 msgid "No Title"
 msgstr "�ਾ��ਲ ਨਹ��"
 
@@ -19475,12 +19304,10 @@ msgid "Default sidebar width"
 msgstr "ਮ�ਲ ਬਾਹ� ���ਾ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-#| msgid "Default window state"
 msgid "Default window X coordinate"
 msgstr "ਮ�ਲ ਵਿੰਡ� X ਧ�ਰਾ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-#| msgid "Default window state"
 msgid "Default window Y coordinate"
 msgstr "ਮ�ਲ ਵਿੰਡ� Y ਧ�ਰਾ"
 
@@ -19497,7 +19324,6 @@ msgid "Default window width"
 msgstr "ਡਿਫਾਲ� ਵਿੰਡ� ���ਾ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "��ਸਪ�ਰ�ਸ ਮ�ਡ �ਾਲ�"
 
@@ -19628,12 +19454,10 @@ msgid ""
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਸੰਰ�ਨਾ ਵਰ�ਨ, ਵੱਧ/�ੱ�/ਸੰਰ�ਨਾ ਪੱਧਰ ਨਾਲ (�ਦਾਹਰਨ ਲ� \"2.6.0\")"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-#| msgid "The default width for the main window, in pixels."
 msgid "The default X coordinate for the main window."
 msgstr "ਮ�ੱ� ਵਿੰਡ� ਲ� ਮ�ਲ X ਧ�ਰਾ ਹ�।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-#| msgid "The default width for the main window, in pixels."
 msgid "The default Y coordinate for the main window."
 msgstr "ਮ�ੱ� ਵਿੰਡ� ਲ� ਮ�ਲ Y ਧ�ਰਾ ਹ�।"
 
@@ -19783,26 +19607,22 @@ msgstr "%ld �ਿਬਾ"
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
 #: ../shell/e-shell-searchbar.c:883
-#| msgid "Sho_w: "
 msgid "Sho_w:"
 msgstr "ਵ���(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:910
-#| msgid "Sear_ch: "
 msgid "Sear_ch:"
 msgstr "���(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
 #: ../shell/e-shell-searchbar.c:970
-#| msgid " i_n "
 msgid "i_n"
 msgstr " �ੰਦਰ(_n)"
 
 #: ../shell/e-shell-switcher.c:448
-#| msgid "Tool_bar Style"
 msgid "Toolbar Style"
 msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ"
 
@@ -19811,32 +19631,26 @@ msgid "The switcher's toolbar style"
 msgstr "ਸਵਿੱ�ਰ ਦਾ ��ਲਬਾਰ ਸ�ਾ�ਲ"
 
 #: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-#| msgid "Toolbar is visible"
 msgid "Toolbar Visible"
 msgstr "��ਲਬਾਰ �ਪਲੱਬਧ"
 
 #: ../shell/e-shell-switcher.c:466
-#| msgid "Whether the sidebar should be visible."
 msgid "Whether the switcher is visible"
 msgstr "�� ਸਵਿੱ�ਰ �ਪਲੱਬਧ ਹ�ਵ�"
 
 #: ../shell/e-shell-utils.c:245
-#| msgid "vCard (.vcf, .gcrd)"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
 #: ../shell/e-shell-utils.c:247
-#| msgid "iCalendar files (.ics)"
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
 #: ../shell/e-shell-utils.c:268
-#| msgid "All files"
 msgid "All Files (*)"
 msgstr "ਸਭ ਫਾ�ਲਾ� (*)"
 
 #: ../shell/e-shell-view.c:675
-#| msgid "Switch to %s"
 msgid "Switcher Action"
 msgstr "ਸਵਿੱ�ਰ ��ਸ਼ਨ"
 
@@ -19845,7 +19659,6 @@ msgid "The switcher action for this shell view"
 msgstr "�ਹ ਸ਼�ੱਲ �ਲ� ਲ� ਸਵਿੱ�ਰ ��ਸ਼ਨ"
 
 #: ../shell/e-shell-view.c:691
-#| msgid "Serial Number"
 msgid "Page Number"
 msgstr "ਸਫ਼ਾ ਨੰਬਰ"
 
@@ -19854,7 +19667,6 @@ msgid "The notebook page number of the shell view"
 msgstr "ਸ਼�ੱਲ �ਲ� ਲ� ਨ��ਬ�ੱ� ਸਫ਼ਾ ਨੰਬਰ"
 
 #: ../shell/e-shell-view.c:708
-#| msgid "Search Filter"
 msgid "Search Rule"
 msgstr "��� ਨਿਯਮ"
 
@@ -19875,7 +19687,6 @@ msgid "The content widget appears in a shell window's right pane"
 msgstr "ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸੱ�� ਬਾਹ� ਵਿੱ� ਸਮੱ�ਰ� ਵਿਦ��ੱ� �ਲ� ਦਿੰਦਾ ਹ�"
 
 #: ../shell/e-shell-view.c:756
-#| msgid "Default sidebar width"
 msgid "Shell Sidebar Widget"
 msgstr "ਸ਼�ੱਲ ਬਾਹ� ਵਿਦ��ੱ�"
 
@@ -19889,10 +19700,9 @@ msgstr "ਸ�ੱਲ �ਾਸ�ਬਾਰ ਵਿਦ��ੱ�"
 
 #: ../shell/e-shell-view.c:773
 msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
+msgstr "�ਾਸ�-ਬਾਹ� ਵਿਦ��ੱ� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਤਲ �ੱਤ� ਵ��ਾ� ਦਿੰਦਾ ਹ�"
 
 #: ../shell/e-shell-view.c:788
-#| msgid "New _Window"
 msgid "Shell Window"
 msgstr "ਸ਼�ੱਲ ਵਿੰਡ�"
 
@@ -19909,12 +19719,10 @@ msgid "The title of the shell view"
 msgstr "ਸ਼�ੱਲ �ਲ� ਦਾ �ਾ��ਲ"
 
 #: ../shell/e-shell-view.c:834
-#| msgid "_Current View"
 msgid "Current View ID"
 msgstr "ਮ���ਦਾ �ਲ� ID"
 
 #: ../shell/e-shell-view.c:835
-#| msgid "the current time"
 msgid "The current GAL view ID"
 msgstr "ਮ���ਦਾ GAL �ਲ� ID"
 
@@ -19933,22 +19741,18 @@ msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
 #: ../shell/e-shell-window-actions.c:1224
-#| msgid "Bug buddy is not installed."
 msgid "Bug Buddy is not installed."
 msgstr "ਬੱ� ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
 
 #: ../shell/e-shell-window-actions.c:1226
-#| msgid "Bug buddy could not be run."
 msgid "Bug Buddy could not be run."
 msgstr "ਬੱ� ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
 #: ../shell/e-shell-window-actions.c:1343
-#| msgid "Bug buddy is not installed."
 msgid "GNOME Pilot is not installed."
 msgstr "�ਨ�ਮ ਪਾ�ਲ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
 
 #: ../shell/e-shell-window-actions.c:1345
-#| msgid "Bug buddy could not be run."
 msgid "GNOME Pilot could not be run."
 msgstr "�ਨ�ਮ ਪਾ�ਲ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
@@ -19961,12 +19765,10 @@ msgid "_Close Window"
 msgstr "ਵਿੰਡ� ਬੰਦ �ਰ�(_C)"
 
 #: ../shell/e-shell-window-actions.c:1451
-#| msgid "A_ppointments"
 msgid "_Contents"
 msgstr "ਸਮੱ�ਰ�(_C)"
 
 #: ../shell/e-shell-window-actions.c:1453
-#| msgid "Open Other User's Folder"
 msgid "Open the Evolution User Guide"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਯ��਼ਰ �ਾ�ਡ ��ਲ�ਹ�"
 
@@ -19983,7 +19785,6 @@ msgid "_Forget Passwords"
 msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�(_F)"
 
 #: ../shell/e-shell-window-actions.c:1488
-#| msgid "Are you sure you want to forget all remembered passwords?"
 msgid "Forget all remembered passwords"
 msgstr "ਸਭ ਯਾਦ ਰੱ�� ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�"
 
@@ -20000,12 +19801,10 @@ msgid "New _Window"
 msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
 
 #: ../shell/e-shell-window-actions.c:1502
-#| msgid "Create a new window displaying this folder"
 msgid "Create a new window displaying this view"
 msgstr "�ਸ �ਲ� ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਨਵ�� ਵਿੰਡ� ਬਣਾ�"
 
 #: ../shell/e-shell-window-actions.c:1516
-#| msgid "Configuration"
 msgid "Configure Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ"
 
@@ -20014,7 +19813,6 @@ msgid "_Quick Reference"
 msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
 
 #: ../shell/e-shell-window-actions.c:1523
-#| msgid "Change Evolution's settings"
 msgid "Show Evolution's shortcut keys"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦ� ਸ਼ਾਰ��ੱ� ��ੰ���� ਵ���"
 
@@ -20031,7 +19829,6 @@ msgid "Construct a more advanced search"
 msgstr "ਹ�ਰ ਵ� ਤ�ਨ��� ��� ਬਣਾ�"
 
 #: ../shell/e-shell-window-actions.c:1544
-#| msgid "Clear the search"
 msgid "Clear the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸਾਫ਼ �ਰ�"
 
@@ -20040,7 +19837,6 @@ msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
 
 #: ../shell/e-shell-window-actions.c:1551
-#| msgid "Manage your email, contacts and schedule"
 msgid "Manage your saved searches"
 msgstr "�ਪਣ� ਸੰਭਾਲ� ��� ਦਾ ਪਰਬੰਧ �ਰ�"
 
@@ -20054,7 +19850,6 @@ msgstr "ਹ�ਣ ���(_F)"
 
 #. Block the default Ctrl+F.
 #: ../shell/e-shell-window-actions.c:1565
-#| msgid "Cancel the current mail operation"
 msgid "Execute the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 
@@ -20063,7 +19858,6 @@ msgid "_Save Search..."
 msgstr "��� ਸੰਭਾਲ�(_S)..."
 
 #: ../shell/e-shell-window-actions.c:1572
-#| msgid "Save the current file"
 msgid "Save the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸੰਭਾਲ�"
 
@@ -20076,7 +19870,6 @@ msgid "Send queued items and retrieve new items"
 msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
 
 #: ../shell/e-shell-window-actions.c:1591
-#| msgid "Submit _Bug Report"
 msgid "Submit _Bug Report..."
 msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�(_B)..."
 
@@ -20085,12 +19878,10 @@ msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱ� ਬੱਡ� ਵਰਤ �� ਬੱ� �ਾਣ�ਾਰ� ਭ���"
 
 #: ../shell/e-shell-window-actions.c:1598
-#| msgid "iPod Synchronization"
 msgid "GNOME Pilot _Synchronization..."
 msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸ��ਰ�ਨਾ��਼(_S)..."
 
 #: ../shell/e-shell-window-actions.c:1600
-#| msgid "Set up Pilot configuration"
 msgid "Set up GNOME Pilot configuration"
 msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ�ੱ��ੱਪ"
 
@@ -20099,7 +19890,6 @@ msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
 #: ../shell/e-shell-window-actions.c:1607
-#| msgid "Start in offline mode"
 msgid "Put Evolution into offline mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
@@ -20108,7 +19898,6 @@ msgid "_Work Online"
 msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
 #: ../shell/e-shell-window-actions.c:1614
-#| msgid "Start in online mode"
 msgid "Put Evolution into online mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
@@ -20137,17 +19926,14 @@ msgid "Show Side _Bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
 
 #: ../shell/e-shell-window-actions.c:1708
-#| msgid "Show Side _Bar"
 msgid "Show the side bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���"
 
 #: ../shell/e-shell-window-actions.c:1714
-#| msgid "Show Animations"
 msgid "Show _Buttons"
 msgstr "ਬ�ਨ ਵ���(_B)"
 
 #: ../shell/e-shell-window-actions.c:1716
-#| msgid "Show the second time zone"
 msgid "Show the switcher buttons"
 msgstr "ਸਵਿੱ�ਰ ਬ�ਨ ਵ���"
 
@@ -20156,17 +19942,14 @@ msgid "Show _Status Bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
 
 #: ../shell/e-shell-window-actions.c:1724
-#| msgid "Show _Status Bar"
 msgid "Show the status bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���"
 
 #: ../shell/e-shell-window-actions.c:1730
-#| msgid "Show _Toolbar"
 msgid "Show _Tool Bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
 #: ../shell/e-shell-window-actions.c:1732
-#| msgid "Show _Toolbar"
 msgid "Show the tool bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
@@ -20231,7 +20014,6 @@ msgid "Current view is a customized view"
 msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
 
 #: ../shell/e-shell-window-actions.c:1823
-#| msgid "Set up the page settings for your current printer"
 msgid "Change the page settings for your current printer"
 msgstr "�ਪਣ� ਮ���ਦਾ ਪਰਿੰ�ਰ ਲ� ਸਫ਼ਾ ਸ��ਿੰ� ਬਦਲ�"
 
@@ -20259,7 +20041,6 @@ msgid "Active Shell View"
 msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ�"
 
 #: ../shell/e-shell-window.c:617
-#| msgid "Name of new view:"
 msgid "Name of the active shell view"
 msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ� ਦਾ ਨਾ�"
 
@@ -20276,52 +20057,42 @@ msgid "Initial window geometry string"
 msgstr "ਸ਼�ਰ��ਤ� ਵਿੰਡ� ��ਮ��ਰ� ਲਾ�ਨ"
 
 #: ../shell/e-shell-window.c:662
-#| msgid "_Caret Mode"
 msgid "Safe Mode"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ਢੰ�"
 
 #: ../shell/e-shell-window.c:663
-#| msgid "Whether the plugin is enabled"
 msgid "Whether the shell window is in safe mode"
 msgstr "�� ਸ�ੱਲ ਵਿੰਡ� ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਵਿੱ� ਹ�"
 
 #: ../shell/e-shell-window.c:694
-#| msgid "Sidebar is visible"
 msgid "Sidebar Visible"
 msgstr "ਬਾਹ� ਵ���"
 
 #: ../shell/e-shell-window.c:695
-#| msgid "Whether the window buttons should be visible."
 msgid "Whether the shell window's side bar is visible"
 msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਬਾਹ� ਵ��ਣ� ਹ�"
 
 #: ../shell/e-shell-window.c:709
-#| msgid "Sidebar is visible"
 msgid "Switcher Visible"
 msgstr "ਸਵਿੱ�ਰ ਵ���"
 
 #: ../shell/e-shell-window.c:710
-#| msgid "Whether the window buttons should be visible."
 msgid "Whether the shell window's switcher buttons are visible"
 msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸਵਿੱ�ਰ ਬ�ਨ ਵ��ਣ� ਹਨ"
 
 #: ../shell/e-shell-window.c:725
-#| msgid "Statusbar is visible"
 msgid "Taskbar Visible"
 msgstr "�ਾਸ�ਬਾਰ ਵ���"
 
 #: ../shell/e-shell-window.c:726
-#| msgid "Whether the status bar should be visible."
 msgid "Whether the shell window's task bar is visible"
 msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� �ਾਸ� ਬਾਰ ਵ��ਣ� ਹ�"
 
 #: ../shell/e-shell-window.c:741
-#| msgid "Whether the window buttons should be visible."
 msgid "Whether the shell window's tool bar is visible"
 msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦਾ ��ਲ ਬਾਰ ਵ��ਾ� ਦ�ਵ�"
 
 #: ../shell/e-shell-window.c:755
-#| msgid "Manager"
 msgid "UI Manager"
 msgstr "UI ਮ�ਨ��ਰ"
 
@@ -20330,12 +20101,10 @@ msgid "The shell window's GtkUIManager"
 msgstr "ਸ਼�ੱਲ ਵਿੰਡ� GtkUIManager"
 
 #: ../shell/e-shell.c:212
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing to go offline..."
 msgstr "�ਫਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../shell/e-shell.c:262
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing to go online..."
 msgstr "�ਨਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
@@ -20344,7 +20113,6 @@ msgid "Preparing to quit..."
 msgstr "ਬੰਦ �ਰਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../shell/e-shell.c:819
-#| msgid "Save directory"
 msgid "Module Directory"
 msgstr "ਮ�ਡ��ਲ ਡਾ�ਰ���ਰ�"
 
@@ -20353,12 +20121,10 @@ msgid "The directory from which to load EModules"
 msgstr "ਡਾ�ਰ���ਰ�, �ਿਸ ਵਿੱ��� �ਮ�ਡ��ਲ ਲ�ਡ ਹ�ੰਦ� ਹਨ"
 
 #: ../shell/e-shell.c:835
-#| msgid "TLS not Available"
 msgid "Network Available"
 msgstr "ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�"
 
 #: ../shell/e-shell.c:836
-#| msgid "Whether the plugin is enabled"
 msgid "Whether the network is available"
 msgstr "�� ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�ਵ�"
 
@@ -20367,7 +20133,6 @@ msgid "Online"
 msgstr "�ਨਲਾ�ਨ"
 
 #: ../shell/e-shell.c:852
-#| msgid "Whether the plugin is enabled"
 msgid "Whether the shell is online"
 msgstr "�� ਸ਼�ੱਲ �ਨਲਾ�ਨ ਹ�"
 
@@ -20425,19 +20190,17 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰ
 
 #: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
-msgstr ""
+msgstr "ਦਿੱਤ� ��ਮ��ਰ� ਮ�ੱ� ਵਿੰਡ� �ੱਤ� ਲਾ�� �ਰ�"
 
 #: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
 #: ../shell/main.c:330
-#| msgid "Start in online mode"
 msgid "Start in \"express\" mode"
 msgstr "\"��ਸਪ�ਰ�ਸ\" ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
 #: ../shell/main.c:333
-#| msgid "Forcibly shut down all Evolution components"
 msgid "Forcibly shut down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ�"
 
@@ -20459,10 +20222,9 @@ msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�
 
 #: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
-msgstr ""
+msgstr "URI �ਾ� ਬਾ�� ਦ� �ਰ��ਮ��� ਵ��� ਦਿੱਤ� ਫਾ�ਲ ਨਾ� �ੰਪ�ਰ� �ਰ�"
 
 #: ../shell/main.c:350
-#| msgid "Restarting Evolution"
 msgid "Request a running Evolution process to quit"
 msgstr "�ੱਲਦ� �ਵ�ਲਸ਼ਨ ਪਰ�ਸ�ਸ ਨ�ੰ ਬੰਦ �ਰਨ ਦ� ਮੰ�"
 
@@ -20545,7 +20307,6 @@ msgstr ""
 "evolution&quot;ਦ� ਭਾ� ਹ�ਾ ਸ�ਦ� ਹ�।\n"
 
 #: ../shell/shell.error.xml.h:18
-#| msgid "Upgrade from previous version failed: {0}"
 msgid "Upgrade from previous version failed:"
 msgstr "ਪ�ਰਾਣ� ਵਰ�ਨ �ੱਤ� �ੱਪ�ਰ�ਡ ਫ�ਲ�ਹ:"
 
@@ -20575,11 +20336,6 @@ msgid "_Remind Me Later"
 msgstr "ਮ�ਨ�ੰ ਬਾ�ਦ ਵਿੱ� ਯਾਦ �ਰਵਾ�(_R)"
 
 #: ../shell/shell.error.xml.h:25
-#| msgid ""
-#| "{1}\n"
-#| "\n"
-#| "If you choose to continue, you may not have access to some of your old "
-#| "data.\n"
 msgid ""
 "{0}\n"
 "\n"
@@ -20591,8 +20347,6 @@ msgstr ""
 "���ਰ ਤ�ਸ�� �ਾਰ� ਰਹ� ਤਾ� ਤ�ਸ�� �ਪਣ� ਪ�ਰਾਣ� ਡਾ�ਾ ਨ�ੰ ��ਲ ਨਹ�� ਸ����।\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
-#| msgctxt "New"
-#| msgid "_Test"
 msgctxt "New"
 msgid "_Test Item"
 msgstr "���ਮ ��ਸ�(_T)"
@@ -20602,13 +20356,11 @@ msgid "Create a new test item"
 msgstr "�ੱ� ਨਵ�� �ਾ�� ��ਾ� ਬਣਾ�"
 
 #: ../shell/test/e-test-shell-backend.c:70
-#| msgid "Resource"
 msgctxt "New"
 msgid "Test _Source"
 msgstr "ਸਰ�ਤ ��ਸ�(_S)"
 
 #: ../shell/test/e-test-shell-backend.c:72
-#| msgid "Create a new test item"
 msgid "Create a new test source"
 msgstr "ਨਵਾ� ��ਸ� ਸਰ�ਤ ਬਣਾ�"
 
@@ -20640,7 +20392,7 @@ msgstr "ਬ�ਪ�ਾਣ ਲਾ�� ��ਣ: %d"
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
+msgstr "ਡ���ਮ��� URIs  'Type=Link' ਡ�ਸ��ਾਪ ���ਰ� ਨ�ੰ ਦਿੱਤਾ ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #: ../smclient/eggdesktopfile.c:1394
 #, c-format
@@ -20648,12 +20400,10 @@ msgid "Not a launchable item"
 msgstr "�ੱਲਣਯ�� ���ਮ ਨਹ�� ਹ�"
 
 #: ../smclient/eggsmclient.c:227
-#| msgid "_Direct connection to the Internet"
 msgid "Disable connection to session manager"
 msgstr "ਸ਼�ਸ਼ਨ ਮ�ਨ��ਰ ਨਾਲ ��ਨ��ਸ਼ਨ �ਯ�� �ਰ�"
 
 #: ../smclient/eggsmclient.c:230
-#| msgid "Set up Pilot configuration"
 msgid "Specify file containing saved configuration"
 msgstr "ਸੰਭਾਲ� ਸੰਰ�ਨਾ ਰੱ�ਣ ਵਾਲ� ਫਾ�ਲ ਦਿ�"
 
@@ -20674,7 +20424,6 @@ msgid "Session management options:"
 msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ��ਣਾ�:"
 
 #: ../smclient/eggsmclient.c:255
-#| msgid "Show image animations"
 msgid "Show session management options"
 msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ��ਣਾ� ਵ���"
 
@@ -20835,12 +20584,10 @@ msgid "Certificate Authority Trust"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ �ਾ��"
 
 #: ../smime/gui/smime-ui.ui.h:8
-#| msgid "<b>Certificate Fields</b>"
 msgid "Certificate Fields"
 msgstr "ਸਰ��ਫਿ��� ��ਤਰ"
 
 #: ../smime/gui/smime-ui.ui.h:9
-#| msgid "<b>Certificate Hierarchy</b>"
 msgid "Certificate Hierarchy"
 msgstr "ਸਰ��ਫਿ��� ਲ��"
 
@@ -20885,12 +20632,10 @@ msgid "Expires On"
 msgstr "ਮਿ�ਦ"
 
 #: ../smime/gui/smime-ui.ui.h:21
-#| msgid "Field Name"
 msgid "Field Value"
 msgstr "��ਤਰ ਮ�ੱਲ"
 
 #: ../smime/gui/smime-ui.ui.h:22
-#| msgid "MD5 Fingerprint"
 msgid "Fingerprints"
 msgstr "ਫਿੰ�ਰਪਰਿੰ�"
 
@@ -20899,7 +20644,6 @@ msgid "Import"
 msgstr "�ੰਪ�ਰ�"
 
 #: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Issued On"
 msgid "Issued By"
 msgstr "�ਾਰ� ��ਤਾ ਵਲ��"
 
@@ -20908,7 +20652,6 @@ msgid "Issued On"
 msgstr "�ਾਰ� �ਰਨ ਦ� ਮਿਤ�"
 
 #: ../smime/gui/smime-ui.ui.h:27
-#| msgid "Issued On"
 msgid "Issued To"
 msgstr "�ਸ ਨ�ੰ"
 
@@ -20937,7 +20680,6 @@ msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰ��ਫਿ���"
 
 #: ../smime/gui/smime-ui.ui.h:35
-#| msgid "<b>This certificate has been verified for the following uses:</b>"
 msgid "This certificate has been verified for the following uses:"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਨ�ੰ �ੱ�� ਦਿੱਤ� ਵਰਤ�� ਲ� �ਾ��ਿ� ਹ�:"
 
@@ -20958,7 +20700,6 @@ msgid "Trust this CA to identify web sites."
 msgstr "�ਸ CA ਤ� ਵ�ੱਬ ਸਾ��ਾ� ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
 #: ../smime/gui/smime-ui.ui.h:40
-#| msgid "<b>Validity</b>"
 msgid "Validity"
 msgstr "ਵ�ਧਤਾ"
 
@@ -21253,7 +20994,6 @@ msgid "Select a Time Zone"
 msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-#| msgid "Time _Zone"
 msgid "Time Zones"
 msgstr "ਸਮਾ� ��ਤਰ"
 
@@ -21271,7 +21011,6 @@ msgstr ""
 "ਮਾ�ਸ ਦਾ ਸੱ�ਾ ਬ�ਨ ��ਤਰ ��ਾ�ਣ ਦ� �ੰਮ �ਵ��ਾ।"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
-#| msgid "Selection Mode"
 msgid "_Selection"
 msgstr "��ਣ(_S)"
 
@@ -21341,7 +21080,6 @@ msgid "De_fault"
 msgstr "ਮ�ਲ(_f)"
 
 #: ../widgets/misc/e-account-tree-view.c:224
-#| msgid "Account name"
 msgid "Account Name"
 msgstr "��ਾ��� ਨਾ�"
 
@@ -21350,7 +21088,6 @@ msgid "Protocol"
 msgstr "ਪ�ਰ����ਾਲ"
 
 #: ../widgets/misc/e-action-combo-box.c:388
-#| msgid "_Actions"
 msgid "Action"
 msgstr "�ਾਰਵਾ�"
 
@@ -21517,7 +21254,6 @@ msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
 #: ../widgets/misc/e-buffer-tagger.c:363
-#| msgid "Click to open %s"
 msgid "Ctrl-click to open a link"
 msgstr "ਲਿੰ� ��ਲ�ਹਣ ਲ� �ੰ�ਰ�ਲ-�ਲਿੱ� �ਰ�"
 
@@ -21634,7 +21370,6 @@ msgstr "��� ਨਹ��(_N)"
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
 #: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
-#| msgid "None"
 msgctxt "date"
 msgid "None"
 msgstr "��� ਨਹ��"
@@ -21684,22 +21419,17 @@ msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
 #: ../widgets/misc/e-import-assistant.c:439
 msgid "Select what type of file you want to import from the list."
-msgstr ""
+msgstr "ਫਾ�ਲ ਦ� �ਿਸਮ ��ਣ�, �� ਤ�ਸ�� ਲਿਸ� ਤ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
 #: ../widgets/misc/e-import-assistant.c:516
-#| msgid ""
-#| "Evolution checked for settings to import from the following\n"
-#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-#| "settings found. If you would like to\n"
-#| "try again, please click the \"Back\" button.\n"
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਨ� ਹ�ਠ ਲਿ�ਿ�� ਤ�� ਸ��ਿੰ� �ੰਪ�ਰ� �ਰਨ ਲ� �ਾ�� ��ਤ� ਹ�: "
-"Pine, Netscape, Elm, iCalendar। ��� ਸ��ਿੰ�, �� �ਿ �ੰਪ�ਰ� ��ਤ� "
-"�ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� �ਾਹ�ੰਦ� ਹ� ਤਾ� \"ਪਿੱ��\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।"
+"�ਵ�ਲ�ਸ਼ਨ ਨ� ਹ�ਠ ਲਿ�ਿ�� ਤ�� ਸ��ਿੰ� �ੰਪ�ਰ� �ਰਨ ਲ� �ਾ�� ��ਤ� ਹ�: Pine, Netscape, Elm, "
+"iCalendar। ��� ਸ��ਿੰ�, �� �ਿ �ੰਪ�ਰ� ��ਤ� �ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� �ਾਹ�ੰਦ� ਹ� ਤਾ� \"ਪਿੱ��"
+"\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../widgets/misc/e-import-assistant.c:1187
 #: ../widgets/misc/e-import-assistant.c:1214
@@ -21712,10 +21442,6 @@ msgid "Import Location"
 msgstr "�ੰਪ�ਰ� �ਿ�ਾਣਾ"
 
 #: ../widgets/misc/e-import-assistant.c:1207
-#| msgid ""
-#| "Welcome to the Evolution Import Assistant.\n"
-#| "With this assistant you will be guided through the process of\n"
-#| "importing external files into Evolution."
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21738,13 +21464,11 @@ msgid "Select a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
 #: ../widgets/misc/e-import-assistant.c:1255
-#| msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ੰਪ�ਰ� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" �ੱਤ� �ਲਿੱ� �ਰ�।"
 
 #: ../widgets/misc/e-import-assistant.c:1261
 #: ../widgets/misc/e-import-assistant.c:1271
-#| msgid "Important"
 msgid "Import Data"
 msgstr "�ਾਸ ਡਾ�ਾ"
 
@@ -21761,23 +21485,14 @@ msgstr ""
 "ਦਿੱਤਾ �ੰਬ�ਸਮਾ� ��ਤਰ ਬ�ਸਾ ਵਰਤ ਸ�ਦ� ਹਨ।"
 
 #: ../widgets/misc/e-online-button.c:27
-#| msgid ""
-#| "Evolution is currently online.\n"
-#| "Click on this button to work offline."
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਨਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਫਲਾ�ਨ ਹ�ਣ ਲ� ਦਬਾ�।"
 
 #: ../widgets/misc/e-online-button.c:30
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
 #: ../widgets/misc/e-online-button.c:33
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
@@ -21786,40 +21501,36 @@ msgid "The button state is online"
 msgstr "ਬ�ਨ ਹਾਲਤ �ਨਲਾ�ਨ ਹ�"
 
 #: ../widgets/misc/e-paned.c:306
-#| msgid "Horizontal pane position"
 msgid "Horizontal Position"
 msgstr "�ਿਤਿ�� ਸਥਿਤ�"
 
 #: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
-msgstr ""
+msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
 
 #: ../widgets/misc/e-paned.c:318
-#| msgid "Vertical pane position"
 msgid "Vertical Position"
 msgstr "ਲੰਬ�ਾਰ� ਸਥਿਤ�"
 
 #: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
-msgstr ""
+msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
 
 #: ../widgets/misc/e-paned.c:330
-#| msgid "_Properties"
 msgid "Proportion"
 msgstr "�ਨ�ਪਾਤ"
 
 #: ../widgets/misc/e-paned.c:331
 msgid "Proportion of the 2nd pane size"
-msgstr ""
+msgstr "੨�� ਬਾਹ� ��ਾਰ ਦਾ �ਨ�ਪਾਤ"
 
 #: ../widgets/misc/e-paned.c:342
-#| msgid "_Resize"
 msgid "Fixed Resize"
 msgstr "ਸਥਿਰ ਮ��-��ਾਰ"
 
 #: ../widgets/misc/e-paned.c:343
 msgid "Keep the 2nd pane fixed during resize"
-msgstr ""
+msgstr "੨�� ਬਾਹ� ��ਾਰ ਬਦਲਣ ਦ�ਰਾਨ ਸਥਿਰ ਰੱ��"
 
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
@@ -21922,7 +21633,6 @@ msgid "Deli_vered and opened"
 msgstr "ਪਹ�ੰ�� �ਤ� ��ਲ�ਹ�(_v)"
 
 #: ../widgets/misc/e-send-options.ui.h:5
-#| msgid "<b>Delivery Options</b>"
 msgid "Delivery Options"
 msgstr "ਡਿਲਵਰ� ��ਣਾ�"
 
@@ -21935,14 +21645,10 @@ msgid "Gene_ral Options"
 msgstr "ਸਧਾਰਨ ��ਣ(_r)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid ""
-#| "None\n"
-#| "Mail Receipt"
 msgid "Mail Receipt"
 msgstr "ਮ�ਲ ਪ�ਰਾਪਤ�"
 
 #: ../widgets/misc/e-send-options.ui.h:14
-#| msgid "Priority"
 msgid "Proprietary"
 msgstr "ਪਰ�ਪ��ਰ�"
 
@@ -21951,7 +21657,6 @@ msgid "R_eply requested"
 msgstr "�ਵਾਬ ਲ���ਦਾ(_e)"
 
 #: ../widgets/misc/e-send-options.ui.h:17
-#| msgid "<b>Return Notification</b>"
 msgid "Return Notification"
 msgstr "�ਵਾਬ� ਸ��ਨਾ"
 
@@ -21960,17 +21665,14 @@ msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ���(_t)"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-#| msgid "S_tandard Font:"
 msgid "Standard"
 msgstr "ਸ���ਡਰਡ"
 
 #: ../widgets/misc/e-send-options.ui.h:22
-#| msgid "Sta_tus Tracking"
 msgid "Status Tracking"
 msgstr "ਹਾਲਤ �ਰ��ਿੰ�"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-#| msgid "Top secret"
 msgid "Top Secret"
 msgstr "ਬਹ�ਤ ��ਪਤ"
 
@@ -22046,12 +21748,10 @@ msgid "_Signature Name:"
 msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
 
 #: ../widgets/misc/e-signature-manager.c:294
-#| msgid "Add signature script"
 msgid "Add Signature Script"
 msgstr "ਦਸਤ�ਤ� ਸ��ਰਿਪ� ਸ਼ਾਮਿਲ"
 
 #: ../widgets/misc/e-signature-manager.c:359
-#| msgid "Edit Signature"
 msgid "Edit Signature Script"
 msgstr "ਦਸਤ�ਤ ਸ��ਰਿਪ� ਸ�ਧ"
 
@@ -22060,9 +21760,6 @@ msgid "Add _Script"
 msgstr "ਸ��ਰਿਪ� ����(_S)"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
-#| msgid ""
-#| "The output of this script will be used as your\n"
-#| "signature. The name you specify will be used for display purposes only."
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22073,13 +21770,11 @@ msgstr ""
 " �ਵ��ਾ।"
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
-#| msgid "_Script:"
 msgid "S_cript:"
 msgstr "ਸ��ਰਿਪ�(_c):"
 
 #  mail:signature-notscript secondary
 #: ../widgets/misc/e-signature-script-dialog.c:342
-#| msgid "The script file must exist and be executable."
 msgid "Script file must be executable."
 msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
@@ -22092,7 +21787,6 @@ msgid "_Copy Link Location"
 msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
 
 #: ../widgets/misc/e-web-view.c:350
-#| msgid "Copy things to the clipboard."
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
@@ -22101,17 +21795,14 @@ msgid "_Open Link in Browser"
 msgstr "ਲਿੰ� ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�(_O)"
 
 #: ../widgets/misc/e-web-view.c:360
-#| msgid "_Open Link in Browser"
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰ� ਵ�ੱਬ ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�"
 
 #: ../widgets/misc/e-web-view.c:368
-#| msgid "Copy _Email Address"
 msgid "_Copy Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_C)"
 
 #: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
-#| msgid "Select all the text in a message"
 msgid "Select all text and images"
 msgstr "ਸਭ ���ਸ� �ਤ� �ਿੱਤਰ ��ਣ�"
 
@@ -22154,7 +21845,6 @@ msgstr "ਹ�ਣ"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
-#| msgid "None"
 msgctxt "table-date"
 msgid "None"
 msgstr "��� ਨਹ��"
@@ -22318,7 +22008,6 @@ msgid "_Sort..."
 msgstr "ਲ��ਬੱਧ(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-#| msgid "Add a C_olumn..."
 msgid "Add a Column"
 msgstr "�ਾਲਮ ਸ਼ਾਮਲ"
 
@@ -22505,13 +22194,12 @@ msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲ� ਦਬਾ�"
 
 #: ../widgets/table/e-table.c:3374
-#| msgid "Indicator Spacing"
 msgid "Vertical Row Spacing"
 msgstr "ਵਰ���ਲ �ਤਾਰ �ਾਲ� ਥਾ�"
 
 #: ../widgets/table/e-table.c:3375
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
+msgstr "�ਤਾਰਾ� ਵਿੱ� ਵਰ���ਲ �ਾਲ� ਥਾ�। �ਸ ਨ�ੰ �ਤਾਰ ਦ� �ੱਤ� ਤ� ਹ�ਠਾ� ���ਿ� �ਾਵ��ਾ।"
 
 #: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
 msgid "ETree table adapter"