[evolution] update for Punjabi



commit 5d1a6ce06bf658c09aaceb3f2eaee06d79a65f69
Author: A S Alam <aalam users sf net>
Date:   Sat Sep 11 08:28:34 2010 +0530

    update for Punjabi

 po/pa.po |  757 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 394 insertions(+), 363 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 9d834cd..f383abe 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-09-04 20:17+0000\n"
-"PO-Revision-Date: 2010-09-05 09:22+0530\n"
+"POT-Creation-Date: 2010-09-10 23:31+0000\n"
+"PO-Revision-Date: 2010-09-11 08:27+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"
@@ -3428,7 +3428,7 @@ msgid "_Options"
 msgstr "��ਣ(_O)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "ਵ���(_V)"
 
@@ -3863,35 +3863,30 @@ msgstr "ਸਮਾ�(_T):"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ੧ ਦਿਨ ਪਹਿਲਾ�"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧ �ੰ�ਾ"
 
 #. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧੫ ਮਿੰ�"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "ਲ�"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "�ਦ�� ਤੱ�"
@@ -3922,7 +3917,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1043 ../mail/em-format-html.c:2289
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
 #: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
@@ -4137,49 +4132,42 @@ msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਮ�� ਹ�(_u)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "ਦਿਨ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "ਲ�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "ਹਮ�ਸ਼ਾ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "ਮਹ�ਨਾ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "�ਦ�� ਤੱ�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "ਹਫਤਾ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ਸਾਲ"
@@ -4647,8 +4635,8 @@ msgstr "��ਣ� �ਵ��� ਹ�ਾ�"
 msgid "Deleting selected objects"
 msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
@@ -4688,16 +4676,16 @@ msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ�ਰਬੰਧ�: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ�ਰਬੰਧ�: %s"
@@ -4796,7 +4784,7 @@ msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2645
+#: ../calendar/gui/e-day-view.c:2646
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
@@ -5409,7 +5397,7 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮ��ਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:414
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5418,38 +5406,38 @@ msgstr "ਮ��ਬਰ"
 msgid "Memos"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* ਸੰ��ਪ ਨਹ�� *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "ਸ਼�ਰ�:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "ਬਾ��:"
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� ਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਮ�ਮ� ��ਪ�"
 
-#: ../calendar/gui/e-memo-table.c:728
+#: ../calendar/gui/e-memo-table.c:730
 #: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਮ�ਮ� ��ਣ�"
 
@@ -5466,7 +5454,7 @@ msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
@@ -5480,24 +5468,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "�ੰਮ"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਾਸ� ��ਪ�"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:953
 #: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "��ਣ� �ਾਸ� ਹ�ਾ�"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "ਸਭ ਦਿਸ ਰਹ��� �ਾਸ�ਾ� ��ਣ�"
 
@@ -5663,7 +5651,7 @@ msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
 msgid "calendar view for one or more weeks"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
 
-#: ../calendar/gui/gnome-cal.c:2291
+#: ../calendar/gui/gnome-cal.c:2306
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -8015,7 +8003,7 @@ msgstr "ਦਸਤ�ਤ(_g):"
 msgid "Click here for the address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-post-header.c:130
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
@@ -8148,8 +8136,8 @@ 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:16
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
@@ -8164,7 +8152,7 @@ msgid ""
 msgstr ""
 "HTML ਸੰਪਾਦ� �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ\n"
 "\n"
-"�ਿਰਪਾ �ਰ�� �ਹ ਯ��ਨ ਬਣਾ ਲਵ�� �ਿ ਤ�ਹਾਡ� ��ਲ gtkhtml �ਤ� libgtkhtml ਦਾ ਸਹ�� ਵਰ�ਨ �ੰਸ�ਾਲ "
+"�ਹ ਯ��ਨ ਬਣਾ ਲਵ�� �ਿ ਤ�ਹਾਡ� ��ਲ gtkhtml �ਤ� libgtkhtml ਦਾ ਸਹ�� ਵਰ�ਨ �ੰਸ�ਾਲ "
 "ਹ�।"
 
 #: ../composer/mail-composer.error.xml.h:20
@@ -8172,12 +8160,13 @@ msgid "Unable to activate the address selector control."
 msgstr "�ਡਰ�ੱਸ ��ਣ�ਾਰ �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ।"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ n{0}' ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
+#| msgid "You cannot attach the file n{0}' to this message."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ &quot;{0}&quot; ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
-msgstr "ਪੱਤਰ ਲਿ�ਣ ਤ�� ਪਹਿਲਾ� �ੱ� ��ਾ��� ਸੰਰ�ਿਤ �ਰਨ ਦ� ਲ�� ਹ�।"
+msgstr "ਪੱਤਰ ਲਿ�ਣ ਤ�� ਪਹਿਲਾ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸੰਰ�ਿਤ �ਰਨ ਦ� ਲ�� ਹ�।"
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
@@ -8185,11 +8174,11 @@ msgstr "�ਡ��ਿੰ� �ਾਰ� ਰੱ��(_C)"
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
-msgstr "ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
+msgstr "ਮ��-ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
-msgstr "ਪ�ਰਾਪਤ(_R)"
+msgstr "ਮ��-ਪ�ਰਾਪਤ(_R)"
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
@@ -8256,39 +8245,42 @@ msgid "Email address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ:"
 
 #: ../capplet/settings/mail-account-view.c:490
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਵ�ਰਵਾ:</span>"
+#| msgid "Details"
+msgid "Details:"
+msgstr "ਵ�ਰਵਾ:"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਪ�ਰਾਪਤ�</span>"
+#: ../capplet/settings/mail-account-view.c:498
+#| msgid "Receiving mail"
+msgid "Receiving"
+msgstr "ਪ�ਰਾਪਤ�"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "ਸਰਵਰ �ਿਸਮ:"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "ਸਰਵਰ �ਡਰ�ੱਸ:"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਵਰਤ��:"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../capplet/settings/mail-account-view.c:545
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਭ��ਣ</span>"
+#: ../capplet/settings/mail-account-view.c:549
+#| msgid "Ascending"
+msgid "Sending"
+msgstr "ਭ��ਣਾ"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8298,7 +8290,7 @@ msgstr ""
 "ਪਾਸਵਰਡ ਹ�ਠਾ� ਭਰ� ��� �ਸ�� ਸਭ ਸ��ਿੰ� �ਪਣ� �ਪ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰਾ���। �� �ਸ�� �ਹ ਸਭ ��� ���ਮ��ਿ� "
 "ਨਾ �ਰ ਸ�� ਤਾ� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸਰਵਰ ਬਾਰ� �ਾਣ�ਾਰ� ਵ� ਦ�ਣ� ਪਵ���।"
 
-#: ../capplet/settings/mail-account-view.c:587
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8308,11 +8300,11 @@ msgstr ""
 "ਦਿੱਤ� �� �ਾਣ�ਾਰ� ਮ�ਤਾਬ� ਪ�ਰਾ ਵ�ਰਵਾ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ ਤਾ� ��ਤ� ਹ�, ਪਰ ਤ�ਹਾਨ�ੰ �ਹਨਾ� ਨ�ੰ ਬਦਲਣਾ ਵ� "
 "ਪ� ਸ�ਦਾ ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "ਤ�ਸ�� ��ਾ��� ਸੰਰ�ਨਾ ਲ� ਹ�ਰ ��ਣਾ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:597
 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."
@@ -8320,11 +8312,11 @@ msgstr ""
 "ਹ�ਣ ਤ�ਹਾਨ�ੰ ਮ�ਲ ਭ��ਣ ਲ� ਸ��ਿੰ� ਦ�ਣ ਦ� ਲ�� ਹ�। �ਸ�� ��� �ੰਦਾ�਼ਾ ਲ�ਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ��ੱ�� ਹਾ�, ਪਰ "
 "ਤ�ਹਾਨ�ੰ �ਹ ��ੱ� �ਰ ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਿ �ਹ ਠ�� ਹਨ।"
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "ਤ�ਸ�� �ਪਣ� ��ਾ��� ਲ� �ਪਣ� ਡਿਫਾਲ� ਸ��ਿੰ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8332,101 +8324,102 @@ msgstr ""
 "ਸਮਾ� ਹ� ��ੱ� �ਰਨ ਦਾ, �ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਸ�� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ�� �ਤ� ਤ�ਹਾਡ��� "
 "ਮ�ਲਾ� ਲ�ਣ��� ਸ਼�ਰ� �ਰ��।"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 #: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "�ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "ਪਿੱ�� - ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
-msgstr "�ੱ�� - ਲ�ਣ ��ਣਾ�"
+msgstr "�ੱ�� - ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
-msgstr "ਲ�ਣ ��ਣਾ�"
+msgstr "ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "�ੱ�� - ��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "�ੱ�� - ਡਿਫਾਲ�"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
-msgstr "ਪਿੱ�� - ਲ�ਣ ��ਣਾ�"
+msgstr "ਪਿੱ�� - ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 #: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
 msgstr "ਪਿੱ�� - ਭ��ਣਾ"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ਸੰਪਰ� ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ��ਲੰਡਰ ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:732
 msgid "You may need to enable IMAP access."
 msgstr "ਤ�ਹਾਨ�ੰ IMAP �ਸ�ੱਸ �ਾਲ� �ਰਨ ਦ� ਲ�� ਪ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:733
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">���ਲ ��ਾ��� ਸ��ਿੰ�:</span>"
+#: ../capplet/settings/mail-account-view.c:740
+#| msgid "Backing Evolution accounts and settings"
+msgid "Google account settings:"
+msgstr "���ਲ ��ਾ��� ਸ��ਿੰ�:"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:767
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ਯਾਹ� ��ਲੰਡਰ ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:771
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -8435,24 +8428,25 @@ msgstr ""
 "ਯਾਹ� ��ਲੰਡਰ ਪਹਿਲਾ� ਨਾ�_��ਰ� ਨਾ� ਰਾਹ�� ਰੱ�ਦ� ਹਨ। �ਸ�� ��ਲੰਡਰ ਨਾ� ਬਣਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ ��ਤ� ਹ�। "
 "�ਸ�ਰ�� ��ਲੰਡਰ ਨਾ� ਦ� ਪ�ਸ਼�� �ਰ�, �� ਠ�� ਨਾ ਹ�ਵ� ਤਾ� ��ਲੰਡਰ ਨਾ� ਫ�ਰ ਲਿ��।"
 
-#: ../capplet/settings/mail-account-view.c:768
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਯਾਹ� ��ਾ��� ਸ��ਿੰ�:</span>"
+#: ../capplet/settings/mail-account-view.c:778
+#| msgid "Backing Evolution accounts and settings"
+msgid "Yahoo account settings:"
+msgstr "ਯਾਹ� ��ਾ��� ਸ��ਿੰ�:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
 msgstr "ਯਾਹ� ��ਲੰਡਰ ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:1049
+#: ../capplet/settings/mail-account-view.c:1061
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../capplet/settings/mail-account-view.c:1117
+#: ../capplet/settings/mail-account-view.c:1129
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "��ਬ ਬੰਦ �ਰ�"
 
-#: ../capplet/settings/mail-account-view.c:1127
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "��ਾ��� ਸਹਾ��"
 
@@ -8479,9 +8473,10 @@ msgid "On This Computer"
 msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "ਸ�ਧ"
+#, c-format
+#| msgid "Modify"
+msgid "Modify %s..."
+msgstr "%s ਸ�ਧ..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
@@ -8654,7 +8649,7 @@ msgstr "�ੱ�"
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
-msgstr "�ੱਲ�ਹ"
+msgstr "ਭਲ��"
 
 #: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
@@ -8700,7 +8695,7 @@ msgstr "\"%s\" ਲਿ�� �ਾ ਰਹ� ਹ�"
 #: ../e-util/e-file-utils.c:145
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "`%s' ਨ�ੰ `%s' �ੱਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr "\"%s\" ਨ�ੰ %s �ੱਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
@@ -8768,7 +8763,7 @@ msgstr "ਪਰਿੰ�ਿੰ� ਦ� ਦ�ਰਾਨ �ੱ� �ਲਤ� 
 
 #: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
-msgstr "ਪਰਿ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਭ��� ਹ�:"
+msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਭ��� ਹ�:"
 
 #: ../e-util/e-print.c:174
 msgid "The printing system did not report any additional details about the error."
@@ -8798,7 +8793,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}\"."
@@ -8810,7 +8805,7 @@ msgstr "�ੱਤ� ਲਿ��(_O)"
 
 #: ../e-util/e-util.c:146
 msgid "Could not open the link."
-msgstr "ਸਬੰਧ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
+msgstr "ਲਿੰ� ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
 #: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
@@ -8825,30 +8820,30 @@ msgstr "GConf �ਲਤ�: %s"
 msgid "All further errors shown only on terminal."
 msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1044
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
 #: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
 #: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1045
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
 #: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
 #: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1046
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
@@ -8864,66 +8859,66 @@ msgstr "ਮ�ਲਰ"
 
 #: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
-msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
+msgstr "-------- �ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ --------"
 
-#: ../em-format/em-format.c:1047 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
 #: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../em-format/em-format.c:1048 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../em-format/em-format.c:1049 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ਫ�ਸ"
 
-#: ../em-format/em-format.c:1434
+#: ../em-format/em-format.c:1431
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥ�"
 
-#: ../em-format/em-format.c:1506
+#: ../em-format/em-format.c:1503
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1664 ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
 
-#: ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1672
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
 
-#: ../em-format/em-format.c:1690
+#: ../em-format/em-format.c:1688
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../em-format/em-format.c:1691
+#: ../em-format/em-format.c:1689
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1873
+#: ../em-format/em-format.c:1871
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
 
-#: ../em-format/em-format.c:1883 ../em-format/em-format.c:2043
+#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
 msgid "Error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../em-format/em-format.c:1884 ../em-format/em-format.c:2031
-#: ../em-format/em-format.c:2044
+#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
+#: ../em-format/em-format.c:2042
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:2131
+#: ../em-format/em-format.c:2129
 msgid "Could not parse PGP message: "
 msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../em-format/em-format.c:2137 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9067,13 +9062,13 @@ msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
 #: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
-msgstr "��ਾ� ���(_F):"
+msgstr "���ਮ ���(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
 #: ../filter/e-filter-rule.c:749
 msgid "None"
-msgstr "��� ਨਹ�"
+msgstr "��� ਨਹ��"
 
 #: ../filter/e-filter-rule.c:750
 msgid "All related"
@@ -9118,7 +9113,7 @@ 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;."
@@ -9126,7 +9121,7 @@ msgstr "ਨਿਯਮਿਤ ਸਮ��ਰਨ &quot;{1}&quot; ਨ�ੰ �ੰ
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "ਫਾ�ਲ਼ &quot;{0}&quot; ਮ���ਦ ਨਹ� ਹ� �ਾ� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�।"
+msgstr "ਫਾ�ਲ &quot;{0}&quot; ਮ���ਦ ਨਹ� ਹ� �ਾ� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�।"
 
 #  filter:no-date primary
 #: ../filter/filter.error.xml.h:4
@@ -9135,7 +9130,7 @@ msgstr "ਮਿਤ� ��ੰਮ ਹ�।"
 
 #: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
-msgstr "ਫਾ�ਲ਼ ਨਾ� ��ੰਮ ਹ�।"
+msgstr "ਫਾ�ਲ ਨਾ� ��ੰਮ ਹ�।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
@@ -9149,12 +9144,12 @@ msgstr "ਨਾ� &quot;{0}&quot; ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
-msgstr "�ਿਰਪਾ �ਰ�� ਹ�ਰ ਨਾ� ��ਣ�"
+msgstr "ਹ�ਰ ਨਾ� ��ਣ� ��।"
 
 #  filter:no-date secondary
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
-msgstr "ਤ�ਹਾਨ�ੰ �ੱ� ਮਿਤ� ��ਣਨ� �ਾਹ�ਦ� ਹ�।"
+msgstr "ਤ�ਹਾਨ�ੰ ਮਿਤ� ��ਣਨ� �ਾਹ�ਦ� ਹ�।"
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
@@ -9162,7 +9157,7 @@ msgstr "�ਸ ਫਿਲ�ਰ ਲ� ਨਾ� ਦ�ਣਾ �ਾਹ�ਦਾ
 
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
-msgstr "ਤ�ਹਾਨ�ੰ ਫਾ�ਲ ਨਾ� ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
+msgstr "ਤ�ਹਾਨ�ੰ ਫਾ�ਲ ਨਾ� ਦ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
 #: ../filter/filter.ui.h:1
 msgid "Compare against"
@@ -9177,7 +9172,7 @@ msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨਿਰਧਾਰਿਤ ਮਿਤ� ਦ� ੧੨:੦੦ ਸਵ�ਰ\n"
+"ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਦਿੱਤ� ਮਿਤ� ਦ� ੧੨:੦੦ ਸਵ�ਰ\n"
 "ਨਾਲ �ਾ��� �ਾਵ���।"
 
 #: ../filter/filter.ui.h:6
@@ -9227,7 +9222,7 @@ msgstr "ਮ���ਦਾ ਸਮਾ�"
 
 #: ../filter/filter.ui.h:21
 msgid "the time you specify"
-msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤਾ ਹ�"
+msgstr "ਸਮਾ� �� ਤ�ਸ�� ਦਿੱਤਾ ਹ�"
 
 #: ../filter/filter.ui.h:23
 msgid "years"
@@ -9332,7 +9327,7 @@ msgid "Name"
 msgstr "ਨਾ�"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2761
 #: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
@@ -9343,7 +9338,7 @@ msgstr "ਡਰਾਫ�"
 
 #: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
-msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
+msgstr "ਬਾਹਰ-ਬ�ਸਾ"
 
 #: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
@@ -9500,11 +9495,11 @@ msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
 
 #: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
-msgstr "�ਹਨਾ� ਭ��ਣ�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
+msgstr "�ਹਨਾ� ਭ��ਣ ਵਾਲ� ਦ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
 #: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
-msgstr "ਵਿਸ਼� ਤ� ਫਿਲ�ਰ(_S)..."
+msgstr "ਵਿਸ਼� 'ਤ� ਫਿਲ�ਰ(_S)..."
 
 #: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
@@ -9660,11 +9655,11 @@ msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� �
 
 #: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
-msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
+msgstr "ਨਵ�� ਵਿੰਡ� '� ��ਲ�ਹ�(_O)"
 
 #: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� ਵਿੰਡ� ਵਿੱ� ��ਲ�ਹ�"
 
 #: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
@@ -9756,7 +9751,7 @@ msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
 #: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
-msgstr "ਪਿੱ�� ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ(_r)"
+msgstr "ਪਿੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_r)"
 
 #: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
@@ -9776,7 +9771,7 @@ msgstr "ਵਾਪਸ(_d)"
 
 #: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਰ�-ਡਿਰ��� �ਰ�"
 
 #: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
@@ -9851,7 +9846,7 @@ msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
 #: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
-msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
+msgstr "ਸ�ਨ�ਹ� ਦ� �ਣ-ਸ�ਧ� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
 #: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
@@ -10119,7 +10114,7 @@ msgstr ""
 #: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
-msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਮ�ਲ ਪ�ਰਾਪਤ�"
 
 #: ../mail/em-account-editor.c:2105
 msgid "Please configure the following account settings."
@@ -10127,7 +10122,7 @@ msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� 
 
 #: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
-msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਮ�ਲ ਭ��ਣ�"
 
 #: ../mail/em-account-editor.c:2108
 msgid ""
@@ -10161,7 +10156,7 @@ msgid ""
 "\n"
 "Click \"Apply\" to save your settings."
 msgstr ""
-"ਮ�ਬਾਰ�, ਤ�ਸ�� ਪੱਤਰ ਸੰਰ�ਨਾ ਸੰਪ�ਰਨ �ਰ ਲ� ਹ�।\n"
+"ਵਧਾ���, ਤ�ਸ�� ਪੱਤਰ ਸੰਰ�ਨਾ ਸੰਪ�ਰਨ �ਰ ਲ� ਹ�।\n"
 "\n"
 "ਹ�ਣ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ� ਪੱਤਰ ਭ�� ਤ� ਪ�ਰਾਪਤ �ਰ ਸ�ਦ� ਹ�।\n"
 "\n"
@@ -10217,7 +10212,7 @@ msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵ�� "
+"${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ਵ�� "
 "${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
 
 #: ../mail/em-composer-utils.c:2377
@@ -10226,7 +10221,7 @@ msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
 
 #: ../mail/em-composer-utils.c:2589
 msgid "Posting destination"
-msgstr "ਭ��ਣ ਲ� ਨਿਯਤ"
+msgstr "ਭ��ਣ �ਿ�ਾਣਾ"
 
 #: ../mail/em-composer-utils.c:2590
 msgid "Choose folders to post the message to."
@@ -10380,11 +10375,11 @@ msgstr "ਸ�ਨ�ਹਾ ਹ�ੱਡਰ"
 
 #: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
-msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਹ�"
+msgstr "ਸ�ਨ�ਹਾ �ੰ� ਹ�"
 
 #: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
-msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਨਹ� ਹ�"
+msgstr "ਸ�ਨ�ਹਾ �ੰ� ਨਹ�� ਹ�"
 
 #: ../mail/em-filter-i18n.h:50
 msgid "Message Location"
@@ -10396,7 +10391,7 @@ msgstr "ਪਰ��ਰਾਮ ਨਾਲ ਸ਼ਾਮਿਲ"
 
 #: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
-msgstr "�ਵਾ� �ਲਾ�"
+msgstr "�ਵਾ� �ਲਾ�"
 
 #. Past tense, as in "has been read".
 #: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
@@ -10429,7 +10424,7 @@ msgstr "�ੱ� ਵਾਪਿਸ �ਰ�"
 
 #: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
-msgstr "�ਾਰ� �ਲਾ�"
+msgstr "ਪਰ��ਰਾਮ �ਲਾ�"
 
 #: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
@@ -10477,7 +10472,7 @@ msgstr "�ਾਰਵਾ� ਰ���"
 
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
-msgstr "ਸਥਿਤ� ਨਾ-ਨਿਰਧਾਰਨ"
+msgstr "ਹਾਲਤ �ਣ-ਸ�ੱ�"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:533
@@ -10492,16 +10487,16 @@ msgstr "��ਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 #: ../mail/em-folder-properties.c:126
 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
 #: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "��ੱਲ ਸਨ�ਹ�:"
-msgstr[1] "��ੱਲ ਸਨ�ਹ�:"
+msgstr[0] "��ੱਲ ਸ�ਨ�ਹ�:"
+msgstr[1] "��ੱਲ ਸ�ਨ�ਹ�:"
 
 #: ../mail/em-folder-properties.c:148
 #, c-format
@@ -10534,7 +10529,7 @@ msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "��� ਫ�ਲਡਰ"
 
@@ -10579,7 +10574,7 @@ msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
-msgstr "%s (%u%s)"
+msgstr "%s (%Iu%s)"
 
 #: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
@@ -10593,7 +10588,7 @@ msgstr "ਫ�ਲਡਰ %s ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 #: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
-msgstr "ਫ�ਲਡਰ %s ਦ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹ�"
+msgstr "ਫ�ਲਡਰ %s �ਾਪ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
@@ -10735,7 +10730,7 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਸ�ਤ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� "
 "ਵਿੱ� �ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ਵ��ਣਾ ��ਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "ਸਰ��ਫਿ��� ਵ���(_V)"
 
@@ -10805,27 +10800,27 @@ msgstr "ਨਿ�ਾਰਾ ਬਾਹਰ�-ਭਾ�"
 #: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
-msgstr "FTP ਸਾ�� (%s) ਲ� ਸੰ��ਤ�"
+msgstr "FTP ਸਾ�� (%s) ਲ� ਪ���ੰ�ਰ"
 
 #: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਸੰ��ਤ�"
+msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਪ���ੰ�ਰ"
 
 #: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸੰ��ਤ�"
+msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਪ���ੰ�ਰ"
 
 #: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "ਰਿਮ�� ਡਾ�ਾ(%s) ਲ� ਸੰ��ਤ�"
+msgstr "ਰਿਮ�� ਡਾ�� (%s) ਲ� ਪ���ੰ�ਰ"
 
 #: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�ਾ (\"%s\" �ਿਸਮ) ਲ� ਸੰ��ਤ�"
+msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�� (\"%s\" �ਿਸਮ) ਲ� ਪ���ੰ�ਰ"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
@@ -10846,7 +10841,7 @@ msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ��
 
 #: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
-msgstr "ਮਨ�਼�ਰ"
+msgstr "ਮ��ਬਰ� ਹ�"
 
 #: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
@@ -10862,12 +10857,15 @@ msgstr "ਸਰਵਰ ��ਣ� ��।"
 msgid "No server has been selected"
 msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
 #: ../mail/em-utils.c:106
 #, c-format
-msgid "Are you sure you want to open %d messages at once?"
+#| msgid "Are you sure you want to open %d messages at once?"
+#| msgid_plural "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
 msgstr[1] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
@@ -10884,7 +10882,7 @@ msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ"
 #: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
-msgstr "%s ਤ�� ਸ�ਨ�ਹਾ"
+msgstr "%s ਤ�� ਸ�ਨ�ਹ�"
 
 #: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
@@ -10920,19 +10918,19 @@ msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ���
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
-msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ��ਾ�"
+msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਪੱਤਰ\" ਵਿੰਡ� ��ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ਡਾ� ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
+msgstr "\"ਪੱਤਰ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
-msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ���ਾ�"
+msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਮ�ਲ\" ਵਿੰਡ� ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:10
 msgid "Always request read receipt"
-msgstr "ਪ�ਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
+msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
@@ -10940,7 +10938,7 @@ msgstr "���ਮ��ਿ� �ਮ�ਸ਼ਨ ਪ�ਾਣ"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
-msgstr "���ਮ��ਿ� ਸੰਬੰਧ ਪ�ਾਣ"
+msgstr "���ਮ��ਿ� ਲਿੰ� ਪ�ਾਣ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
@@ -11259,7 +11257,7 @@ msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
 #: ../mail/evolution-mail.schemas.in.h:79
@@ -11267,7 +11265,7 @@ msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"��� ਫ�ਲਡਰ �ਡ��ਰ ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"\"��� ਫ�ਲਡਰ �ਡ��ਰ ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
 #: ../mail/evolution-mail.schemas.in.h:80
@@ -11275,7 +11273,7 @@ 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:81
@@ -11362,7 +11360,7 @@ msgid ""
 "private reply to a message which arrived via a mailing list."
 msgstr ""
 "�ਸ ਨਾਲ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ ਰ��ਿ� �ਾ� �ਾਲ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਦ�� ਤ�ਸ�� ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� �� ਸ�ਨ�ਹਾ "
-"ਦਾ �ਵਾਬ ਪ�ਰਾ���� ਭ�� ਰਹ� ਹ�ਵ�।"
+"ਦਾ �ਵਾਬ ਪ�ਰਾ�ਵ�� ਭ�� ਰਹ� ਹ�ਵ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
@@ -11452,19 +11450,19 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ�"
+msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨ"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
-msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
+msgstr "ਦਿੱਤ� ਲਾ� ਫਾ�ਲ ਲ� ਲਾ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
+msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨਾ� ਲ� ਲਾ�-ਫਾ�ਲ"
 
 #: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
-msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
+msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨਾ� ਲ� ਲਾ�-ਫਾ�ਲ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
@@ -11480,11 +11478,11 @@ msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
-msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�"
+msgstr "ਦਿੱਤ� ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਬਣਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
-msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�।"
+msgstr "ਦਿੱਤ� ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਬਣਾ ਦਿ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
@@ -11941,11 +11939,11 @@ msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਸ�ਮ ਫ��� ਵਰਤ
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
-msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ��।"
+msgstr "ਸਿਰਫ ਲ��ਲ ਸਪ�ਮ �ਾ�� ਹ� ਵਰਤ��।"
 
 #: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
-msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
+msgstr "ਸਿਰਫ ਲ��ਲ ਸਪ�ਮ �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
 #: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
@@ -12008,7 +12006,7 @@ msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ
 
 #: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
-msgstr "�ਲਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਲਮ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:964
@@ -12019,16 +12017,16 @@ msgstr "ਪੱਤਰ"
 
 #: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ੰਪ�ਰ�ਰ"
 
 #: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
-msgstr "Elm ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
+msgstr "Elm ਤ�� ਪੱਤਰ �ੰਪ�ਰ� ਹ�।"
 
 #: ../mail/importers/evolution-mbox-importer.c:116
 #: ../plugins/dbx-import/dbx-importer.c:226
 msgid "_Destination folder:"
-msgstr "ਨਿਯਤ ਫ�ਲਡਰ(_D):"
+msgstr "�ਿ�ਾਣਾ ਫ�ਲਡਰ(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
@@ -12039,7 +12037,7 @@ msgstr "ਫ�ਲਡਰ ��ਣ�"
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
-msgstr "�ਯਾਤ �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
+msgstr "�ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
 #: ../mail/importers/evolution-mbox-importer.c:382
 msgctxt "mboxImp"
@@ -12058,11 +12056,11 @@ msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
-msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ਯਾਤ�ਾਰ"
+msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ੰਪ�ਰ�ਰ"
 
 #: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
-msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "ਪੱਤਰ-ਬ�ਸਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:150
@@ -12080,7 +12078,7 @@ msgstr "�ਾ�� �ਾਰ� ਹ� %s"
 
 #: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
-msgstr "ਪਾ�ਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "ਪਾ�ਨ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/importers/pine-importer.c:405
 #: ../modules/addressbook/addressbook-config.c:1006
@@ -12089,11 +12087,11 @@ msgstr "�ਡਰ�ੱਸ ਬ�ੱ�"
 
 #: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ਯਾਤ�ਾਰ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ੰਪ��ਰ"
 
 #: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
-msgstr "Pine ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
+msgstr "Pine ਤ�� ਪੱਤਰ �ੰਪ�ਰ� ਹ�।"
 
 #: ../mail/mail-autofilter.c:70
 #, c-format
@@ -12113,33 +12111,41 @@ msgstr "ਵਿਸ਼ਾ ਹ� %s"
 #: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
-msgstr "%s ਪੱਤਰ ਲਿਸ�"
+msgstr "%s ਮ�ਲਿੰ� ਲਿਸ�"
 
 #: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
-msgstr "ਫਿਲ�ਰ ਨਿਯਮ ਸ਼ਾਮਿਲ �ਰ�"
-
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+msgstr "ਫਿਲ�ਰ ਨਿਯਮ ����"
+
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
+#, c-format
+#| msgid ""
+#| "The filter rule \"%s\" has been updated, because it used just removed "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following filter rules\n"
+#| "%s have been updated, because they used just removed folder\n"
+#| "\"%s\"."
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"ਫਿਲ�ਰ ਨਿਯਮ \"%s\" �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
-"\"%s\" ਨ�ੰ ਵਰਤਦਾ ਹ�।"
+"ਫਿਲ�ਰ ਨਿਯਮ \"%s\" ��ਾ��� ਵਾਸਤ� ਸ�ਧਿ� �ਿ� ਹ�, �� ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਲ� ਸ�।"
 msgstr[1] ""
 "�ੱ�� ਦਿੱਤ� ਫਿਲ�ਰ ਨਿਯਮ \n"
-"%s �ੱਪਡ�� ��ਤ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
-"\"%s\" ਨ�ੰ ਵਰਤਦ� ਸਨ।"
+"%s ��ਾ��� ਲ� ਸ�ਧ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਲ� ਸਨ।"
 
 #. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
@@ -12184,7 +12190,7 @@ msgstr "���ਰਿਪ�ਡ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� 
 
 #: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
-msgstr "ਪ�ਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
+msgstr "ਪ��ਹਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
 #: ../mail/mail-config.ui.h:14
 msgid "Apply the same _view settings to all folders"
@@ -12217,7 +12223,7 @@ msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�
 
 #: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
-msgstr "I �ਿਸਮ ਲ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
+msgstr "�ਿਵ�� ਮ�� ਲਿ�ਾ�, ਨਾਲ ਦ� ਨਾਲ ਹ� ਸਪ�ੱਲ ��ੱ� �ਰ�"
 
 #: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
@@ -12225,11 +12231,11 @@ msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ�
 
 #: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
-msgstr "ਸਾ�(_a)"
+msgstr "ਸਾ� �ਰ�(_a)"
 
 #: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
-msgstr "ਸਾ�(_r)"
+msgstr "ਸਾ� �ਰ�(_r)"
 
 #: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
@@ -12237,7 +12243,7 @@ msgstr "�ਲਤ ਸ਼ਬਦ-��� �ੱ�ਰਾ� ਦਾ ਰੰ�(_m):"
 
 #: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
-msgstr "ਸ�ਨ�ਹਾ ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr "ਸ�ਨ�ਹ� ਲਿ�ਣ�"
 
 #: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
@@ -12309,7 +12315,7 @@ msgstr "���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ���(_p):"
 
 #: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
-msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ(ਮ�ਲ ਹ�)(_g)"
+msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ (ਮ�ਲ ਹ�)(_g)"
 
 #: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
@@ -12357,11 +12363,11 @@ msgstr "ਮ�ਲਿੰ� ਲਿਸ�ਾ� ਲ� �ਵਾਬ-ਦਿ�: �
 
 #: ../mail/mail-config.ui.h:64
 msgid "Inline"
-msgstr "ਲਾ�ਨ '�"
+msgstr "ਲਾ�ਨ '�"
 
 #: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
-msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
+msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
 
 #: ../mail/mail-config.ui.h:67
 msgid "KB"
@@ -12401,7 +12407,7 @@ msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ�ਰਤਾ"
 
 #: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
-msgstr "�ਸ ਲ� ��� ਪਰਾ�ਸ� ਨਹ��(_P):"
+msgstr "��� ਪਰਾ�ਸ� ਨਹ��(_P):"
 
 #: ../mail/mail-config.ui.h:78
 msgid ""
@@ -12560,7 +12566,7 @@ msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ���"
 
 #: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
-msgstr "ਪੱਤਰ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr "ਪੱਤਰ ਭ��ਣ�"
 
 #: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
@@ -12692,7 +12698,7 @@ msgstr "ਮ��ਿੰ� ਬ�ਨਤ� �ੱਤ� ਦਸਤ�਼ਤ ਨ
 
 #: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
-msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
+msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
 #: ../mail/mail-config.ui.h:157
 msgid "_Junk Folder:"
@@ -12724,7 +12730,7 @@ msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
 #: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
-msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ�ਿ� ਬਣਾ�(_M)"
+msgstr "�ਸ ਦ� ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�(_M)"
 
 #: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
@@ -12744,7 +12750,7 @@ msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ
 
 #: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
-msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
+msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
 
 #: ../mail/mail-config.ui.h:171
 msgid "_Script:"
@@ -12762,7 +12768,7 @@ msgstr "ਸਰਵਰ(_S):"
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
-msgstr "�ਿੱਤਰ ਸ��ਵਤਾ ਵ��ਾ�(_S)"
+msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ��ਾ�(_S)"
 
 #: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
@@ -12787,9 +12793,9 @@ msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
 #: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
-msgstr "ਹ�ਰ �ਾਰ� ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
+msgstr "ਹ�ਰ �ਪਲ���ਸ਼ਨ ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
@@ -12798,7 +12804,7 @@ msgstr "a"
 msgid "addresses"
 msgstr "�ਡਰ�ੱਸ"
 
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
@@ -12816,11 +12822,11 @@ msgstr "ਸਭ ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
-msgstr "ਸਭ ਸਥਾਨ� �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
+msgstr "ਸਭ ਲ��ਲ �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
-msgstr "ਸਭ ਸਥਾਨ� ਫ�ਲਡਰ"
+msgstr "ਸਭ ਲ��ਲ ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
@@ -12868,7 +12874,7 @@ msgstr "�ੱ��"
 
 #: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
-msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
+msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
 #: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
@@ -12908,11 +12914,11 @@ msgid ""
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "ਸ�ਨ�ਹ�, �� �ਿ ਤ�ਸ�� ਪਿੱ�ਾ �ਰਨ ਲ� ��ਣ� ਸਨ, ਹ�ਠਾ� ਦਿੱਤ� �ਾ ਰਹ� ਹਨ।\n"
-"�ਿਰਪਾ �ਰ�� \"ਨਿਸ਼ਾਨ\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
+"\"ਫਲ��\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
 
 #: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
-msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
+msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
 
 #: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
@@ -12924,12 +12930,12 @@ msgstr "ਨਿਸ਼ਾਨ(_F):"
 
 #: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
-msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
+msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
 
 #: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
-msgstr "ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ� %s"
+msgstr "%s ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
@@ -12942,7 +12948,7 @@ msgstr "ਪੱਤਰ ਲ� �ਾ ਰਹ� ਹਨ"
 #: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� �ਸਫਲ: %s"
+msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� ਫ�ਲ�ਹ: %s"
 
 #: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
@@ -12951,12 +12957,12 @@ msgid ""
 "Appending to local 'Sent' folder instead."
 msgstr ""
 "%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s\n"
-"�ਸ ਦ� ਬ�ਾ� ਲ��ਲ`ਭ���/Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
+"�ਸ ਦ� ਬ�ਾ� ਲ��ਲ`ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
 
 #: ../mail/mail-ops.c:654
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ਲ��ਲ `ਭ���/Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
+msgstr "ਲ��ਲ `ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
 
 #: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
@@ -12970,7 +12976,7 @@ msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ 
 #: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "ਸ�ਨ�ਹ� %2$d ਵਿੱ��� %1$d ਭ��ਣ ਵਿੱ� �ਸਫ਼ਲ"
+msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹ� ਭ��ਣ ਵਿੱ� ਫ�ਲ�ਹ"
 
 #: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
 msgid "Canceled."
@@ -13062,15 +13068,15 @@ msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "ਸ�ਨ�ਹਾ %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-msgstr[1] "ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਹ� ਹਨ"
+msgstr[0] "ਸ�ਨ�ਹਾ %d ਲਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr[1] "ਸ�ਨ�ਹ� %d ਲ� �ਾ ਰਹ� ਹਨ"
 
 #: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
-msgstr[0] "ਸ�ਨ�ਹਾ %d ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
-msgstr[1] "ਸ�ਨ�ਹ� %d ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
+msgstr[0] "%d ਸ�ਨ�ਹਾ ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr[1] "%d ਸ�ਨ�ਹ� ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
 #: ../mail/mail-ops.c:2192
 #, c-format
@@ -13079,7 +13085,7 @@ msgstr "ਸ�ਨ�ਹ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 
 #: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
-msgstr "ਨੱਥ� ਸੰਭਾਲ�"
+msgstr "����ਮ��� ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
 
 #: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
@@ -13087,7 +13093,7 @@ msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"���ਪ�ੱ� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s:\n"
+"���ਪ�ੱ� ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s:\n"
 " %s"
 
 #: ../mail/mail-ops.c:2310
@@ -13097,17 +13103,17 @@ msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
 #: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
-msgstr "'%s' ਨਾਲ�� ��ਨ��ਸ਼ਨ �ਤਮ ��ਤਾ �ਾ�ਦਾ ਹ�"
+msgstr "'%s' ਨਾਲ�� ਡਿਸ-��ਨ��ਸ਼ਨ ��ਤਾ �ਾ�ਦਾ ਹ�"
 
 #: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
-msgstr "'%s' ਨਾਲ ਮ�� ���ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr "'%s' ਨਾਲ ਮ�� ��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/mail-ops.c:2636
 msgid "Checking Service"
@@ -13119,33 +13125,33 @@ msgstr "ਰੱਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
-msgstr "ਪੱਤਰ ਭ��� �ਤ� ਲਵ�"
+msgstr "ਪੱਤਰ ਭ��ਣ� �ਤ� ਲ�ਣ�"
 
 #: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
-msgstr "ਸਭ ਰੱਦ(_A)"
+msgstr "ਸਭ ਰੱਦ �ਰ�(_A)"
 
 #: ../mail/mail-send-recv.c:569
 msgid "Updating..."
-msgstr "�ੱਪਡ�� �ਾਰ�..."
+msgstr "�ੱਪਡ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
-msgstr "�ਡ�� �ਾਰ�..."
+msgstr "�ਡ�� ��ਤ� �ਾ ਰਹ� ਹ�..."
 
 #: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
-msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
+msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
 #: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
-msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
+msgstr "%s ਲ� ਭ�ਦ ਲਿ��"
 
 #: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
-msgstr "ਪਾਸਵਰਡ ਦਿ�"
+msgstr "ਭ�ਦ ਲਿ��"
 
 #: ../mail/mail-session.c:230
 #, c-format
@@ -13210,33 +13216,42 @@ msgstr "'%s:%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:675
+#, c-format
+#| msgid ""
+#| "The Search Folder \"%s\" has been updated, because it used just removed "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following Search Folders\n"
+#| "%s have been updated, because they used just removed folder\n"
+#| "\"%s\"."
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"��� ਫ�ਲਡਰ \"%s\" �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
-"\"%s\" ਨ�ੰ ਵਰਤਦਾ ਹ�।"
+"��ਾ��� ਲ� ਹ�ਾ� ਫ�ਲਡਰ \"%2$s\" ਵਾਸਤ� ��� ਫ�ਲਡਰ \"%1$s\"\n"
+"�ੱਪਡ�� ��ਤਾ �ਿ� ਹ�"
 msgstr[1] ""
-"�ੱ�� ਦਿੱਤ� ��� ਫ�ਲਡਰ\n"
-"%s �ੱਪਡ�� ��ਤ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
-"\"%s\" ਨ�ੰ ਵਰਤਦ� ਸਨ।"
+"ਹ�ਾ� �� ਫ�ਲਡਰ \"%2$s\"\n"
+"ਲ� ��ਾ��� ਦ� �ੱ�� ਦਿੱਤ� ��� ਫ�ਲਡਰਾ� ਨ�ੰ ਸ�ਧਿ� �ਿ� ਹ�\n"
+"%1$s"
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਸ�ਧ"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1290
 msgid "New Search Folder"
 msgstr "ਨਵਾ� ��� ਫ�ਲਡਰ"
 
@@ -13274,14 +13289,14 @@ msgid ""
 msgstr ""
 "\"{1}\" 'ਤ� �ੱ� ਨਾ-�ਾਲ� ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�।\n"
 "\n"
-"ਤ�ਸ�� �ਸ ਫ�ਲਡਰ ਨ�ੰ �ਣਡਿੱਠਾ �ਰ ਸ�ਦ� ਹ�, �ੱਪਰ ਲਿ� ਸ�ਦ� ਹ� �ਾ� ਭਾ� ਸ਼ਾਮਿਲ �ਰ ਸ�ਦ� ਹ� �ਾ� ਬੰਦ �ਰ "
+"ਤ�ਸ�� �ਸ ਫ�ਲਡਰ ਨ�ੰ �ਣਡਿੱਠਾ �ਰ ਸ�ਦ� ਹ�, �ੱਤ� ਲਿ� ਸ�ਦ� ਹ� �ਾ� ਭਾ� ਸ਼ਾਮਿਲ �ਰ ਸ�ਦ� ਹ� �ਾ� ਬੰਦ �ਰ "
 "ਸ�ਦ� ਹ�।"
 
 #: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr "\"{1}\" ਲ� ਪ�ਨ ਰਸ�ਦ ਸ��ਨਾ ਦ� ਮੰ� ��ਤ� �� ਹ�। �� {0} ਨ�ੰ ਰਸ�ਦ ਸ��ਨਾ ਭ��ਣ� ਹ�?"
+msgstr "\"{1}\" ਲ� ਪ��ਹਨ ਰਸ�ਦ ਸ��ਨਾ ਦ� ਮੰ� ��ਤ� �� ਹ�। �� {0} ਨ�ੰ ਰਸ�ਦ ਸ��ਨਾ ਭ��ਣ� ਹ�?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
@@ -13289,7 +13304,7 @@ msgstr "\"{1}\" ਲ� ਪ�ਨ ਰਸ�ਦ ਸ��ਨਾ ਦ� ਮੰ� 
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "ਨਾ� \"{1}\" ਨਾਲ �ੱ� ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
+msgstr "ਨਾ� \"{1}\" ਨਾਲ �ੱ� ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ। ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� ��।"
 
 #: ../mail/mail.error.xml.h:11
 msgid ""
@@ -13454,13 +13469,13 @@ msgstr "ਨਾ ਭ���(_N)"
 
 #: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
-msgstr "ਸ��ਰ�ਨਾ��਼ ਨਾ �ਰ�(_N)"
+msgstr "ਸਿੰ�ਰ�ਨਾ��਼ ਨਾ �ਰ�(_N)"
 
 #: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਸਥਾਨ� ਸਮ�ਾਲ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
+msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਲ��ਲ ਸਿੰ�ਰ�ਨਾ��਼ �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
 #: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
@@ -13492,7 +13507,7 @@ msgstr "{0} ਦ�ਰਾਨ �ਲਤ�।"
 
 #: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
-msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਸ �ੱਪਰ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
+msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਸ �ੱਤ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #  mail:no-write-path-notfile secondary
 #: ../mail/mail.error.xml.h:60
@@ -13580,17 +13595,19 @@ 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."
-msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
+msgstr "��ਾ��� �ਾਲ� �ਰ� �ਾ� ਹ�ਰ ਵੱ�ਰ� ��ਾ��� ਨਾਲ ਭ��� ��।"
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr "�ਿਰਪਾ �ਰ�� ਵੱਲ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲ ਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ �ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
+msgstr ""
+"ਵੱਲ: ��ਤਰ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲਥ ਬ�ਨ �ੱਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ "
+"�ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
 
 #: ../mail/mail.error.xml.h:81
 msgid ""
@@ -13608,7 +13625,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}\"."
@@ -13620,7 +13637,7 @@ msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ�ਾ� ਦ�
 
 #: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
-msgstr "ਪ�ਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+msgstr "ਪ��ਹਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
 #: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
@@ -13753,7 +13770,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
-msgstr "ਲਾ�ਸ��ਸ ਫਾ�ਲ ਪ�ਨ ਵਿੱ� �ਯ�� ਹ�।"
+msgstr "ਲਾ�ਸ��ਸ ਫਾ�ਲ ਪ��ਹਨ ਵਿੱ� �ਯ�� ਹ�।"
 
 #: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
@@ -13822,7 +13839,7 @@ msgstr "ਤ�ਹਾਨ�ੰ �ਸ ��� ਫ�ਲਡਰ ਦਾ ਨਾ�
 
 #: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
-msgstr "ਤ�ਹਾਨ�ੰ ਫ�ਲਡਰ ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
+msgstr "ਤ�ਹਾਨ�ੰ ਫ�ਲਡਰ ਦ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
 #: ../mail/mail.error.xml.h:131
 msgid ""
@@ -13835,11 +13852,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ \"{0}\" 'ਤ� \"{0}\" ਦ� ਤ�ਰ ਤ� ਲਾ��ਨ �ਸਫਲ"
+msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ \"{0}\" �ੱਤ� \"{0}\" ਵ��� ਲਾ��ਨ ਫ�ਲ�ਹ ਹ�।"
 
 #: ../mail/mail.error.xml.h:134
 msgid "_Append"
-msgstr "��ਲ�ਹ�(_A)"
+msgstr "ਨਾਲ ����ਹ�(_A)"
 
 #: ../mail/mail.error.xml.h:135
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
@@ -13854,7 +13871,7 @@ msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 #: ../mail/mail.error.xml.h:137
 #: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
-msgstr "ਰੱਦ� �ਾਲ�(_E)"
+msgstr "ਰੱਦ� �ਾਲ� �ਰ�(_E)"
 
 #: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
@@ -13870,7 +13887,7 @@ msgstr "ਰਸ�ਦ ਭ���(_S)"
 
 #: ../mail/mail.error.xml.h:143
 msgid "_Synchronize"
-msgstr "ਸ��ਰ�ਨਾ��਼(_S)"
+msgstr "ਸਿੰ�ਰ�ਨਾ��਼(_S)"
 
 #: ../mail/message-list.c:1170
 msgid "Unseen"
@@ -13886,7 +13903,7 @@ msgstr "�ਵਾਬ ਦਿੱਤ�"
 
 #: ../mail/message-list.c:1173
 msgid "Forwarded"
-msgstr "�ੱ�� ਭ��ਿ�"
+msgstr "�ੱ�� ਭ���"
 
 #: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
@@ -13898,7 +13915,7 @@ msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
 #: ../mail/message-list.c:1179
 msgid "Lowest"
-msgstr "ਨਿ�ਨਤਮ"
+msgstr "ਸਭ ਤ�� �ੱ�"
 
 #: ../mail/message-list.c:1180
 msgid "Lower"
@@ -13945,7 +13962,7 @@ msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
 #. there is some info why the message list is empty, let it be something useful
 #: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
-msgstr "ਸ�ਨ�ਹਾ ਸ��� ਬਣਾ� �ਾ ਰਹ� ਹ�"
+msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
 #: ../mail/message-list.c:4643
 msgid ""
@@ -14194,7 +14211,7 @@ msgstr "ਸਵ�-ਪ�ਰਤ�"
 
 #: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
-msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸਾ� ਵ���"
+msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸ਼ਾ ਵ���"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
@@ -14392,7 +14409,7 @@ msgstr "ਹ�ਾ�(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
-msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
+msgstr "ਵਿਸ਼�ਸ਼ਤਾ(_P)"
 
 #. Translators: This is an action label
 #: ../modules/addressbook/e-book-shell-view-actions.c:830
@@ -14449,7 +14466,7 @@ msgstr "ਨਾ-ਮਿਲਦਾ"
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
 #: ../modules/mail/e-mail-shell-view-actions.c:1271
-#: ../shell/e-shell-content.c:462
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "ਤ�ਨ��� ���"
 
@@ -14920,7 +14937,7 @@ msgstr "ਮ�ਲਾ�ਾਤ ਨ�ੰ ਮ��ਿੰ� ਵਿੱ� ਬਦ
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
-msgstr "ਮ�ਲਾ�ਤਾ '� ਬਦਲ�(_e)..."
+msgstr "ਮ�ਲਾ�ਤ '� ਬਦਲ�(_e)..."
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
@@ -14996,7 +15013,7 @@ msgstr "ਪਰਿੰ� ਹ�ਣ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
-msgstr "�ਾ�"
+msgstr "�ਾ�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
@@ -15090,13 +15107,13 @@ msgstr "�ੰਮ ��ਲ�ਹ�(_O)"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
 #: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
-msgstr "��ਣ� �ਾਰ� ਵ���"
+msgstr "��ਣ� �ਾਸ� ਵ���"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:823
 #: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
-msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�(_S)..."
+msgstr "iCalendar ਵ��� ਸੰਭਾਲ�(_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
 #: ../modules/calendar/e-task-shell-view-actions.c:1007
@@ -15249,11 +15266,11 @@ msgstr "�ਾਸ� ਲਿਸ�(_k)"
 #: ../modules/calendar/e-task-shell-backend.c:297
 #: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
-msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
+msgstr "ਨਵ�� �ਾਸ� ਸ��� ਬਣਾ�"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
-msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
+msgstr "�ਾਸ� ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
@@ -15263,12 +15280,12 @@ msgstr "�ਾਸ� ਲਿਸ� ��ਣ�ਾਰ"
 #: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "%s ਤ� �ੰਮ ��ਲ�ਹ ਰਿਹਾ ਹ�"
+msgstr "%s ਤ� �ਾਸ� ��ਲ�ਹ� �ਾ ਰਹ� ਹਨ"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
-msgstr "�ੰਮ ਪਰਿੰ� �ਰ�"
+msgstr "�ਾਸ� ਪਰਿੰ� �ਰ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
@@ -15278,9 +15295,9 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 "�ਸ �ਾਰਵਾ� ਨਾਲ ਸਾਰ� ��ਣ��� �ਾਰਵਾ��� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ��� �ਾਣ����। ���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� �ਹ "
-"�ੰਮ ਮ�� ਮਿਲ ਨਾ ਸ�ਣ��।\n"
+"�ਾਸ� ਮ�� ਮਿਲ ਨਾ ਸ�ਣ��।\n"
 "\n"
-"�� ਤ�ਸ�� �ਹਨਾ� �ੰਮਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
+"�� ਤ�ਸ�� �ਹਨਾ� �ਾਸ�ਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
@@ -15328,11 +15345,11 @@ msgstr "�ਧ�ਰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
-msgstr "ਸਮਾਪਤ �ੰਮ ਹ�ਾ�"
+msgstr "ਸਮਾਪਤ �ਾਸ� ਹ�ਾ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
-msgstr "�ੰਮ �ਲ�(_P)"
+msgstr "�ਾਸ� �ਲ�(_P)"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
@@ -15368,11 +15385,11 @@ msgstr "����ਮ��� ਨਾਲ �ਾਸ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
-msgstr "�ੰਮ ਸ��� ਪਰਿੰ� �ਰ�"
+msgstr "�ਾਸ� ਲਿਸ� ਪਰਿੰ� �ਰ�"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
-msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਰ� ਸ��� ਦ� �ਲ�"
+msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਸ� ਲਿਸ� ਦ� �ਲ�"
 
 #: ../modules/calendar/e-task-shell-view-private.c:463
 msgid "Expunging"
@@ -15382,8 +15399,8 @@ msgstr "ਨਿ�ਾਲਾ"
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d �ੰਮ"
-msgstr[1] "%d �ੰਮ"
+msgstr[0] "%d �ਾਸ�"
+msgstr[1] "%d �ਾਸ�"
 
 #: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
@@ -15413,7 +15430,7 @@ msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
 
 #: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
-msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
+msgstr "�ੱ� ਨਵਾ� ਡਾ� ਸ�ਨ�ਹਾ ਲਿ��"
 
 #: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
@@ -15752,8 +15769,8 @@ msgstr[1] "%d ਭ���"
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
-msgstr[0] "%d �ਣ-ਰ�ਡ, "
-msgstr[1] "%d �ਣ-ਰ�ਡ, "
+msgstr[0] "%d ਨਾ-ਪ��ਹ�, "
+msgstr[1] "%d ਨਾ-ਪ��ਹ�, "
 
 #: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
@@ -15975,7 +15992,7 @@ msgstr "ਤ�ਹਾਨ�ੰ ਯਾਦ �ਰਵਾ�ਦਾ ਹ� �ਿ ਤ
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "Inline Audio"
-msgstr "ਲਾ�ਨ '� �ਡ��"
+msgstr "ਲਾ�ਨ '� �ਡ��"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Play audio attachments directly in mail messages."
@@ -17240,6 +17257,10 @@ msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "ਸ�ਧ"
+
 #: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
@@ -18106,15 +18127,15 @@ msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ 
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�� ��ਵਲ �ਨ-ਬਾ�ਸ ਵਿ�ਲ� ਸ�ਨ�ਹਿ�� ਲ� ਹ� ਨ���ਫਾ� �ਰਨਾ ਹ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:369
+#: ../plugins/mail-notification/mail-notification.c:370
 msgid "Evolution's Mail Notification"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:392
 msgid "Mail Notification Properties"
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18131,67 +18152,67 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:540
 #, c-format
 msgid "From: %s"
 msgstr "ਵਲ��: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:553
 #, c-format
 msgid "Subject: %s"
 msgstr "ਵਿਸ਼ਾ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:563
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ਤ�ਹਾਨ�ੰ �ੱ� ਨਵਾ� %d  ਸ�ਨ�ਹਾ ��� ਹ�।"
 msgstr[1] "ਤ�ਹਾਨ�ੰ %d  ਨਵ�� ਸ�ਨ�ਹ� �� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:585
+#: ../plugins/mail-notification/mail-notification.c:592
 msgid "New email"
 msgstr "ਨਵ�� �ਮ�ਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:653
 msgid "Show icon in _notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਵ���(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:680
+#: ../plugins/mail-notification/mail-notification.c:681
 msgid "B_link icon in notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:691
 msgid "Popup _message together with the icon"
 msgstr "���ਾਨ ਨਾਲ ਸ�ਨ�ਹਾ ਵ� ਪ�ਪ�ੱਪ �ਰ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:878
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:907
 msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:920
 msgid "Use sound _theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��(_t)"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:939
 msgid "Play _file:"
 msgstr "ਫਾ�ਲ �ਲਾ�(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:950
 msgid "Select sound file"
 msgstr "ਸਾ��ਡ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:1008
 msgid "Notify new messages for _Inbox only"
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:1017
 msgid "Generate a _D-Bus message"
 msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
 
@@ -19435,11 +19456,11 @@ msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
-#: ../shell/e-shell-content.c:523 ../shell/e-shell-content.c:524
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "���"
 
-#: ../shell/e-shell-content.c:566
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "��� ਸੰਭਾਲ�"
 
@@ -19447,19 +19468,19 @@ msgstr "��� ਸੰਭਾਲ�"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:924
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "ਵ���(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "���(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1016
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr " �ੰਦਰ(_n)"
 
@@ -20304,11 +20325,12 @@ msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ�
 msgid "Your Certificates"
 msgstr "ਤ�ਹਾਡਾ ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
 msgstr "ਬ���ੱਪ(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "CA ਭਰ�ਸਾ ਸ�ਧ(_E)"
 
@@ -21103,31 +21125,26 @@ msgid "Delivery Options"
 msgstr "ਡਿਲਵਰ� ��ਣਾ�"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "�ਦ ਤੱ�(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "ਬਾ�ਦ(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "ਦਿਨ"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "ਵਿੱ�(_t)"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "ਦਿਨ"
@@ -21214,7 +21231,6 @@ msgstr "�ਦ�� ��ਲ�ਹਿ� �ਾਵ�(_W):"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "��� ਨਹ�"
@@ -21595,14 +21611,29 @@ msgstr "ਦਬਾ�"
 msgid "sort"
 msgstr "ਲ��ਬੱਧ"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2536
 msgid "Select All"
 msgstr "ਸਭ ��ਣ�"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2548
 msgid "Input Methods"
 msgstr "�ੰਪ�ੱ� ਢੰ�"
 
+#~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">ਵ�ਰਵਾ:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">ਪ�ਰਾਪਤ�</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">ਭ��ਣ</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">���ਲ ��ਾ��� ਸ��ਿੰ�:</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">ਯਾਹ� ��ਾ��� ਸ��ਿੰ�:</span>"
+
 #~ msgid "Unable to reconstruct message from autosave file"
 #~ msgstr "���ਸ�ਵ ਫਾ�ਲ ਤ�� ਸ�ਨ�ਹਾ ਫ�ਰ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ"
 



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