[evolution] Update Punjabi translation



commit ef943a4db5709ce480ea34c12534a14f6410ddfe
Author: Aman Alam <apreet alam gmail com>
Date:   Sun Mar 1 08:48:14 2020 +0000

    Update Punjabi translation

 po/pa.po | 10302 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 5474 insertions(+), 4828 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index e6d76caa1b..9e70a73f64 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,17 +2,16 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../src/shell/main.c:527
 # Punjab Linux Technology <punjablinux netscape net>, 2004.
 # A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2019.
-# Amanpreet Singh Alam <aalam users sf net>, 2008, 2009, 2012, 2013.
+# Amanpreet Singh Alam <aalam users sf net>, 2008, 2009, 2012, 2013, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2019-01-30 13:46+0000\n"
-"PO-Revision-Date: 2019-02-28 01:05-0600\n"
-"Last-Translator: A S Alam <alam yellow gmail com>\n"
+"POT-Creation-Date: 2020-02-28 08:55+0000\n"
+"PO-Revision-Date: 2020-03-01 00:45-0800\n"
+"Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi <punjabi-users lists sf net>\n"
 "Language: pa\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -67,11 +66,6 @@ msgid "Contact layout style"
 msgstr "ਸੰਪਰਕ ਲੇਆਉਟ ਸਟਾਈਲ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the contact list. \"0\" (Classic View) places the preview pane below "
-#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
-#| "the contact list."
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. “0” (Classic View) places the preview pane below the "
@@ -112,9 +106,6 @@ msgid "Primary address book"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਐਡਰੈੱਸ ਬੁੱਕ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#| msgid ""
-#| "The UID of the selected (or \"primary\") address book in the sidebar of "
-#| "the \"Contacts\" view"
 msgid ""
 "The UID of the selected (or “primary”) address book in the sidebar of the "
 "“Contacts” view"
@@ -128,77 +119,77 @@ msgstr "ਝਲਕ ਪੈਨ ਵੇਖੋ"
 msgid "Whether to show the preview pane."
 msgstr "ਕੀ ਝਲਕ ਪੈਨ ਵੇਖਾਉਣੀ ਹੈ"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-#, fuzzy
 #| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show phone numbers in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਫ਼ੋਨ ਨੰਬਰ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show SIP addresses in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ SIP ਐਡਰੈਸ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show IM addresses in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ IM ਐਡਰੈਸ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing Home addresses in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਚਿੱਠੀ-ਪੱਤਰ ਘਰ ਐਡਰੈਸ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Work in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਚਿੱਠੀ-ਪੱਤਰ ਐਡਰੈਸ ਕੰਮ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Other in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਚਿੱਠੀ-ਪੱਤਰ ਐਡਰੈਸ ਹੋਰ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Web Addresses in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਵੈੱਬ ਐਡਰੈਸ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-#, fuzzy
 #| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show job information in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਜੌਬ ਜਾਣਕਾਰੀ ਵਿਖਾਉਣੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Miscellaneous information in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਜੌਬ ਜਾਣਕਾਰੀ ਵਿਖਾਉਣੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show notes in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਨੋਟਿਸ ਵਿਖਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
-#, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Certificates tab in the editor"
-msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਐਡੀਟਰ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਟੈਬ ਵਿਖਾਉਣੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
-#, fuzzy
 #| msgid "Create a new contact list"
 msgid "Where to open contact locations"
-msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ ਬਣਾਓ"
+msgstr "ਸੰਪਰਕ ਟਿਕਾਣੇ ਕਿੱਥੇ ਖੋਲ੍ਹੀਏ"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+"ਇਸ ਵੇਲੇ ਸਹਾਇਕ ਮੁੱਲ “openstreetmap” ਅਤੇ “google” ਹਨ; ਜੇ ਅਣਪਛਾਟਾ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, "
+"“openstreetmap” ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
@@ -212,6 +203,17 @@ msgstr ""
 "ਸੁਨੇਹੇ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ UTF-੮ ਤੋਂ ਯੂਨੀਫਾਈ ਸਪਮ/ਹਮ ਟੋਕਨ ਵਿੱਚ ਬਦਲੋ, ਜੋ ਕਿ ਵੱਖਰੇ"
 " ਅੱਖਰ ਸੈੱਟ ਤੋਂ ਆਉਦੇ ਹਨ।"
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "ਰੀਮਾਈਂਡਰ ਆਡੀਓ ਲਈ ਸੰਭਾਲਣ ਡਾਇਰੈਕਟਰੀ"
@@ -233,14 +235,12 @@ msgid "Birthday and anniversary reminder units"
 msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਂਡਰ ਯੂਨਿਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#, fuzzy
 #| msgid ""
 #| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 #| "\"days\""
 msgid ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
-msgstr ""
-"ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਂਡਰ ਲਈ ਯੂਨਿਟ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+msgstr "ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਂਡਰ ਲਈ ਯੂਨਿਟ ਹਨ, “ਮਿੰਟ“, “ਘੰਟੇ“ ਜਾਂ “ਦਿਨ“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
 msgid "Compress weekends in month view"
@@ -316,119 +316,107 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਸ਼ੁਰੂ ਹੋਣ, ੦ ਤੋਂ ੫੯"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Monday"
-msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
+msgstr "ਸੋਮਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#, fuzzy
 #| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgid ""
 "Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
 "or -1 to use day-start-hour and day-start-minute"
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Monday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
+msgstr "ਸੋਮਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-#, fuzzy
 #| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-end-hour and day-end-minute"
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
+msgstr ""
+"ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਲਈ ਸਮਾਂ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ HHMM, ੦੦੦੦ ਤੋਂ ੨੩੫੯ ਜਾਂ -੧"
+" ਨੂੰ ਦਿਨ-ਅੰਤ-ਘੰਟਾ "
+"ਅਤੇ ਦਿਨ-ਅੰਤ-ਮਿੰਟ ਲਈ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-#, fuzzy
 #| msgid "Workday start minute"
 msgid "Workday start time for Tuesday"
-msgstr "ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਮਿੰਟ"
+msgstr "ਮੰਗਲਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#, fuzzy
 #| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-start-hour and day-start-minute"
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
+msgstr ""
+"ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਲਈ ਸਮਾਂ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ HHMM, ੦੦੦੦ ਤੋਂ ੨੩੫੯ ਜਾਂ -੧"
+" ਨੂੰ ਦਿਨ-ਸ਼ੁਰੂ-ਘੰਟਾ "
+"ਅਤੇ ਦਿਨ-ਸ਼ੁਰੂ-ਮਿੰਟ ਲਈ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#, fuzzy
 #| msgid "Workday end minute"
 msgid "Workday end time for Tuesday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਮਿੰਟ"
+msgstr "ਮੰਗਲਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#, fuzzy
 #| msgid "Workday start minute"
 msgid "Workday start time for Wednesday"
-msgstr "ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਮਿੰਟ"
+msgstr "ਬੁੱਧਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#, fuzzy
 #| msgid "Workday end minute"
 msgid "Workday end time for Wednesday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਮਿੰਟ"
+msgstr "ਬੁੱਧਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Thursday"
-msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
+msgstr "ਵੀਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Thursday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
+msgstr "ਵੀਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Friday"
-msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
+msgstr "ਸ਼ੁੱਕਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Friday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
+msgstr "ਸ਼ੁੱਕਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Saturday"
-msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
+msgstr "ਸ਼ਨਿੱਚਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Saturday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
+msgstr "ਸ਼ਨਿੱਚਰਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#, fuzzy
 #| msgid "Workday start hour"
 msgid "Workday start time for Sunday"
-msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
+msgstr "ਐਤਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#, fuzzy
 #| msgid "Workday end hour"
 msgid "Workday end time for Sunday"
-msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
+msgstr "ਐਤਵਾਰ ਲਈ ਕਾਰਜਕਾਰੀ ਅੰਤ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#, fuzzy
 #| msgid ""
 #| "Shows the second time zone in a Day View, if set. Value is similar to one "
 #| "used in a 'timezone' key"
@@ -436,7 +424,7 @@ msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a “timezone” key"
 msgstr ""
-"ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ ਵੇਖਣਾ ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ। ਮੁੱਲ 'timezone' ਕੁੰਜੀ"
+"ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ ਵੇਖਣਾ ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ। ਮੁੱਲ ”timezone” ਕੁੰਜੀ"
 " ਵਿੱਚ ਵਰਤੇ ਵਾਂਗ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
@@ -452,7 +440,6 @@ msgid "Maximum number of recently used timezones to remember"
 msgstr "ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#, fuzzy
 #| msgid ""
 #| "Maximum number of recently used timezones to remember in a 'day-second-"
 #| "zones' list"
@@ -460,7 +447,7 @@ msgid ""
 "Maximum number of recently used timezones to remember in a “day-second-"
 "zones” list"
 msgstr ""
-"'day_second_zones' ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
+"”day_second_zones” ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
@@ -475,10 +462,9 @@ msgid "Default reminder units"
 msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਂਡਰ ਯੂਨਿਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#, fuzzy
 #| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgid "Units for a default reminder, “minutes”, “hours” or “days”"
-msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਂਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਂਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, ”ਮਿੰਟ”, ”ਘੰਟੇ” ਜਾਂ ”ਦਿਨ”"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
@@ -541,9 +527,6 @@ msgid "Hide task units"
 msgstr "ਕੰਮ ਆਈਟਮਾਂ ਓਹਲੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#| msgid ""
-#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
-#| "\""
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr "ਟਾਸਕ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, ”ਮਿੰਟ”, ”ਘੰਟੇ” ਜਾਂ ”ਦਿਨ”"
 
@@ -556,28 +539,24 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "ਟਾਸਕ (ਕੰਮ) ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#, fuzzy
 #| msgid "User cancelled operation"
 msgid "Hide cancelled events"
-msgstr "ਯੂਜ਼ਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
+msgstr "ਰੱਦ ਕੀਤੇ ਈਵੈਂਟ ਲੁਕਾਓ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#, fuzzy
 #| msgid "Whether to hide completed tasks in the tasks view"
 msgid "Whether to hide cancelled events in the calendar view"
-msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ"
+msgstr "ਕੀ ਕੈਲੰਡਰ ਝਲਕ ਵਿੱਚ ਰੱਦ ਕੀਤੇ ਈਵੈਂਟਾਂ ਨੂੰ ਲੁਕਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Hide cancelled tasks"
-msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
+msgstr "ਰੱਦ ਕੀਤੇ ਕੰਮ ਲੁਕਾਓ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#, fuzzy
 #| msgid "Whether to hide completed tasks in the tasks view"
 msgid "Whether to hide cancelled tasks in the tasks view"
-msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ"
+msgstr "ਕੀ ਰੱਦ ਕੀਤੇ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Horizontal pane position"
@@ -601,20 +580,18 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "ਸਮਾਂ ਜਦੋਂ ਰੀਮਾਈਂਡਰ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#, fuzzy
 #| msgid "Marcus Bains Line Color - Day View"
 msgid "Marcus Bains Line Color — Day View"
-msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਦਿਨ ਝਲਕ"
+msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ — ਦਿਨ ਝਲਕ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#, fuzzy
 #| msgid "Marcus Bains Line Color - Time bar"
 msgid "Marcus Bains Line Color — Time bar"
-msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਸਮਾਂ ਰੇਖਾ"
+msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ — ਸਮਾਂ ਰੇਖਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
@@ -642,11 +619,6 @@ msgid "Memo layout style"
 msgstr "ਮੀਮੋ ਲੇਆਉਟ ਸਟਾਈਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the memo list. \"0\" (Classic View) places the preview pane below the "
-#| "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
-#| "list"
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. “0” (Classic View) places the preview pane below the memo "
@@ -654,8 +626,8 @@ msgid ""
 msgstr ""
 "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਮੀਮੋ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
 "”0” (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। ”1” (ਵਰਟੀਕਲ ਝਲਕ)"
-" ਝਲਕ "
-"ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
+" ਝਲਕ ਬਾਹੀ "
+"ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
@@ -687,80 +659,81 @@ msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "Let the Month View start with the current week"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid ""
+"Whether the month view should show weeks starting with the current week "
+"instead of the first week of the month."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "ਪਸੰਦੀਦਾ ਨਵੀਂ ਬਟਨ ਆਈਟਮ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr "ਪਸੰਦੀਦਾ ਨਵੀਂ ਟੂਲਬਾਰ ਬਟਨ ਆਈਟਮ ਦਾ ਨਾਂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਕੈਲੰਡਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#| msgid ""
-#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
-#| "\"Calendar\" view"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
 msgstr "”ਕੈਲੰਡਰ” ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ ”ਪ੍ਰਾਇਮਰੀ”) ਕੈਲੰਡਰੀ ਲਿਸਟ ਦੀ UID ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-#| msgid ""
-#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
-#| "\"Memos\" view"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
 msgstr "”ਮੀਮੋ” ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ ”ਪ੍ਰਾਇਮਰੀ”) ਮੀਮੋ ਲਿਸਟ ਦੀ UID ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਟਾਸਕ ਲਿਸਟ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-#| msgid ""
-#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
-#| "\"Tasks\" view"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
 msgstr "”ਟਾਸਕ” ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ ”ਪ੍ਰਾਇਮਰੀ”) ਟਾਸਕ ਲਿਸਟ ਦੀ UID ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਟੈਪਲੇਟ URL"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
 msgstr ""
-"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ"
+"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਵਰਤੋਂਕਾਰ ਖੇਤਰ"
 " ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ "
 "ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "ਮੁੜ-ਹੋਣ ਵਾਲੇ ਈਵੈਂਟ ਤਿਰਛੇ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "ਖੱਬੇ ਪਾਸੇ ਹੇਠਾਂ ਕੈਲੰਡਰ ਵਿੱਚ ਮੁੜ ਵਾਪਰਨ ਵਾਲੇ ਈਵੈਂਟ ਲਈ ਦਿਨ ਤਿਰਛੇ ਰੂਪ 'ਚ ਵੇਖਾਉ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr "ਸਮਾਂ ਅਧਾਰਿਤ ਖੋਜ ਕਰਨ ਲਈ ਖੋਜ ਹੱਦ ਸਾਲਾਂ ਵਿੱਚ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -770,98 +743,85 @@ msgstr ""
 " ਸਕਦੀ ਹੈ, ਜਦੋਂ ਹੋਰ "
 "ਮੌਜੂਦਗੀ ਦੀ ਜਾਂਚ ਕਰਨੀ ਹੋਵੇ; ਡਿਫਾਲਟ 10 ਸਾਲ ਹੈ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 #| msgid "Show appointment end times in week and month views"
 msgid "Show appointment icons in the month view"
-msgstr "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖੋ"
+msgstr "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਆਈਕਾਨ ਵੇਖਾਓ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #| msgid ""
 #| "Whether to display the end time of events in the week and month views"
 msgid "Whether to show icons of events in the month view"
-msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ"
+msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਈਵੈਂਟਾਂ ਦੇ ਆਈਕਾਨ ਵੇਖਾਉਣੇ ਹਨ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #| msgid "If \"true\", show the memo preview pane in the main window"
 msgid "If “true”, show the memo preview pane in the main window"
-msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
+msgstr "ਜੇ “ਸਹੀਂ“ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #| msgid "If \"true\", show the task preview pane in the main window"
 msgid "If “true”, show the task preview pane in the main window"
-msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
+msgstr "ਜੇ “ਸਹੀਂ“ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "ਦਿਨ ਝਲਕ, ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "ਕੀ ਕੈਲੰਡਰ 'ਚ ਕਈ ਥਾਵਾਂ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "ਟੈਗ ਬਾਹੀ ਲਈ ਲੰਬਕਾਰੀ ਸਥਿਤੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਨੂੰ ਉਭਾਰੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "ਕੀ ਅੱਜ ਦੀਆਂ ਟਾਸਕ ਨੂੰ ਖਾਸ ਰੰਗ ਨਾਲ ਉੜਾਘਨਾ ਹੈ (ਅੱਜ-ਦੀਆਂ-ਟਾਸਕ-ਰੰਗ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-#| msgid ""
-#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-#| "together with task-due-today-highlight"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
 msgstr ""
 "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ, ”#rrggbb” ਫਾਰਮੈਟ ਵਿੱਚ।"
-" ਅੱਜ-ਦੇ-ਦੇਣ-ਵਾਲੇ-ਕੰਮ-ਉਭਾਰੋ ਨਾਲ ਇੱਕਠੇ "
-"ਉਭਾਰੋ"
+" ਅੱਜ-ਦੇ-ਦੇਣ-ਵਾਲੇ-ਕੰਮ-ਉਭਾਰੋ ਨਾਲ ਇੱਕਠੇ ਉਭਾਰੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਸਥਿਤੀ (ਹਰੀਜੱਟਲ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "ਟਾਸਕ ਲੇਆਉਟ ਸਟਾਈਲ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the task list. \"0\" (Classic View) places the preview pane below the "
-#| "task list. \"1\" (Vertical View) places the preview pane next to the task "
-#| "list"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. “0” (Classic View) places the preview pane below the task "
@@ -872,56 +832,50 @@ msgstr ""
 " ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਸਥਿਤੀ (ਵਰਟੀਕਲ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr "ਸਮਾਂ-ਲੰਘੀਆਂ ਟਾਸਕਾਂ ਉਭਾਰੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "ਕੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀਆਂ ਟਾਸਕ ਨੂੰ ਖਾਸ ਰੰਗ ਨਾਲ ਉੜਾਘਨਾ ਹੈ (ਮਿਆਦ-ਲੰਘੀ-ਟਾਸਕ-ਰੰਗ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#| msgid ""
-#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-#| "together with task-overdue-highlight."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
 msgstr ""
 "ਟਾਸਕ (ਕੰਮ), ਜਿੰਨ੍ਹਾਂ ਲਈ ਸਮਾਂ ਲੰਘ ਚੁੱਕਾ ਹੈ, ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ, ”#rrggbb” ਫਾਰਮੈਟ"
-" ਵਿੱਚ। ਲੰਘੇ-"
-"ਸਮੇਂ-ਵਾਲੇ-ਕੰਮ-ਉਭਾਰੋ ਨਾਲ ਇੱਕਠੇ ਉਭਾਰੋ।"
+" ਵਿੱਚ। ਲੰਘੇ-ਸਮੇਂ-"
+"ਵਾਲੇ-ਕੰਮ-ਉਭਾਰੋ ਨਾਲ ਇੱਕਠੇ ਉਭਾਰੋ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "ਸਮਾਂ ਵੰਡ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-#| msgid ""
-#| "The default timezone to use for dates and times in the calendar, as an "
-#| "untranslated Olson timezone database location like \"America/New York\""
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -930,78 +884,99 @@ msgstr ""
 " ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
 "ਖੇਤਰ, ਜਿਵੇਂ ਕਿ ”America/New York” ਆਦਿ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "ਕੀ ਸਮਾਂ ਸਵੇਰੇ/ਸ਼ਾਮ ਦੀ ਬਜਾਏ ੪ ਘੰਟਿਆਂ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਂਡਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "ਕੀ ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਲਈ ਮੂਲ ਰੀਮਾਈਂਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a default reminder for appointments"
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਰੀਮਾਈਂਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr "ਸਿਸਟਮ ਟਾਈਮ-ਜ਼ੋਨ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਚੁਣੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਸਮਾਂ-ਖੇਤਰ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr "ਹਫ਼ਤੇ ਦਾ ਪਹਿਲਾਂ ਦਿਨ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr "ਸੋਮਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Tuesday is a work day"
 msgstr "ਮੰਗਲਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Wednesday is a work day"
 msgstr "ਬੁੱਧਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Thursday is a work day"
 msgstr "ਵੀਰਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Friday is a work day"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Saturday is a work day"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr "ਐਤਵਾਰ ਕੰਮ ਦਾ ਦਿਨ ਹੈ"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+msgid "Create events, memos and tasks as Private by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Draw events as flat, not shaded."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid ""
+"Whether to order days in the Week View from left to right, rather than from "
+"top to bottom."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+msgid ""
+"Allow direct edit of event Summary when clicking on it in the Day, Work "
+"Week, Week or Month view."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+msgid "User-defined reminder times, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(ਬਰਤਰਫ਼) ਹਫਤੇ ਦਾ ਪਹਿਲਾਂ ਦਿਨ, ਐਤਵਾਰ (੦) ਤੋਂ ਸ਼ਨਿਚੱਰਵਾਰ (੬)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"week-start-day-name\" instead."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -1010,12 +985,11 @@ msgstr ""
 " ”week-"
 "start-day-name” ਦੀ ਵਰਤੋਂ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid "(Deprecated) Work days"
 msgstr "(ਬਰਤਰਫ਼) ਕਾਰਜਕਾਰੀ ਦਿਨ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
-#, fuzzy
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
 #| msgid ""
 #| "Days on which the start and end of work hours should be indicated. (This "
 #| "key was deprecated in version 3.10 and should no longer be used. Use the "
@@ -1027,18 +1001,14 @@ msgid ""
 msgstr ""
 "ਦਿਨ, ਜਿਹਨਾਂ ਉੱਤੇ ਕੰਮ ਸ਼ੁਰੂ ਤੇ ਖਤਮ ਕਰਨ ਦੇ ਘੰਟੇ ਦਰਸਾਉਣੇ ਹਨ। (ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ"
 " 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ "
-"ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ। ਇਸ ਦੀ ਬਜਾਏ  \"work-day-monday\", "
-"\"work-day-tuesday\" ਆਦਿ ਨੂੰ ਵਰਤੋਂ।)"
+"ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ। ਇਸ ਦੀ ਬਜਾਏ “work-day-monday“, "
+"“work-day-tuesday“ ਆਦਿ ਨੂੰ ਵਰਤੋਂ।)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
 msgstr "ਪਿਛਲਾ ਈਵੇਲੂਸ਼ਨ ਵਰਜਨ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#| msgid ""
-#| "The most recently used version of Evolution, expressed as \"major.minor."
-#| "micro\". This is used for data and settings migration from older to newer "
-#| "versions."
 msgid ""
 "The most recently used version of Evolution, expressed as “major.minor."
 "micro”. This is used for data and settings migration from older to newer "
@@ -1057,23 +1027,19 @@ msgid "The list of disabled plugins in Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਬੰਦ ਕੀਤੀਆਂ ਪਲੱਗਇਨ ਦੀ ਸੂਚੀ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#| msgid "The window's X coordinate"
 msgid "The window’s X coordinate"
 msgstr "ਵਿੰਡੋ ਦਾ X ਧੁਰਾ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
-#| msgid "The window's Y coordinate"
 msgid "The window’s Y coordinate"
 msgstr "ਵਿੰਡੋ ਦਾ Y ਧੁਰਾ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#, fuzzy
 #| msgid "The window's width in pixels"
 msgid "The window’s width in pixels"
-msgstr "ਪਿਕਸਲ ਵਿੱਚ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ"
+msgstr "ਪਿਕਸਲਾਂ ਵਿੱਚ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#, fuzzy
 #| msgid "The window's height in pixels"
 msgid "The window’s height in pixels"
 msgstr "ਵਿੰਡੋ ਦੀ ਉਚਾਈ ਪਿਕਸਲ ਵਿੱਚ"
@@ -1083,22 +1049,18 @@ msgid "Whether the window is maximized"
 msgstr "ਕੀ ਵਿੰਡੋ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਕਰਨਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-#| msgid "Gnome Calendar's calendar import done"
 msgid "GNOME Calendar’s calendar import done"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ ਦਾ ਕੈਲੰਡਰ ਇੰਪੋਰਟ ਕਰਨਾ ਪੂਰਾ"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-#| msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgid "Whether calendar from GNOME Calendar has been imported or not"
 msgstr "ਕੀ ਗਨੋਮ ਕੈਲੰਡਰ ਤੋਂ ਕੈਲੰਡਰ ਇੰਪੋਰਟ ਕਰਨਾ ਹੈ ਜਾਂ ਨਹੀਂ"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-#| msgid "Gnome Calendar's tasks import done"
 msgid "GNOME Calendar’s tasks import done"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ ਦੀਆਂ ਟਾਸਕ ਇੰਪੋਰਟ ਕਰਨਾ ਪੂਰਾ"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-#| msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgid "Whether tasks from GNOME Calendar have been imported or not"
 msgstr "ਕੀ ਗਨੋਮ ਕੈਲੰਡਰ ਤੋਂ ਟਾਸਕ ਇੰਪੋਰਟ ਕਰਨੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ"
 
@@ -1117,26 +1079,28 @@ msgid "Default charset in which to compose messages"
 msgstr "ਸੁਨੇਹਾ ਬਣਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#, fuzzy
 #| msgid "Default charset in which to compose messages."
 msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
-msgstr "ਸੁਨੇਹਾ ਬਣਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ।"
+msgstr "ਸੁਨੇਹਾ ਬਣਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ। ਜੇ ਸੈੱਟ ਨਹੀਂ ਹੈ ਤਾਂ UTF-8 ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#, fuzzy
 #| msgid "_Show the photograph of sender in the message preview"
 msgid "Name of the editor to prefer in the message composer"
-msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
+msgstr "ਸੁਨੇਹਾ ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਤਰਜੀਹੀ ਲਈ ਐਡੀਟਰ ਦਾ ਨਾਂ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn’t correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+"ਜੇ ਨਾਂ ਨਾਲ ਸੰਬੰਧਿਤ ਕੋਈ ਜਾਣਿਆ ਐਡੀਟਰ ਨਾ ਹੋਇਆ ਤਾਂ ਬਿਲਟ-ਇਨ ਵੈੱਬਕਿੱਟ ਐਡੀਟਰ ਵਰਤਿਆ"
+" ਜਾਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Path where picture gallery should search for its content"
 msgstr "ਪਾਥ, ਜਿੱਥੇ ਤਸਵੀਰ ਗੈਲਰੀ ਇਸ ਦੀ ਸਮੱਗਰੀ ਲੱਭੇ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#| msgid ""
-#| "This value can be an empty string, which means it'll use the system "
-#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
-#| "when the set path is not pointing to the existent folder"
 msgid ""
 "This value can be an empty string, which means it’ll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -1168,12 +1132,21 @@ msgid "Automatic emoticon recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਈਮੋਸ਼ਨ ਪਛਾਣ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-#, fuzzy
 #| msgid "Recognize emoticons in text and replace them with images."
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
-msgstr "ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
+msgstr ""
+"ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਜਾਂ ਯੂਨੀਕੋਡ ਅੱਖਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#| msgid "Insert Send options"
+msgid "Unicode emoticons"
+msgstr "ਯੂਨੀਕੋਡ ਈਮੋਆਈਕਾਨ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr "ਈਮੋਆਈਕੋਨ ਲਈ ਯੂਨੀਕੋਡ ਅੱਖਰ ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Attribute message"
@@ -1218,11 +1191,6 @@ msgid "Group Reply replies to list"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#| msgid ""
-#| "Instead of the normal \"Reply to All\" behaviour, this option will make "
-#| "the 'Group Reply' toolbar button try to reply only to the mailing list "
-#| "through which you happened to receive the copy of the message to which "
-#| "you're replying."
 msgid ""
 "Instead of the normal “Reply to All” behaviour, this option will make the "
 "“Group Reply” toolbar button try to reply only to the mailing list through "
@@ -1245,8 +1213,8 @@ msgid ""
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
-"ਯੂਜ਼ਰ ਨੂੰ ਸੁਨੇਹਾ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਕਰਸਰ ਕਿੱਥੇ ਰੱਖ ਕੇ ਦੇਣੀ ਹੈ। ਇਹ ਤਹਿ ਕਰਦਾ ਹੈ"
-" ਕਿ ਕਰਸਰ ਨੂੰ ਸੁਨੇਹੇ ਦੇ "
+"ਵਰਤੋਂਕਾਰ ਨੂੰ ਸੁਨੇਹਾ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਕਰਸਰ ਕਿੱਥੇ ਰੱਖ ਕੇ ਦੇਣੀ ਹੈ। ਇਹ ਤਹਿ ਕਰਦਾ"
+" ਹੈ ਕਿ ਕਰਸਰ ਨੂੰ ਸੁਨੇਹੇ ਦੇ "
 "ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਜਾਂ ਹੇਠਾਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
@@ -1274,28 +1242,28 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#, fuzzy
 #| msgid "Spell checking languages"
 msgid "List of recently used spell checking languages"
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਭਾਸ਼ਾਵਾਂ"
+msgstr "ਤਾਜ਼ਾ ਵਰਤੀਆਂ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਭਾਸ਼ਾਵਾਂ ਦੀ ਸੂਚੀ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#, fuzzy
 #| msgid "List of dictionary language codes used for spell checking."
 msgid ""
 "List of dictionary language codes used for spell checking, which had been "
 "used recently."
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
+msgstr ""
+"ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ, ਜਿਸ ਨੂੰ ਹੁਣੇ ਵਰਤਿਆ ਗਿਆ ਹੈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#| msgid "Spell checking languages"
+msgid "How many recently used spell checking languages to remember"
+msgstr "ਕਿੰਨੀਆਂ ਤਾਜ਼ਾ ਵਰਤੀਆਂ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਭਾਸ਼ਾਵਾਂ ਯਾਦ ਰੱਖਣੀਆਂ ਹਨ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#| msgid "Show \"Bcc\" field when sending a mail message"
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "ਜਦੋਂ ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ ”Bcc” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#| msgid ""
-#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Bcc” field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -1305,14 +1273,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show “Cc” field when sending a mail message"
 msgstr "ਜਦੋਂ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ ”Cc” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#| msgid ""
-#| "Show the \"Cc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Cc” field when sending a mail message. This is controlled from the "
 "View menu when a mail account is chosen."
@@ -1322,14 +1286,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#| msgid "Show \"From\" field when sending a mail message"
 msgid "Show “From” override field when sending a mail message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ”ਵਲੋਂ” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#| msgid ""
-#| "Show the \"From\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -1339,14 +1299,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#| msgid "Show \"Reply To\" field when sending a mail message"
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ ”ਜਵਾਬ ਦਿਓ” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#| msgid ""
-#| "Show the \"Reply To\" field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -1356,14 +1312,10 @@ msgstr ""
 "ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#| msgid "Show \"From\" field when posting to a newsgroup"
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਵਿੱਚ ਭੇਜਣ ਦੌਰਾਨ ”ਵਲੋਂ” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#| msgid ""
-#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
-#| "from the View menu when a news account is chosen."
 msgid ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -1373,14 +1325,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#| msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ ”ਜਵਾਬ ਦਿਓ” ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#| msgid ""
-#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
-#| "controlled from the View menu when a news account is chosen."
 msgid ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -1421,10 +1369,25 @@ msgstr ""
 "੨੦੪੭ ਸਟੈਂਡਰਡ ਨੂੰ ਮੰਨਦੇ ਹਨ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbox folder"
 msgstr ""
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Include signature in new messages only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Put personalized signatures at the top of replies"
 msgstr "ਜਵਾਬ ਦੇ ਉੱਤੇ ਨਿੱਜੀ ਦਸਤਖਤ ਦਿਓ"
@@ -1435,7 +1398,7 @@ msgid ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"ਯੂਜ਼ਰ ਸੁਨੇਹੇ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਆਪਣੇ ਦਸਤਖਤ ਕਿੱਥੇ ਲੈ ਸਕੇਗਾ। ਇਹ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ"
+"ਵਰਤੋਂਕਾਰ ਸੁਨੇਹੇ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਆਪਣੇ ਦਸਤਖਤ ਕਿੱਥੇ ਲੈ ਸਕੇਗਾ। ਇਹ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ"
 " ਦਸਤਖਤਾਂ ਨੂੰ ਸੁਨੇਹੇ ਦੇ "
 "ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਕਿ ਹੇਠਾਂ।"
 
@@ -1453,24 +1416,21 @@ msgstr ""
 "ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#, fuzzy
 #| msgid "_Keep signature above the original message on replying"
 msgid "Keep original message signature in replies"
-msgstr "ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਦਸਤਖਤ ਅਸਲੀ ਸੁਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖੋ(_K)"
+msgstr "ਜਵਾਬਾਂ ਵਿੱੱਚ ਅਸਲੀ ਸੁਨੇਹਾ ਦਸਤਖ਼ਤ ਰੱਖੋ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"When set to TRUE, keep original message signature in replies, otherwise "
+"strip the signature and everything below it when replying to the message."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Ignore list Reply-To:"
 msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ ਦਿਓ ਅਣਡਿੱਠਾ:"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#| msgid ""
-#| "Some mailing lists set a Reply-To: header to trick users into sending "
-#| "replies to the list, even when they ask Evolution to make a private "
-#| "reply. Setting this option to TRUE will attempt to ignore such Reply-To: "
-#| "headers, so that Evolution will do as you ask it. If you use the private "
-#| "reply action, it will reply privately, while if you use the 'Reply to "
-#| "List' action it will do that. It works by comparing the Reply-To: header "
-#| "with a List-Post: header, if there is one."
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -1480,7 +1440,7 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
-"ਕੁਝ ਮੇਲਿੰਗ ਲਿਸਟਾਂ ਜਵਾਬ-ਦਿਓ(Reply-To:) ਹੈੱਡਰ ਨੂੰ ਯੂਜ਼ਰ ਨੂੰ ਜਵਾਬ ਮੇਲਿੰਗ ਲਿਸਟ"
+"ਕੁਝ ਮੇਲਿੰਗ ਲਿਸਟਾਂ ਜਵਾਬ-ਦਿਓ(Reply-To:) ਹੈੱਡਰ ਨੂੰ ਵਰਤੋਂਕਾਰ ਨੂੰ ਜਵਾਬ ਮੇਲਿੰਗ ਲਿਸਟ"
 " ਉੱਤੇ ਭੇਜਣ ਲਈ ਸੈੱਟ "
 "ਕੀਤੀਆਂ ਹੁੰਦੀਆਂ ਹਨ, ਭਾਵੇਂ ਕਿ ਉਹ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ ਦੇਣ ਲਈ ਪੁੱਛਦੀਆਂ ਹਨ।"
 " ਇਹ ਚੋਣ ਸੈੱਟ ਕਰਨ "
@@ -1493,15 +1453,10 @@ msgstr ""
 "ਹੈੱਡਰ ਨਾਲ ਤੁਲਨਾ ਕਰਕੇ ਕੰਮ ਕਰਦਾ ਹੈ, ਜੇ ਕੋਈ ਹੋਵੇ ਤਾਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#| msgid "List of localized 'Re'"
 msgid "List of localized “Re”"
 msgstr "ਲੋਕਲ ”ਜਵਾਬ(Re)” ਦੀ ਸੂਚੀ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#| msgid ""
-#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-#| "text when replying to a message, as an addition to the standard \"Re\" "
-#| "prefix. An example is 'SV,AV'."
 msgid ""
 "Comma-separated list of localized “Re” abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard “Re” prefix. "
@@ -1512,12 +1467,10 @@ msgstr ""
 "ਦੇਣਾ ਹੋਵੇ, ਮਿਆਰੀ ”ਜਵਾਬ(Re)” ਅਗੇਤਰ ਦੇ ਨਾਲ। ਉਦਾਹਰਨ ਲਈ ”SV,AV”।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#| msgid "List of localized 'Re'"
 msgid "List of localized “Re” separators"
 msgstr "ਲੋਕਲ ”ਜਵਾਬ(Re)” ਦੀ ਸੂਚੀ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#, fuzzy
 #| msgid ""
 #| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 #| "text when replying to a message, as an addition to the standard \"Re\" "
@@ -1529,23 +1482,106 @@ msgid ""
 msgstr ""
 "ਵਿਸ਼ਾ ਵਾਕ ਵਿੱਚ ਲੋਕਲ ”ਜਵਾਬ(Re)” ਦੀ ਸੂਚੀ ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕਰਕੇ ਛੱਡਣ ਲਈ, ਜਦੋਂ"
 " ਸੁਨੇਹੇ ਲਈ ਜਵਾਬ "
-"ਦੇਣਾ ਹੋਵੇ, ਮਿਆਰੀ ”ਜਵਾਬ(Re)” ਅਗੇਤਰ ਦੇ ਨਾਲ। ਉਦਾਹਰਨ ਲਈ ”U+SV,AV”।"
+"ਦੇਣਾ ਹੋਵੇ, ਮਿਆਰੀ ”:” ਅਤੇ ਯੂਨੀਕੋਡ ”:” ਵੱਖਰੇਵੇ ਦੇ ਨਾਲ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid "Use localized “Fwd”/“Re” in message Subject"
+msgstr "ਉਲੱਥਾ ਕੀਤਾ “ਅੱਗੇ ਭੇਜਿਆ”/“ਜਵਾਬ” ਨੂੰ ਸੁਨੇਹਾ ਵਿਸ਼ੇ ਵਿੱਚ ਵਰਤੋਂ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid ""
+"When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalized version."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid "Number of characters for wrapping"
+msgstr "ਸਮੇਟਣ ਲਈ ਅੱਖਰਾਂ ਦੀ ਗਿਣਤੀ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Will autowrap lines after given number of characters."
+msgstr "ਅੱਖਰਾਂ ਦੀ ਦਿੱਤੀ ਗਿਣਤੀ ਦੇ ਬਾਅਦ ਆਪਣੇ-ਆਪ ਲਾਈਨ ਸਮੇਟੀ ਜਾਵੇਗੀ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "ਕੀ ਸਾਈਨ ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ ਬਟਨ ਨੂੰ ਟੂਲਬਾਰ ਉੱਤੇ ਹਮੇਸ਼ਾ ਵਿਖਾਉਣਾ ਹੈ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid "Wrap quoted text in replies"
+msgstr "ਜਵਾਬਾਂ ਵਿੱਚ ਹਵਾਲੇ ਦਿੱਤੀ ਲਿਖਤ ਨੂੰ ਸਮੇਟੋ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "Convert UTC time in reply credits to local time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid ""
+"Whether the time in reply credits should be converted to local time when "
+"it’s in UTC in the message."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#, fuzzy
 #| msgid "Failed to mark messages as read."
 msgid "Mark replied to messages as read"
-msgstr "ਸੁਨੇਹੇ ਨੂੰ ਪੜ੍ਹਨ ਲਈ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਵਜੋਂ ਜਵਾਬ ਦਿੱਤਾ ਨਿਸ਼ਾਨ ਲਾਓ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid ""
+"When replying to a message and marking it as being replied to, then whether "
+"also mark it as read."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Whether start Plain Text composer with Preformatted paragraph mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid ""
+"When set to true, new Plain Text messages will have preselected Preformatted "
+"paragraph mode. The Normal paragraph mode will be used when set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Save file format for drag-and-drop operation"
 msgstr "ਚੱਕਣ-ਸੁੱਟਣ ਕਾਰਵਾਈ ਲਈ ਫਾਇਲ ਫਾਰਮੈਟ ਸੰਭਾਲੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#, fuzzy
 #| msgid "Can be either 'mbox' or 'pdf'."
 msgid "Can be either “mbox” or “pdf”."
-msgstr "'mbox' ਜਾਂ 'pdf' ਹੋ ਸਕਦਾ ਹੈ।"
+msgstr "“mbox“ ਜਾਂ “pdf“ ਹੋ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show image animations"
@@ -1556,7 +1592,7 @@ msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"HTML ਪੱਤਰ ਵਿੱਚ ਐਨੀਮੇਟ ਚਿੱਤਰ ਯੋਗ ਕਰੋ। ਕਈ ਯੂਜ਼ਰ ਐਨੀਮੇਟ ਚਿੱਤਰਾਂ ਨੂੰ ਪਸੰਦ ਨਹੀਂ"
+"HTML ਪੱਤਰ ਵਿੱਚ ਐਨੀਮੇਟ ਚਿੱਤਰ ਯੋਗ ਕਰੋ। ਕਈ ਵਰਤੋਂਕਾਰ ਐਨੀਮੇਟ ਚਿੱਤਰਾਂ ਨੂੰ ਪਸੰਦ ਨਹੀਂ"
 " ਕੀਤੇ ਅਤੇ ਸਥਿਰ ਚਿੱਤਰ "
 "ਹੀ ਪਸੰਦ ਕਰਦੇ ਹਨ।"
 
@@ -1591,12 +1627,10 @@ msgid "Enable to use a similar message list view settings for all folders."
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਲਈ ਰਲਦੇ ਸੁਨੇਹਾ ਲਿਸਟ ਝਲਕ ਸੈਟਿੰਗ ਵਰਤਣ ਲਈ ਚਾਲੂ ਕਰੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#| msgid "Mark citations in the message \"Preview\""
 msgid "Mark citations in the message “Preview”"
 msgstr "ਸੁਨੇਹਾ ”ਝਲਕ” ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#| msgid "Mark citations in the message \"Preview\"."
 msgid "Mark citations in the message “Preview”."
 msgstr "ਸੁਨੇਹਾ ”ਝਲਕ” ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ।"
 
@@ -1628,6 +1662,19 @@ msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱ
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "HTML ਸੁਨੇਹੇ ਲਈ HTTP ਤੋਂ ਚਿੱਤਰ ਆਪਣੇ-ਆਪ ਲੋਡ ਕਰੋ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Show notification about missing remote content"
+msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show Animations"
 msgstr "ਐਨੀਮੇਸ਼ਨ ਵੇਖੋ"
@@ -1674,6 +1721,12 @@ msgstr "ਸੁਨੇਹਾ ਪੜ੍ਹਨ ਪੈਂਨ ਵਿੱਚ ਭੇਜ
 msgid "Search gravatar.com for photo of the sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#, fuzzy
+#| msgid "Show photo of the sender"
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Mark as Seen after specified timeout"
 msgstr "ਦਿੱਤੇ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਬਣਾਓ"
@@ -1688,6 +1741,12 @@ msgstr "ਦਿੱਤੇ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਬਣਾ ਦ
 msgid "Mark as Seen always after specified timeout"
 msgstr "ਦਿੱਤੇ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਬਣਾਓ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Timeout for marking messages as seen"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ"
@@ -1702,6 +1761,14 @@ msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-
 msgid "Show Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Sender email-address column in the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਸੁਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
@@ -1749,16 +1816,13 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫੋਲਡਰ ਝਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#| msgid ""
-#| "This key is read only once and reset to \"false\" after read. This "
-#| "unselects the mail in the list and removes the preview for that folder."
 msgid ""
 "This key is read only once and reset to “false” after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
 "ਇਹ ਕੀ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੈ ਅਤੇ ਪੜ੍ਹਨ ਬਾਅਦ ”ਗਲਤ” ਲਈ ਰੀ-ਸੈੱਟ ਕੀਤਾ ਹੈ। ਸੂਚੀ ਵਿੱਚਇਹ"
-" ਮੇਲ ਅਣ-"
-"ਚੁਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
+" ਮੇਲ ਅਣ-ਚੁਣੀ "
+"ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Height of the message-list pane"
@@ -1770,7 +1834,7 @@ msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether message headers are collapsed in the user interface"
-msgstr "ਕੀ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਵਿੱਚ ਸੁਨੇਹਾ ਹੈੱਡਰ ਨੂੰ ਸਮੇਟਣਾ ਹੈ"
+msgstr "ਕੀ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਵਿੱਚ ਸੁਨੇਹਾ ਹੈੱਡਰ ਨੂੰ ਸਮੇਟਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Width of the message-list pane"
@@ -1785,7 +1849,6 @@ msgid "Layout style"
 msgstr "ਲੇਆਉਟ ਸਟਾਈਲ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#, fuzzy
 #| msgid ""
 #| "The layout style determines where to place the preview pane in relation "
 #| "to the message list. \"0\" (Classic View) places the preview pane below "
@@ -1798,8 +1861,8 @@ msgid ""
 "message list."
 msgstr ""
 "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਸੁਨੇਹਾ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
-"\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ"
-" ਝਲਕ) ਝਲਕ "
+"“0“ (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। “1“ (ਵਰਟੀਕਲ ਝਲਕ)"
+" ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
@@ -1842,7 +1905,6 @@ msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਸਿਰਨਾਵੀਆਂ ਦੀ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#, fuzzy
 #| msgid ""
 #| "This sets the number of addresses to show in default message list view, "
 #| "beyond which a '...' is shown."
@@ -1851,8 +1913,22 @@ msgid ""
 "beyond which a “...” is shown."
 msgstr ""
 "ਇਹ ਡਿਫਾਲਟ ਸੁਨੇਹਾ ਸੂਚੀ ਝਲਕ ਵਿੱਚ ਐਡਰੈੱਸਾਂ ਦੀ ਗਿਣਤੀ ਸੈੱਟ ਕਰਦੀ ਹੈ, ਜਿਸ ਤੋਂ ਬਾਅਦ"
-" ਇੱਕ '...' "
-"ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+" ਇੱਕ "
+"“...“ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show mails in headers part of the message preview when name is available"
+msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid ""
+"When set to false, the mail addresses which contain both the name and the "
+"email parts in headers like To/Cc/Bcc will be shown only with the name part, "
+"without the actual email, with the name made clickable."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Thread the message-list based on Subject"
@@ -1885,7 +1961,6 @@ msgid "Whether sort threads based on latest message in that thread"
 msgstr "ਕੀ ਮਾਮਲੇ ਨੂੰ ਉਸ ਮਾਮਲੇ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਾ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on "
 #| "latest message in each thread, rather than by message's date. Evolution "
@@ -1899,8 +1974,11 @@ msgstr ""
 " ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, "
 "ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on "
 #| "latest message in each thread, rather than by message's date. Evolution "
@@ -1909,9 +1987,9 @@ msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
 msgstr ""
-"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਥਰਿੱਡਾਂ ਨੂੰ ਹਰੇਕ ਥਰਿੱਡ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਿਆਂ ਮੁਤਾਬਕ"
-" ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, "
-"ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
+"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਅਧੀਨ ਥਰਿੱਡਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਵਧਦੇ ਕ੍ਰਮ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ"
+" ਜਾਵੇ, "
+"ਨਾ ਕਿ ਥਰਿੱਡ ਰੂਟ ਪੱਧਰ ਵਿੱਚ ਦਿੱਤੇ ਲੜੀਬੱਧ ਕ੍ਰਮ ਵਰਤ ਕੇ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Sort accounts alphabetically in a folder tree"
@@ -1928,7 +2006,7 @@ msgstr ""
 " ਸੈੱਟ ਕੀਤਾ ਤਾਂ ਅਕਾਊਂਟ "
 "ਨੂੰ ਵਰਤਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਅਤੇ ਖੋਜ ਫੋਲਡਰ ਨੂੰ"
 " ਛੱਡ ਕੇ, ਨਹੀਂ ਤਾਂ "
-"ਅਕਾਊਂਟ ਨੂੰ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
+"ਅਕਾਊਂਟ ਨੂੰ ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Log filter actions"
@@ -1942,12 +2020,17 @@ msgstr "ਦਿੱਤੀ ਲਾਗ ਫਾਇਲ ਲਈ ਲਾਗ ਫਿਲਟਰ
 msgid "Logfile to log filter actions"
 msgstr "ਲਾਗ ਫਿਲਟਰ ਐਕਸ਼ਨਾਂ ਲਈ ਲਾਗ-ਫਾਇਲ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Flush Outbox after filtering"
 msgstr "ਫਿਲਟਰ ਕਰਨ ਦੇ ਬਾਅਦ ਆਉਟਬਾਕਸ ਸਾਫ਼ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#, fuzzy
 #| msgid ""
 #| "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 #| "only when there was used any 'Forward to' filter action and approximately "
@@ -1959,7 +2042,7 @@ msgid ""
 msgstr ""
 "ਫਿਲਟਰ ਕਰਨ ਦੇ ਬਾਅਦ ਕੀ ਆਉਟਬਾਕਸ ਨੂੰ ਸਾਫ਼ ਕਰਨਾ ਹੈ। ਆਉਟਬਾਕਸ ਸਾਫ਼ ਕਰਨਾ ਤਾਂ ਹੀ"
 " ਵਾਪਰਦਾ ਹੈ, "
-"ਜਦੋਂ ਕੋਈ 'ਅੱਗੇ ਭੇਜੋ' ਫਿਲਟਰ ਕਾਰਵਾਈ ਕੀਤੀ ਹੋਵੇ ਤੇ ਆਖਰੀ ਕਾਰਵਾਈ ਦੇ ਲਗਭਗ ਇੱਕ ਮਿੰਟ"
+"ਜਦੋਂ ਕੋਈ “ਅੱਗੇ ਭੇਜੋ“ ਫਿਲਟਰ ਕਾਰਵਾਈ ਕੀਤੀ ਹੋਵੇ ਤੇ ਆਖਰੀ ਕਾਰਵਾਈ ਦੇ ਲਗਭਗ ਇੱਕ ਮਿੰਟ"
 " ਬਾਅਦ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
@@ -1970,6 +2053,18 @@ msgstr "ਡਿਫਾਲਟ ਅੱਗੇ ਭੇਜਣ ਦੀ ਸਟਾਇਲ"
 msgid "Default reply style"
 msgstr "ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Forward and reply attribution language tag, like en_US. Empty string means "
+"to use the same language as the user interface."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#, fuzzy
+#| msgid "Sending a message with an _empty subject line"
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸੁਨੇਹਾ ਭੇਜਣ(_e)"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #, fuzzy
 #| msgid ""
@@ -1977,7 +2072,7 @@ msgstr "ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt on empty subject"
@@ -1986,7 +2081,7 @@ msgstr "ਖਾਲੀ ਵਿਸ਼ੇ ਤੇ ਪੁੱਛੋ"
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when emptying the trash"
@@ -1994,27 +2089,26 @@ msgstr "ਜਦੋਂ ਰੱਦੀ ਖਾਲੀ ਕਰਨੀ ਹੋਵੇ ਤਾ
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Prompt the user when he or she tries to empty the trash."
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਰੱਦੀ ਨੂੰ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇ ਤਾਂ ਉਸ ਨੂੰ ਪੁੱਛੋ।"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਰੱਦੀ ਨੂੰ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇ ਤਾਂ ਉਸ ਨੂੰ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when user expunges"
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when user calls Empty Junk"
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕਰਦਾ ਹੈ ਤਾਂ ਪੁੱਛੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
+msgstr ""
+"ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਜੰਕ ਫ਼ੋਲਡਰ ਨੂੰ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦਾ ਹੈ ਤਾਂ ਉਸ ਨੂੰ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt before sending to recipients not entered as mail addresses"
@@ -2036,32 +2130,33 @@ msgstr "ਜੇਕਰ ਸਿਰਫ Bcc ਖੇਤਰ ਹੀ ਭਰਿਆ ਹੋਵ
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
-"ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ Cc ਪ੍ਰਾਪਤਕਰਤਾ ਦੇ ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ।"
+"ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ Cc ਪ੍ਰਾਪਤਕਰਤਾ ਦੇ ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ"
+" ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸੁਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਹੀ"
-" ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਜਦੋਂ ਵਰਤੋਂਕਾਰ HTML ਸੁਨੇਹੇ, ਉਹਨਾਂ ਵਰਤੋਂਕਾਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ"
+" ਪ੍ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ "
 "ਹਨ, ਤਾਂ ਪੁੱਛੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ ੧੦ ਸੁਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
+msgstr "ਜਦੋਂ ਵਰਤੋਂਕਾਰ ਇੱਕੋ ਸਮੇਂ ੧੦ ਸੁਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
-"ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ ੧੦ ਜਾਂ ਵਧੇਰੇ ਸੁਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ"
-" ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ "
+"ਜੇਕਰ ਵਰਤੋਂਕਾਰ ਨੇ ੧੦ ਜਾਂ ਵਧੇਰੇ ਸੁਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ,"
+" ਵਰਤੋਂਕਾਰ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ "
 "ਚਾਹੁੰਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
@@ -2093,7 +2188,6 @@ msgstr ""
 "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਚੁੱਕਣ ਤੇ ਸੁੱਟਣ ਰਾਹੀਂ ਫੋਲਡਰ ਨੂੰ ਕਾਪੀ ਕਰਨ ਬਾਰੇ ਪੁੱਛਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#, fuzzy
 #| msgid ""
 #| "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 #| "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -2105,18 +2199,17 @@ msgid ""
 "folders in folder tree without asking, or “ask” — (or any other value) will "
 "ask user."
 msgstr ""
-"ਸੰਭਵ ਮੁੱਲ ਹਨ: 'never (ਕਦੇ ਨਹੀਂ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਕਾਪੀ ਨਾ"
+"ਸੰਭਵ ਮੁੱਲ ਹਨ: “never (ਕਦੇ ਨਹੀਂ)“ - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਕਾਪੀ ਨਾ"
 " ਕਰਨ ਦੇਣ ਲਈ, "
-"'always (ਹਮੇਸ਼ਾ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਕਾਪੀ ਕਰਨ"
+"“always (ਹਮੇਸ਼ਾ)“ - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਕਾਪੀ ਕਰਨ"
 " ਦੇਣ ਲਈ, ਜਾਂ "
-"'ask (ਪੁੱਛੋ)'  - (ਜਾਂ ਕੋਈ ਹੋਰ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
+"“ask (ਪੁੱਛੋ)“  - (ਜਾਂ ਕੋਈ ਹੋਰ ਮੁੱਲ) ਵਰਤੋਂਕਾਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਚੁੱਕਣ ਤੇ ਸੁੱਟਣ ਰਾਹੀਂ ਫੋਲਡਰ ਨੂੰ ਭੇਜਣ ਬਾਰੇ ਪੁੱਛਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#, fuzzy
 #| msgid ""
 #| "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 #| "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -2128,11 +2221,11 @@ msgid ""
 "folders in folder tree without asking, or “ask” — (or any other value) will "
 "ask user."
 msgstr ""
-"ਸੰਭਵ ਮੁੱਲ ਹਨ: 'never (ਕਦੇ ਨਹੀਂ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਭੇਜਣ ਦੇਣ"
-" ਲਈ, 'always "
-"(ਹਮੇਸ਼ਾ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਭੇਜਣ ਲਈ, ਜਾਂ 'ask"
-" (ਪੁੱਛੋ)'  - (ਜਾਂ "
-"ਕੋਈ ਹੋਰ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
+"ਸੰਭਵ ਮੁੱਲ ਹਨ: “never (ਕਦੇ ਨਹੀਂ)“ — ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਭੇਜਣ ਦੇਣ"
+" ਲਈ, “always "
+"(ਹਮੇਸ਼ਾ)“ — ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਭੇਜਣ ਲਈ, ਜਾਂ “ask"
+" (ਪੁੱਛੋ)“  — (ਜਾਂ "
+"ਕੋਈ ਹੋਰ ਮੁੱਲ) ਵਰਤੋਂਕਾਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Prompt when replying privately to list messages"
@@ -2174,6 +2267,19 @@ msgid ""
 msgstr ""
 "ਲਗਾਤਾਰ ਪੁੱਛਣਾ ਚਾਲੂ /ਬੰਦ ਕਰਦਾ ਹੈ, ਜਦੋਂ ਤੁਸੀਂ ਕਈ ਲੋਕਾਂ ਨੂੰ ਜਵਾਬ ਭੇਜ ਰਹੇ ਹੋ।"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
+msgid ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+msgstr ""
+"ਇਸ ਨਾਲ ਲਗਾਤਾਰ ਪੁੱਛਣ ਨੂੰ ਰੋਕਿਆ ਜਾਂ ਚਾਲੂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਦੋਂ ਤੁਸੀਂ ਬਿਨਾਂ ਈਮੇਲ"
+" ਐਡਰੈੱਸ ਦਿੱਤੇ ਹੋਏ "
+"ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ।"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 #, fuzzy
 #| msgid ""
@@ -2193,6 +2299,12 @@ msgstr ""
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਕਈ ਪ੍ਰਾਪਤ-ਕਰਤਾਵਾਂ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"“composer-many-to-cc-recips-num” defines the threshold."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
@@ -2236,23 +2348,21 @@ msgid "Level beyond which the message should be logged."
 msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
-#, fuzzy
 #| msgid ""
 #| "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 #| "debug messages."
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
-msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ 0। ਚੇਤਾਵਨੀ ਲਈ 1। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ 2।"
+msgstr ""
+"ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ “0“। ਚੇਤਾਵਨੀ ਲਈ “1“। ਡੀਬੱਗ ਸੁਨੇਹਿਆਂ ਲਈ “2“।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
-#, fuzzy
 #| msgid "Show original \"Date\" header value."
 msgid "Show original “Date” header value."
-msgstr "ਅਸਲੀ \"ਮਿਤੀ\" ਹੈੱਡਰ ਮੁੱਲ ਵੇਖੋ।"
+msgstr "ਅਸਲੀ “ਮਿਤੀ“ ਹੈੱਡਰ ਮੁੱਲ ਵੇਖੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-#, fuzzy
 #| msgid ""
 #| "Show the original \"Date\" header (with a local time only if the time "
 #| "zone differs). Otherwise always show \"Date\" header value in a user "
@@ -2262,9 +2372,9 @@ msgid ""
 "differs). Otherwise always show “Date” header value in a user preferred "
 "format and local time zone."
 msgstr ""
-"ਅਸਲੀ \"ਮਿਤੀ\" ਹੈੱਡਰ ਵੇਖੋ (ਲੋਕਲ ਸਮੇਂ ਨਾਲ, ਜੇ ਸਮਾਂ ਖੇਤਰ ਵੱਖਰਾ ਹੋਵੇ)। ਨਹੀਂ ਤਾਂ"
-" ਹਮੇਸ਼ਾ \"ਮਿਤੀ\" "
-"ਹੈੱਡਰ ਮੁੱਲ ਯੂਜ਼ਰ ਵਲੋਂ ਦੱਸੇ ਫਾਰਮੈਟ ਨਾਲ ਅਤੇ ਲੋਕਲ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ।"
+"ਅਸਲੀ “ਮਿਤੀ“ ਹੈੱਡਰ ਵੇਖੋ (ਲੋਕਲ ਸਮੇਂ ਨਾਲ, ਜੇ ਸਮਾਂ ਖੇਤਰ ਵੱਖਰਾ ਹੋਵੇ)। ਨਹੀਂ ਤਾਂ"
+" ਹਮੇਸ਼ਾ “ਮਿਤੀ“ "
+"ਹੈੱਡਰ ਮੁੱਲ ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਦੱਸੇ ਫਾਰਮੈਟ ਨਾਲ ਅਤੇ ਲੋਕਲ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "List of Labels and their associated colors"
@@ -2317,7 +2427,6 @@ msgid "The default plugin for Junk hook"
 msgstr "ਜੰਕ ਹੁੱਕ ਲਈ ਡਿਫਾਲਟ ਪਲੱਗਇਨ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
-#, fuzzy
 #| msgid ""
 #| "This is the default junk plugin, even though there are multiple plugins "
 #| "enabled. If the default listed plugin is disabled, then it won't fall "
@@ -2327,16 +2436,14 @@ msgid ""
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
 "to the other available plugins."
 msgstr ""
-"ਇਹ ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ ਹੈ, ਭਾਵੇਂ ਕਿ ਕਈ ਪਲੱਗਇਨ ਯੋਗ ਹਨ। ਜੇ ਡਿਫਾਲਟ ਦਿੱਤੀ ਪਲੱਗਇਨ"
-" ਆਯੋਗ ਹੈ ਤਾਂ ਇਹ "
-"ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
+"ਇਹ ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ ਹੈ, ਭਾਵੇਂ ਕਿ ਕਈ ਪਲੱਗਇਨ ਯੋਗ ਹਨ। ਜੇ ਡਿਫਾਲਟ ਦਿੱਤੀ ਪਲੱਗਇਨ "
+"ਅਸਮਰੱਥ ਹੈ ਤਾਂ ਇਹ ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ਦੱਸੋ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲਾ ਈਮੇਲ ਐਡਰੈੱਸ-ਬੁੱਕ 'ਚ ਖੋਜਿਆ ਜਾਵੇ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
-#, fuzzy
 #| msgid ""
 #| "Determines whether to lookup the sender email in address book. If found, "
 #| "it shouldn't be a spam. It looks up in the books marked for "
@@ -2390,7 +2497,6 @@ msgid "Custom headers to use while checking for junk."
 msgstr "ਜੰਕ ਵਾਸਤੇ ਚੈੱਕ ਕਰਨ ਵਾਸਤੇ ਕਸਟਮ ਹੈੱਡਰ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
-#, fuzzy
 #| msgid ""
 #| "Custom headers to use while checking for junk. The list elements are "
 #| "string in the format \"headername=value\"."
@@ -2399,7 +2505,7 @@ msgid ""
 "in the format “headername=value”."
 msgstr ""
 "ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਦੇ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਪਸੰਦੀਦਾ ਹੈੱਡਰ। ਸੂਚੀ ਇਕਾਈਆਂ"
-" \"headername=value\" "
+" “headername=value“ "
 "ਫਾਰਮੈਟ ਦੀ ਲਾਈਨ ਦੇ ਰੂਪ 'ਚ ਹਨ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
@@ -2440,7 +2546,6 @@ msgid "Check for new messages in all active accounts"
 msgstr "ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
-#, fuzzy
 #| msgid ""
 #| "Whether to check for new messages in all active accounts regardless of "
 #| "the account \"Check for new messages every X minutes\" option when "
@@ -2452,9 +2557,9 @@ msgid ""
 "started. This option is used only together with “send_recv_on_start” option."
 msgstr ""
 "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਜਾਂਚ ਕਰਨੀ"
-" ਹੈ, \"ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ "
-"ਹਰੇਕ X ਮਿੰਟ ਬਾਅਦ ਚੈੱਕ ਕਰੋ\" ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋਏ। ਇਹ ਚੋਣ ਨੂੰ ਕੇਵਲ"
-" 'send_recv_on_start' ਚੋਣ "
+" ਹੈ, “ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ "
+"ਹਰੇਕ X ਮਿੰਟ ਬਾਅਦ ਚੈੱਕ ਕਰੋ“ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋਏ। ਇਹ ਚੋਣ ਨੂੰ ਕੇਵਲ"
+" “send_recv_on_start“ ਚੋਣ "
 "ਨਾਲ ਜੋੜ ਕੇ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
@@ -2466,8 +2571,8 @@ msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
-"ਕੰਟਰੋਲ, ਕਿਸ ਤੇਜ਼ੀ ਨਾਲ ਸਥਾਨਕ ਬਦਲਾਅ ਰਿਮੋਟ ਮੇਲ ਸਰਵਰ ਨਾਲ ਸਮਕਾਲੀ ਕੀਤੇ ਜਾਣ।"
-" ਅੰਤਰਾਲਘੱਟੋ-ਘੱਟ 30 "
+"ਕੰਟਰੋਲ, ਕਿਸ ਤੇਜ਼ੀ ਨਾਲ ਲੋਕਲ ਬਦਲਾਅ ਰਿਮੋਟ ਮੇਲ ਸਰਵਰ ਨਾਲ ਸਮਕਾਲੀ ਕੀਤੇ ਜਾਣ। ਅੰਤਰਾਲ"
+" ਘੱਟੋ-ਘੱਟ 30 "
 "ਸਕਿੰਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
@@ -2476,10 +2581,36 @@ msgstr ""
 msgid "Allow expunge in virtual folders"
 msgstr "ਫੋਲਡਰ ਦੇ ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰੋ(_w)"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../src/mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
-#, fuzzy
 #| msgid "Whether to show local folders (On This Computer) in a folder tree."
 msgid "An Archive folder for On This Computer folders."
+msgstr "ਇਸ ਕੰਪਿਊਟਰ ਫੋਲਡਰ ਉੱਤੇ ਅਕਾਇਵ ਫੋਲਡਰ ਲਈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#, fuzzy
+#| msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
 msgstr "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਲੋਕਲ ਫੋਲਡਰ ਵੇਖਾਉਣਾ (ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ) ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
@@ -2512,6 +2643,18 @@ msgstr "ਮੁੱਖ ਵਿੰਡੋ ਲਈ ਮੂਲ Y ਧੁਰਾ ਹੈ।"
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "ਕੀ ਸ਼ੈੱਲ ਵਿੰਡੋ ਦਾ ਟੂਲ ਬਾਰ ਵੇਖਾਈ ਦੇਵੇ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window."
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window"
+msgid "Width of the To Do bar in a sub-window"
+msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 #, fuzzy
 #| msgid "Default width of the mail browser window."
@@ -2524,18 +2667,69 @@ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲ
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 #, fuzzy
 #| msgid "Show the status bar"
 msgid "Show start up wizard"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#, fuzzy
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 #, fuzzy
 #| msgid "Whether to group messages by threads"
 msgid "Whether go to the previous message after message deletion"
 msgstr "ਕੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਾਮਲੇ ਰਾਹੀਂ ਗਰੁੱਪ ਕਰਨਾ ਹੈ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+msgid ""
+"If set to true, goes to the previous message when the selected is deleted; "
+"or to the next message, when it’s set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+msgid "Show Subject above Sender in Messages column"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+msgid "Visually wrap long lines in composer"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../src/composer/e-composer-actions.c:542
+msgid ""
+"Whether to visually wrap long lines of text to avoid horizontal scrolling"
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 #, fuzzy
 #| msgid "Default reply style"
@@ -2543,10 +2737,9 @@ msgid "Alternative reply style"
 msgstr "ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
-#, fuzzy
 #| msgid "For_mat messages in HTML"
 msgid "Format message in HTML"
-msgstr "HT_ML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
+msgstr "HTML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 #, fuzzy
@@ -2554,6 +2747,36 @@ msgstr "HT_ML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "ਜਵਾਬਾਂ ਦੇ ਹੇਠਾਂ ਕਰਸਰ ਰੱਖੋ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+msgid ""
+"This determines whether the cursor is placed at the top of the message or "
+"the bottom when using Alternative Reply."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+msgid "Apply chosen template when using Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+msgid "Last chosen template’s folder URI for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+msgid "Last chosen template’s message UID for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+msgid ""
+"Whether preserve original message subject when applying template for "
+"Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+msgid ""
+"Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
+"“false”, then Normal paragraph style will be used."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 #, fuzzy
 #| msgid "The server did not allow the selected message to be retracted."
@@ -2562,18 +2785,65 @@ msgid ""
 "marked as Junk."
 msgstr "ਸਰਵਰ ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਪਿੱਛਾ-ਖੋਜ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+msgid ""
+"Collapse archive folders in Move/Copy message to Folder and Go to Folder "
+"selectors."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+msgid ""
+"Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
+"messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+msgid ""
+"The “off” value completely disables certificate lookup; the “autocompleted” "
+"value provides certificates only for auto-completed contacts; the “books” "
+"value uses certificates from auto-completed contacts and searches in books "
+"marked for auto-completion."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 #, fuzzy
 #| msgid "Failed to download messages for offline viewing."
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "ਆਫਲਾਈਨ ਵੇਖਣ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+msgid ""
+"If enabled, whenever Send/Receive is run it also runs synchronization of "
+"messages for offline use. The option is disabled by default."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Whether display delivery notification parts inline."
+msgstr "ਕੇਵਲ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਰੀਮਾਈਂਡਰ ਵੇਖੋ(_n)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, the message/delivery-status and message/disposition-notification "
+"parts are shown automatically inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+msgid "Whether unset colors provided in HTML mails."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+msgid ""
+"If enabled, unset colors in HTML messages, forcing use of desktop theme "
+"colors instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "(Deprecated) Default forward style"
 msgstr "(ਬਰਤਰਫ਼) ਡਿਫਾਲਟ ਅੱਗੇ ਭੇਜਣ ਦੀ ਸਟਾਇਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 #| msgid ""
 #| "This key was deprecated in version 3.10 and should no longer be used. Use "
 #| "\"forward-style-name\" instead."
@@ -2583,14 +2853,13 @@ msgid ""
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"
 " ਇਸ ਦੀ "
-"ਬਜਾਏ \"forward-style-name\" ਵਰਤੋਂ।"
+"ਬਜਾਏ “forward-style-name“ ਵਰਤੋਂ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "(Deprecated) Default reply style"
 msgstr "(ਬਰਤਰਫ਼) ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 #| msgid ""
 #| "This key was deprecated in version 3.10 and should no longer be used. Use "
 #| "\"reply-style-name\" instead."
@@ -2600,14 +2869,13 @@ msgid ""
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"
 " ਇਸ ਦੀ "
-"ਬਜਾਏ \"reply-style-name\" ਵਰਤੋਂ।"
+"ਬਜਾਏ “reply-style-name“ ਵਰਤੋਂ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(ਬਰਤਰਫ਼) ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਸੂਚੀ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 #| msgid ""
 #| "This key was deprecated in version 3.10 and should no longer be used. Use "
 #| "\"show-headers\" instead."
@@ -2617,14 +2885,13 @@ msgid ""
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"
 " ਇਸ ਦੀ "
-"ਬਜਾਏ \"show-headers\" ਵਰਤੋਂ।"
+"ਬਜਾਏ “show-headers“ ਵਰਤੋਂ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(ਬਰਤਰਫ਼) HTML ਸੁਨੇਹੇ ਲਈ HTTP ਤੋਂ ਚਿੱਤਰ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 #| msgid ""
 #| "This key was deprecated in version 3.10 and should no longer be used. Use "
 #| "\"image-loading-policy\" instead."
@@ -2634,19 +2901,18 @@ msgid ""
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"
 " ਇਸ ਦੀ "
-"ਬਜਾਏ \"image-loading-policy\" ਵਰਤੋਂ।"
+"ਬਜਾਏ “image-loading-policy“ ਵਰਤੋਂ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr ""
-"(ਬਰਤਰਫ਼) ਜਦੋਂ ਵਿੰਡੋ ਵਿੱਚ ਯੂਜ਼ਰ ਵਲੋਂ ਅੱਗੇ ਭੇਜਿਆ ਜਾਂ ਜਵਾਬ ਦਿੱਤਾ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾ"
-" ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ "
+"(ਬਰਤਰਫ਼) ਜਦੋਂ ਵਿੰਡੋ ਵਿੱਚ ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਅੱਗੇ ਭੇਜਿਆ ਜਾਂ ਜਵਾਬ ਦਿੱਤਾ ਸੁਨੇਹਾ ਵੇਖਾਇਆ"
+" ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ "
 "ਵਿੰਡੋ ਨੂੰ ਬੰਦ ਕਰਨ ਸਮੇਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 #| msgid ""
 #| "This key was deprecated in version 3.10 and should no longer be used. Use "
 #| "\"browser-close-on-reply-policy\" instead."
@@ -2656,7 +2922,7 @@ msgid ""
 msgstr ""
 "ਇਹ ਕੁੰਜੀ ਨੂੰ ਵਰਜਨ 3.10 ਵਿੱਚ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"
 " ਇਸ ਦੀ "
-"ਬਜਾਏ \"browser-close-on-reply-policy\" ਵਰਤੋਂ।"
+"ਬਜਾਏ “browser-close-on-reply-policy“ ਵਰਤੋਂ।"
 
 #. Translators: This is a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
@@ -2700,12 +2966,19 @@ msgid "Enable autocontacts"
 msgstr "ਆਪਣੇ-ਆਪ-ਸੰਪਰਕ ਚਾਲੂ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-#, fuzzy
 #| msgid ""
 #| "Whether contacts should be automatically added to the user's address book."
 msgid ""
 "Whether contacts should be automatically added to the user’s address book."
-msgstr "ਕੀ ਸੰਪਰਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਯੂਜ਼ਰ ਦੀ ਐਡਰੈਸ-ਬੁੱਕ ਵਿੱਚ ਜੋੜਨਾ ਹੈ"
+msgstr "ਕੀ ਸੰਪਰਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਵਰਤੋਂਕਾਰ ਦੀ ਐਡਰੈਸ-ਬੁੱਕ ਵਿੱਚ ਜੋੜਨਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Whether to set “File under” field as “First Last”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Set File under as “First Last”, instead of “Last, First”."
+msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin address book source"
@@ -2746,7 +3019,6 @@ msgid "List of Custom Headers"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#, fuzzy
 #| msgid ""
 #| "The key specifies the list of custom headers that you can add to an "
 #| "outgoing message. The format for specifying a Header and Header value is: "
@@ -2759,8 +3031,8 @@ msgid ""
 msgstr ""
 "ਕੁੰਜੀ ਕਸਟਮ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਬਾਹਰ ਭੇਜ ਰਹੇ ਸੁਨੇਹਿਆਂ ਵਿੱਚ"
 " ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ। "
-"ਇੱਕ ਹੈੱਡਰ ਜਾਂ ਹੈੱਡਰ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ: \"=\" ਦੇ ਬਾਅਦ ਕਸਟਮ ਹੈੱਡਰ ਦਾ ਨਾਂ ਅਤੇ"
-" ਮੁੱਲ \";\" ਨਾਲ ਵੱਖ।"
+"ਇੱਕ ਹੈੱਡਰ ਜਾਂ ਹੈੱਡਰ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ: “=“ ਦੇ ਬਾਅਦ ਕਸਟਮ ਹੈੱਡਰ ਦਾ ਨਾਂ ਅਤੇ"
+" ਮੁੱਲ “;“ ਨਾਲ ਵੱਖ।"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
 msgid "Default External Editor"
@@ -2799,6 +3071,15 @@ msgstr "ਕਾਰਵਾਈ ਕੀਤੇ ਹਟਾਓ"
 msgid "Whether to delete processed iTip objects"
 msgstr "ਕੀ ਕਾਰਵਾਈ ਕੀਤੇ iTip ਆਬਜੈਕਟ ਹਟਾਉਣੇ ਹਨ"
 
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+#| msgid "_Preserve my reminder"
+msgid "Preserve existing reminder by default"
+msgstr "ਮੌਜੂਦਾ ਰਿਮਾਈਂਡਰ ਡਿਟਾਲਟ ਹੀ ਰੱਖੋ"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਆਏ ਸੁਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ।"
@@ -2836,7 +3117,6 @@ msgid "Enable audible notifications when new messages arrive."
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਸੁਣਨਯੋਗ ਸੂਚਨਾ ਚਾਲੂ ਕਰਨੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#, fuzzy
 #| msgid ""
 #| "Whether to make a sound of any kind when new messages arrive. If \"false"
 #| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
@@ -2846,10 +3126,10 @@ msgid ""
 "the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
 "“notify-sound-use-theme” keys are disregarded."
 msgstr ""
-"ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ ਤਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੀ ਆਵਾਜ਼ ਦਿਉ। ਜੇ \"false\" ਹੈ ਤਾਂ"
-" \"notify-sound-"
-"beep\", \"notify-sound-file\", \"notify-sound-play-file\" ਅਤੇ \"notify-sound-"
-"use-theme\" ਕੁੰਜੀਆਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
+"ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ ਤਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੀ ਆਵਾਜ਼ ਦਿਉ। ਜੇ “false“ ਹੈ ਤਾਂ"
+" “notify-sound-"
+"beep“, “notify-sound-file“, “notify-sound-play-file“ ਅਤੇ “notify-sound-"
+"use-theme“ ਕੁੰਜੀਆਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
@@ -2864,7 +3144,6 @@ msgid "Sound filename to be played."
 msgstr "ਚਲਾਉਣ ਲਈ ਸਾਊਂਡ ਫਾਇਲ-ਨਾਂ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#, fuzzy
 #| msgid ""
 #| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
 #| "file\" is \"true\"."
@@ -2872,8 +3151,8 @@ msgid ""
 "Sound file to be played when new messages arrive, if “notify-sound-play-"
 "file” is “true”."
 msgstr ""
-"ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਫਾਇਲ ਚਲਾਈ ਜਾਵੇਗੀ, ਜੇ \"notify-sound-play-file\" "
-" \"true\" "
+"ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਫਾਇਲ ਚਲਾਈ ਜਾਵੇਗੀ, ਜੇ “notify-sound-play-file“ "
+" “true“ "
 "ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
@@ -2881,7 +3160,6 @@ msgid "Whether to play a sound file."
 msgstr "ਕੀ ਆਵਾਜ਼ ਫਾਇਲ ਚਲਾਉਣੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#, fuzzy
 #| msgid ""
 #| "Whether to play a sound file when new messages arrive. The name of the "
 #| "sound file is given by the 'notify-sound-file' key."
@@ -2890,7 +3168,7 @@ msgid ""
 "file is given by the “notify-sound-file” key."
 msgstr ""
 "ਕੀ ਸਾਊਂਡ ਫਾਇਲ ਚਲਾਉਣੀ ਹੈ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ। ਸਾਊਂਡ ਫਾਇਲ ਦਾ ਨਾਂ"
-" 'notify-sound-file' "
+" “notify-sound-file“ "
 "ਕੁੰਜੀ ਰਾਹੀਂ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
@@ -2903,10 +3181,16 @@ msgstr ""
 "ਜੇ ਬੀਪ ਮੋਡ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਚਲਾਉਣ ਉੱਤੇ ਥੀਮ ਸਾਊਂਡ ਫਾਇਲ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:19
-#, fuzzy
 #| msgid "Edit properties of this account"
 msgid "Do not notify for these accounts"
-msgstr "ਇਸ ਅਕਾਊਂਟ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਬਦਲੋ"
+msgstr "ਇਹ ਅਕਾਊਂਟਾਂ ਲਈ ਸੂਚਨਾ ਨਾ ਦਿਓ"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:20
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid ""
+"Contains UIDs of accounts for which the notifications should be avoided."
+msgstr "ਰੀਮਾਈਂਡਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -2924,10 +3208,11 @@ msgid ""
 "“prefer_source” makes it use the text part, if present, otherwise shows HTML "
 "source, and “only_plain” forces Evolution to only show plain text"
 msgstr ""
-"ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਮੋਡ। \"normal(ਸਧਾਰਨ)\" ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਸਭ ਤੋਂ"
+"ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਮੋਡ। “normal(ਸਧਾਰਨ)“ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਸਭ ਤੋਂ"
 " ਵਧੀਆ "
-"ਵੇਖਾਉਂਦਾ ਹੈ, \"ਪਲੇਨ_ਪਸੰਦ(prefer_plain\" ਟੈਕਸਟ ਵੇਖਾਉਣ ਲਈ, ਜੇ ਮੌਜੂਦ ਹੋਵੇ, ਅਤੇ "
-"\"ਕੇਵਲ_ਪਲੇਨ(only_plain\" ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਕੇਵਲ ਪਲੇਨ ਟੈਕਸਟ ਲਈ ਫੋਰਸ ਕਰਦਾ ਹੈ।"
+"ਵੇਖਾਉਂਦਾ ਹੈ, “ਪਲੇਨ_ਪਸੰਦ(prefer_plain)“ ਇਸ ਨੂੰ ਲਿਖਤ ਹਿੱਸਾ  ਵਰਤਦਾ ਹਟੈਕਸਟ ਵੇਖਾਉਣ"
+" ਲਈ, ਜੇ ਮੌਜੂਦ ਹੋਵੇ, ਅਤੇ "
+"“ਕੇਵਲ_ਪਲੇਨ(only_plain)“ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਕੇਵਲ ਪਲੇਨ ਟੈਕਸਟ ਲਈ ਫੋਰਸ ਕਰਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
 msgid "Whether to show suppressed HTML output"
@@ -2967,14 +3252,13 @@ msgid "Initial attachment view"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਅਟੈਚਮੈਂਟ ਝਲਕ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#, fuzzy
 #| msgid ""
 #| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
 #| "List View."
 msgid ""
 "Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
 msgstr ""
-"ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਵਿਦਜੈੱਟ ਲਈ ਸ਼ੁਰੂਆਤੀ ਝਲਕ। \"0\" ਆਈਕਾਨ ਝਲਕ ਲਈ, \"1\" ਲਿਸਟ ਝਲਕ ਲਈ।"
+"ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਵਿਦਜੈੱਟ ਲਈ ਸ਼ੁਰੂਆਤੀ ਝਲਕ। “0“ ਆਈਕਾਨ ਝਲਕ ਲਈ, “1“ ਲਿਸਟ ਝਲਕ ਲਈ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
 msgid "Initial file chooser folder"
@@ -2984,8 +3268,26 @@ msgstr "ਸ਼ੁਰੂਆਤੀ ਫਾਇਲ ਚੋਣਕਾਰ ਫੋਲਡਰ
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ਡਾਈਲਾਗ ਲਈ ਸ਼ੁਰੂਆਤੀ ਫੋਲਡਰ"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:331
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
@@ -3008,7 +3310,17 @@ msgstr "ਐਕਸਪ੍ਰੈਸ ਮੋਡ ਚਾਲੂ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Flag that enables a much simplified user interface."
-msgstr "ਫਲੈਗ, ਜੋ ਸਭ ਤੋਂ ਸੌਖਾ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਚਾਲੂ ਕਰਦਾ ਹੈ।"
+msgstr "ਫਲੈਗ, ਜੋ ਸਭ ਤੋਂ ਸੌਖਾ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਚਾਲੂ ਕਰਦਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+msgid ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
@@ -3023,7 +3335,6 @@ msgid "Window button style"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਸਟਾਇਲ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#, fuzzy
 #| msgid ""
 #| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 #| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
@@ -3033,21 +3344,19 @@ msgid ""
 "If “toolbar” is set, the style of the buttons is determined by the GNOME "
 "toolbar setting."
 msgstr ""
-"ਵਿੰਡੋ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਹੈ। \"ਟੈਕਸਟ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਟੂਲਬਾਰ\" ਸੰਭਵ ਹੈ।"
-" ਜੇ \"ਟੂਲਬਾਰ"
-"\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
+"ਵਿੰਡੋ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਹੈ। “ਟੈਕਸਟ“, “ਆਈਕਾਨ“, “ਦੋਵੇਂ“, “ਟੂਲਬਾਰ“ ਸੰਭਵ ਹੈ। ਜੇ"
+" “ਟੂਲਬਾਰ"
+"“ ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#, fuzzy
 #| msgid "Sidebar is visible"
 msgid "Menubar is visible"
-msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
+msgstr "ਮੇਨੂਬਾਰ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#, fuzzy
 #| msgid "Whether the sidebar should be visible."
 msgid "Whether the menubar should be visible."
-msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
+msgstr "ਕੀ ਮੇਨੂਬਾਰ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Toolbar is visible"
@@ -3085,6 +3394,37 @@ msgstr "ਮੂਲ ਬਾਹੀ ਚੌੜਾਈ"
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:34
+msgid "Enable special WebKit developer features"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:35
+msgid "Any change of this option requires restart of Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr "ਸੁਨੇਹਾ ਚੁਣੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਭੇਜੋ"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:39
+msgid ""
+"The prefix of a URL to be used for searches on the web. The actual text "
+"selection is escaped and appended to this string. The URI should start with "
+"https://.";
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਸਪੈਮ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
@@ -3093,15 +3433,48 @@ msgstr "ਸਿਰਫ ਲੋਕਲ ਸਪੈਮ ਜਾਂਚ ਹੀ ਵਰਤੋ
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਸਪੈਮ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
 #, fuzzy
 #| msgid "Whether the plugin is enabled"
 msgid "Whether the text-highlight module is enabled"
 msgstr "ਜਦੋਂ ਪਲੱਗਇਨ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇ"
 
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid "Theme name to use, defaults to “bclear”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:3
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
+
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1224
+#: ../src/mail/e-mail-browser.c:1295
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
@@ -3127,14 +3500,11 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
-#, fuzzy
 #| msgid ""
 #| "Thanks\n"
 #| "The Evolution Team\n"
 msgid "The Evolution Team"
-msgstr ""
-"ਧੰਨਵਾਦ\n"
-"ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਟੀਮ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:2
 #: ../src/shell/e-shell-utils.c:352
@@ -3146,19 +3516,16 @@ msgid "Evolution Mail and Calendar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:5
-#, fuzzy
 #| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "ਮੇਲ;ਕੈਲੰਡਰ;ਸੰਪਰਕ;ਐਡਰੈਸਬੁੱਕ;ਕੰਮ;ਟਾਸਕ;"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:6
-#, fuzzy
 #| msgid "New _Window"
 msgid "New Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:7
-#, fuzzy
 #| msgid "Compose Message"
 msgid "Compose a Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
@@ -3166,16 +3533,16 @@ msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
 #: ../src/modules/addressbook/e-book-shell-backend.c:314
-#: ../src/modules/addressbook/e-book-shell-view.c:412
+#: ../src/modules/addressbook/e-book-shell-view.c:416
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:784
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
+#: ../src/e-util/e-collection-account-wizard.c:839
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:604
+#: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
@@ -3184,14 +3551,14 @@ msgstr "ਕੈਲੰਡਰ"
 #: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1483
+#: ../src/modules/mail/e-mail-shell-view.c:1593
 #: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1736
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1773
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3199,18 +3566,302 @@ msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1109
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
-#: ../src/modules/calendar/e-cal-shell-content.c:1696
+#: ../src/calendar/importers/icalendar-importer.c:1141
+#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-cal-shell-content.c:1733
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:507
+#: ../src/modules/calendar/e-task-shell-view.c:508
 msgid "Tasks"
 msgstr "ਕੰਮ"
 
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/ui/evolution-shortcuts.ui.h:2
+#| msgid "General"
+msgctxt "shortcut window"
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:3
+#| msgid "Evolution Mail component"
+msgctxt "shortcut window"
+msgid "Select Mail component"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਭਾਗ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:4
+#| msgid "Select Contacts from Address Book"
+msgctxt "shortcut window"
+msgid "Select Contacts component"
+msgstr "ਸੰਪਰਕ ਭਾਗ ਚੁਣੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:5
+#| msgid "Evolution's Calendar component"
+msgctxt "shortcut window"
+msgid "Select Calendar component"
+msgstr "ਕੈਲੰਡਰ ਭਾਗ ਚੁਣੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:6
+#| msgid "Evolution's Tasks component"
+msgctxt "shortcut window"
+msgid "Select Tasks component"
+msgstr "ਟਾਕਸ ਭਾਗ ਚੁਣੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:7
+#| msgid "Evolution's Memos component"
+msgctxt "shortcut window"
+msgid "Select Memos component"
+msgstr "ਮੀਮੋ ਭਾਗ ਚੁਣੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:8
+#| msgid "Create a new mail account"
+msgctxt "shortcut window"
+msgid "Create a new item in current component"
+msgstr "ਮੌਜੂਦਾ ਭਾਗ ਵਿੱਚ ਨਵੀਂ ਆਈਟਮ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Cycle focus between panes"
+msgstr ""
+
+#: ../data/ui/evolution-shortcuts.ui.h:10
+#| msgid "Open the Evolution User Guide"
+msgctxt "shortcut window"
+msgid "Open the Evolution user guide"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਰਤੋਂਕਾਰ ਗਾਈਡ ਖੋਲ੍ਹੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:11
+#| msgid "Clear Search"
+msgctxt "shortcut window"
+msgid "Clear search bar"
+msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:12
+#| msgid "Move contacts to"
+msgctxt "shortcut window"
+msgid "Move mails or contacts to folder"
+msgstr "ਪੱਤਰਾਂ ਜਾਂ ਸੰਪਰਕਾਂ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:13
+#| msgid "Copy contacts to"
+msgctxt "shortcut window"
+msgid "Copy mails or contacts to folder"
+msgstr "ਪੱਤਰਾਂ ਜਾਂ ਸੰਪਰਕਾਂ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:14
+#| msgid "_Preferences"
+msgctxt "shortcut window"
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:15
+#| msgid "_Open in New Window"
+msgctxt "shortcut window"
+msgid "Open new window"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ 'ਚ ਖੋਲ੍ਹੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:16
+#| msgid "_Close Window"
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:17
+#| msgid "_Exit Evolution"
+msgctxt "shortcut window"
+msgid "Quit Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:18
+#| msgid "Mail"
+msgctxt "shortcut window"
+msgid "Mail"
+msgstr "ਪੱਤਰ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:19
+#| msgid "Create a new memo"
+msgctxt "shortcut window"
+msgid "Create a new message"
+msgstr "ਨਵਾਂ ਮੀਮੋ ਸੁਨੇਹਾ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:20
+#| msgid "Sent and Draft Messages"
+msgctxt "shortcut window"
+msgid "Send and receive messages"
+msgstr "ਭੇਜੇ ਅਤੇ ਡਰਾਫਟ ਸੁਨੇਹੇ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:21
+#| msgid "Copy the selection"
+msgctxt "shortcut window"
+msgid "Apply filters to selection"
+msgstr "ਚੋਣ ਉੱਤੇ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:22
+#| msgid "Open the selected messages in a new window"
+msgctxt "shortcut window"
+msgid "Open selection in new window"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ ਵਿੱਚ ਚੋਣ ਖੋਲ੍ਹੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:23
+#| msgid "Go to Folder"
+msgctxt "shortcut window"
+msgid "Go to folder"
+msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:24
+#| msgid "Failed to mark messages as read."
+msgctxt "shortcut window"
+msgid "Mark selected messages as read"
+msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਨਿਸ਼ਾਨ ਲਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:25
+#| msgid "Mark the selected messages as junk"
+msgctxt "shortcut window"
+msgid "Mark selected messages as unread"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਪੜ੍ਹੇ ਨਿਸ਼ਾਨ ਲਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:26
+#| msgid "Display the next unread message"
+msgctxt "shortcut window"
+msgid "Jump to the next unread message"
+msgstr "ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:27
+#| msgid "Display the previous unread message"
+msgctxt "shortcut window"
+msgid "Jump to the previous unread message"
+msgstr "ਪਿਛਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:28
+#| msgid "Forwarded messages"
+msgctxt "shortcut window"
+msgid "Forward selected messages"
+msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਅੱਗੇ ਭੇਜੋ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:29
+#| msgid "_Reply to sender"
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:30
+#| msgid "Reply to _List"
+msgctxt "shortcut window"
+msgid "Reply to list"
+msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:31
+#| msgid "Send reply to all recipients?"
+msgctxt "shortcut window"
+msgid "Reply to all recipients"
+msgstr "ਸਭ ਪ੍ਰਾਪਤ-ਕਰਤਾਵਾਂ ਨੂੰ ਜਵਾਬ ਦਿਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr "ਉੱਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Scroll down"
+msgstr "ਹੇਠਾਂ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:34
+#| msgid "Calendar"
+msgctxt "shortcut window"
+msgid "Calendar"
+msgstr "ਕੈਲੰਡਰ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:35
+#| msgid "Create a new appointment"
+msgctxt "shortcut window"
+msgid "Create a new appointment"
+msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:36
+#| msgid "Create a new meeting"
+msgctxt "shortcut window"
+msgid "Create a new meeting"
+msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:37
+#| msgid "Create a new task"
+msgctxt "shortcut window"
+msgid "Create a new task"
+msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:38
+#| msgid "Create a new memo"
+msgctxt "shortcut window"
+msgid "Create a new memo"
+msgstr "ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:39
+#| msgid "Go to Today"
+msgctxt "shortcut window"
+msgid "Go to today"
+msgstr "ਅੱਜ 'ਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:40
+#| msgid "Go to Date"
+msgctxt "shortcut window"
+msgid "Go to date"
+msgstr "ਮਿਤੀ 'ਤੇ ਜਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:41
+#| msgid "Day View"
+msgctxt "shortcut window"
+msgid "Day View"
+msgstr "ਦਿਨ ਝਲਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:42
+#| msgid "Work Week View"
+msgctxt "shortcut window"
+msgid "Work Week View"
+msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:43
+#| msgid "Week View"
+msgctxt "shortcut window"
+msgid "Week View"
+msgstr "ਹਫਤਾ ਝਲਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:44
+#| msgid "Month View"
+msgctxt "shortcut window"
+msgid "Month View"
+msgstr "ਮਹੀਨਾ ਝਲਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:45
+#| msgid "List View"
+msgctxt "shortcut window"
+msgid "List View"
+msgstr "ਲਿਸਟ ਝਲਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:46
+#| msgid "Contacts"
+msgctxt "shortcut window"
+msgid "Contacts"
+msgstr "ਸੰਪਰਕ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:47
+#| msgid "Create a new contact"
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
+
+#: ../data/ui/evolution-shortcuts.ui.h:48
+#| msgid "Create a new contact list"
+msgctxt "shortcut window"
+msgid "Create a new contact list"
+msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ ਬਣਾਓ"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "ਐਡਰੈੱਸ ਕਾਰਡ(_A)"
@@ -3272,11 +3923,11 @@ msgstr "ਵਿਆਪਕ ਝਲਕ ਲਈ(_W)"
 msgid "As Sent Folder for Wi_de View"
 msgstr "ਵਿਆਪਕ ਵਰਤੋਂ ਲਈ ਭੇਜੇ ਫੋਲਡਰ ਵਾਂਗ(_d)"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 msgid "_Memos"
 msgstr "ਮੀਮੋ(_M)"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "ਕੰਮ(_T)"
@@ -3294,10 +3945,9 @@ msgid "This address book could not be opened."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/addressbook/addressbook.error.xml.h:2
-#, fuzzy
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to communicate with LDAP server."
-msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ।"
+msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਚਾਰ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../src/addressbook/addressbook.error.xml.h:3
 msgid "This address book server does not have any suggested search bases."
@@ -3320,10 +3970,9 @@ msgid "Could not remove address book."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਹਟਾਉਣ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../src/addressbook/addressbook.error.xml.h:8
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete address book “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/addressbook/addressbook.error.xml.h:9
 msgid "This address book will be removed permanently."
@@ -3336,13 +3985,11 @@ msgid "Do _Not Delete"
 msgstr "ਨਾ ਹਟਾਓ(_N)"
 
 #: ../src/addressbook/addressbook.error.xml.h:11
-#, fuzzy
 #| msgid "Delete remote address book &quot;{0}&quot;?"
 msgid "Delete remote address book “{0}”?"
 msgstr "ਕੀ ਐਡਰੈੱਸ-ਬੁੱਕ “{0}“ ਹਟਾਉਣੀ ਹੈ?"
 
 #: ../src/addressbook/addressbook.error.xml.h:12
-#, fuzzy
 #| msgid ""
 #| "This will permanently remove the address book &quot;{0}&quot; from the "
 #| "server. Are you sure you want to proceed?"
@@ -3351,8 +3998,7 @@ msgid ""
 "sure you want to proceed?"
 msgstr ""
 "ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਐਡਰੈਸ ਬੁੱਕ “{0}“ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ"
-" ਜਾਰੀ "
-"ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+" ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/addressbook/addressbook.error.xml.h:13
 #: ../src/calendar/calendar.error.xml.h:65
@@ -3366,20 +4012,18 @@ msgstr "ਕੈਟਾਗਰੀ ਐਡੀਟਰ ਉਪਲੱਬਧ ਨਹੀਂ 
 
 #  addressbook:load-error title
 #: ../src/addressbook/addressbook.error.xml.h:15
-#, fuzzy
 #| msgid "Unable to open address book"
 msgid "Unable to open address book “{0}”"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"
+msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ  “{0}“ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"
 
 #: ../src/addressbook/addressbook.error.xml.h:16
 msgid "Unable to perform search."
 msgstr "ਖੋਜ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../src/addressbook/addressbook.error.xml.h:17
-#, fuzzy
 #| msgid "Delete address book '{0}'?"
 msgid "Failed to refresh address book “{0}”"
-msgstr "ਕੀ ਐਡਰੈੱਸ-ਬੁੱਕ '{0}' ਹਟਾਉਣੀ ਹੈ?"
+msgstr "ਕੀ ਐਡਰੈੱਸ-ਬੁੱਕ “{0}“ ਹਟਾਉਣੀ ਹੈ?"
 
 #: ../src/addressbook/addressbook.error.xml.h:18
 msgid "Would you like to save your changes?"
@@ -3417,32 +4061,35 @@ msgstr ""
 " ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr ""
+
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Resize"
 msgstr "ਮੁੜ-ਆਕਾਰ(_R)"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Use as it is"
 msgstr "ਇਹ ਇੰਝ ਹੀ ਵਰਤੋਂ(_U)"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Do not save"
 msgstr "ਨਾ ਸੰਭਾਲੋ(_D)"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Unable to save {0}."
 msgstr "{0} ਸੰਭਾਲਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ਨੂੰ {1} ਸੰਭਾਲਣ ਲਈ ਗਲਤੀ: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:30
 #| msgid "Address '{0}' already exists."
 msgid "Address “{0}” already exists."
-msgstr "ਐਡਰੈੱਸ '{0}' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+msgstr "ਐਡਰੈੱਸ “{0}“ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -3451,31 +4098,31 @@ msgstr ""
 " ਕਿਸੇ ਤਰਾਂ ਵੀ "
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
 #: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721
 #: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1044
+#: ../src/mail/em-folder-properties.c:1330
 #: ../src/mail/em-vfolder-editor-rule.c:408
 #: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
 #: ../src/modules/mail/em-composer-prefs.c:423
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:838
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿਲ(_A)"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid "Some addresses already exist in this contact list."
 msgstr "ਕੁਝ ਐਡਰੈਸ ਪਹਿਲਾਂ ਹੀ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਮੌਜੂਦ ਹਨ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -3484,22 +4131,20 @@ msgstr ""
 " ਹਨ। ਕੀ ਤੁਸੀਂ "
 "ਇਹਨਾਂ ਨੂੰ ਫੇਰ ਵੀ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Skip duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਛੱਡੋ"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "Add with duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਨਾਲ ਜੋੜੋ"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:37
 #| msgid "List '{0}' is already in this contact list."
 msgid "List “{0}” is already in this contact list."
-msgstr "ਇਸ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚ ਲਿਸਟ '{0}' ਪਹਿਲਾਂ ਹੀ ਹੈ।"
+msgstr "ਇਸ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚ ਲਿਸਟ “{0}“ ਪਹਿਲਾਂ ਹੀ ਹੈ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:37
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:38
 #| msgid ""
 #| "A contact list named '{0}' is already in this contact list. Would you "
 #| "like to add it anyway?"
@@ -3507,26 +4152,25 @@ msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
-"'{0}' ਨਾਂ ਦੀ ਸੰਪਰਕ ਲਿਸਟ ਪਹਿਲਾਂ ਹੀ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ"
+"“{0}“ ਨਾਂ ਦੀ ਸੰਪਰਕ ਲਿਸਟ ਪਹਿਲਾਂ ਹੀ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ"
 " ਨੂੰ ਕਿਵੇਂ ਵੀ "
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਸੰਪਰਕ ਹਟਾਉਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:41
 msgid "Cannot add new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:42
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:43
 #| msgid ""
 #| "'{0}' is a read-only address book and cannot be modified. Please select a "
 #| "different address book from the side bar in the Contacts view."
@@ -3534,133 +4178,119 @@ msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਐਡਰੈੱਸ ਬੁੱਕ ਸਰੋਤ ਹੈ ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਸੰਪਰਕ ਝਲਕ"
+"“{0}“ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਐਡਰੈੱਸ ਬੁੱਕ ਸਰੋਤ ਹੈ ਅਤੇ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਸੰਪਰਕ ਝਲਕ"
 " ਵਿੱਚ ਬਾਹੀ ਰਾਹੀਂ "
 "ਹੋਰ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ ਜੀ।"
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:44
 msgid "Cannot save a contact, address book is still opening"
 msgstr ""
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
 msgstr ""
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:47
 #, fuzzy
 #| msgid "Search for text in the displayed contact"
 msgid "Something has gone wrong when displaying the contact"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੰਪਰਕ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../src/addressbook/addressbook.error.xml.h:47
+#: ../src/addressbook/addressbook.error.xml.h:48
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:49
 #, fuzzy
 #| msgid "Couldn't get list of address books: %s"
 msgid "Failed to refresh list of account address books"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਸੂਚੀ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s"
 
-#: ../src/addressbook/addressbook.error.xml.h:49
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:50
 #| msgid "Do you want to resend the meeting?"
 msgid "Do you want to unset contact image?"
-msgstr "ਕੀ ਤੁਸੀਂ ਮੀਟਿੰਗ ਮੁੜ-ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਚਿੱਤਰ ਅਣ-ਸੈੱਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:51
 #| msgid "Do _Not Delete"
 msgid "Do _Not Unset"
-msgstr "ਨਾ ਹਟਾਓ(_N)"
+msgstr "ਅਣ-ਸੈੱਟ ਨਾ ਹਟਾਓ(_N)"
 
-#: ../src/addressbook/addressbook.error.xml.h:51
-#, fuzzy
+#: ../src/addressbook/addressbook.error.xml.h:52
 #| msgid "_Unsort"
 msgid "_Unset"
-msgstr "ਗੈਰ-ਕ੍ਰਮਬੱਧ(_U)"
+msgstr "ਨਾ-ਸੈੱਟ(_U)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
-#, fuzzy
 #| msgid "Telephone"
 msgid "Show Telephone"
-msgstr "ਟੈਲੀਫੋਨ"
+msgstr "ਟੈਲੀਫੋਨ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:2
-#, fuzzy
 #| msgid "_To This Address"
 msgid "Show SIP Address"
-msgstr "ਇਹ ਐਡਰੈੱਸ ਨੂੰ(_T)"
+msgstr "SIP ਐਡਰੈਸ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:3
-#, fuzzy
 #| msgid "Instant Messaging"
 msgid "Show Instant Messaging"
-msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ"
+msgstr "ਝੱਟਪਟ ਮੈਸਜਿੰਗ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
-#, fuzzy
 #| msgid "Web Addresses"
 msgid "Show Web Addresses"
-msgstr "ਵੈੱਬ ਐਡਰੈੱਸ"
+msgstr "ਵੈੱਬ ਐਡਰੈੱਸ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
-#, fuzzy
 #| msgid "Show the second time zone"
 msgid "Show Job section"
-msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
+msgstr "ਨੌਕਰੀ ਭਾਗ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:6
-#, fuzzy
 #| msgid "Miscellaneous"
 msgid "Show Miscellaneous"
-msgstr "ਫੁਟਕਲ"
+msgstr "ਫੁਟਕਲ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:7
-#, fuzzy
 #| msgid "Mailing Address"
 msgid "Show Home Mailing Address"
-msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
+msgstr "ਘਰ ਪੱਤਰ ਐਡਰੈੱਸ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:8
-#, fuzzy
 #| msgid "Mailing Address"
 msgid "Show Work Mailing Address"
-msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
+msgstr "ਕੰਮ ਪੱਤਰ ਐਡਰੈੱਸ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:9
-#, fuzzy
 #| msgid "Mailing Address"
 msgid "Show Other Mailing Address"
-msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
+msgstr "ਹੋਰ ਪੱਤਰ ਐਡਰੈੱਸ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:10
-#, fuzzy
 #| msgid "Show %s"
 msgid "Show Notes"
-msgstr "%s ਵੇਖੋ"
+msgstr "ਨੋਟਿਸਾਂ ਨੂੰ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:11
-#, fuzzy
 #| msgid "Certificates"
 msgid "Show Certificates"
-msgstr "ਸਰਟੀਫਿਕੇਟ"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖਾਓ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
 msgid "Contact Editor"
-msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
+msgstr "ਸੰਪਰਕ ਐਡੀਟਰ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "ਚੋਣ"
@@ -3668,36 +4298,36 @@ msgstr "ਚੋਣ"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-cal-dialogs.c:690
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309
 #: ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
-#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:231
-#: ../src/e-util/e-collection-account-wizard.c:1801
-#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
+#: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1864
+#: ../src/e-util/e-collection-account-wizard.c:2100
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
-#: ../src/e-util/e-html-editor-actions.c:304
-#: ../src/e-util/e-html-editor-actions.c:348
-#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
@@ -3707,18 +4337,18 @@ msgstr "ਚੋਣ"
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3968
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4175
-#: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4044
+#: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -3731,23 +4361,22 @@ msgstr "ਚੋਣ"
 #: ../src/smime/gui/certificate-manager.c:951
 #: ../src/smime/gui/certificate-manager.c:1332
 #: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
-#, fuzzy
 #| msgid "Cancel"
 msgid "_Cancel"
-msgstr "ਰੱਦ ਕਰੋ"
+msgstr "ਰੱਦ ਕਰੋ(_C)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/calendar/gui/e-comp-editor.c:2158
 #: ../src/composer/e-composer-actions.c:228
 #: ../src/composer/e-composer-actions.c:340
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
+#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:3968
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
 #: ../src/smime/gui/certificate-manager.c:651
@@ -3756,17 +4385,17 @@ msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012
-#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:994
+#: ../src/shell/e-shell-window-actions.c:1059
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3559
+#: ../src/e-util/e-misc-utils.c:3574
 msgid "Image"
 msgstr "ਚਿੱਤਰ"
 
@@ -3792,8 +4421,8 @@ msgid "Full _Name..."
 msgstr "ਪੂਰਾ ਨਾਂ(_N)..."
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
@@ -3807,10 +4436,9 @@ msgid "Telephone"
 msgstr "ਟੈਲੀਫੋਨ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
-#, fuzzy
 #| msgid "Address"
 msgid "SIP Address"
-msgstr "ਐਡਰੈੱਸ"
+msgstr "SIP ਐਡਰੈੱਸ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "Instant Messaging"
@@ -3826,8 +4454,8 @@ msgid "_Home Page:"
 msgstr "ਮੁੱਖ ਸਫਾ(_H):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:835
-#: ../src/modules/itip-formatter/itip-view.c:2049
+#: ../src/calendar/gui/e-comp-editor-event.c:884
+#: ../src/modules/itip-formatter/itip-view.c:1907
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
@@ -3915,22 +4543,22 @@ msgid "_Anniversary:"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ(_A):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2079
+#: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2078
+#: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
 msgstr "ਜਨਮ-ਦਿਨ"
 
 #. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../src/mail/e-mail-config-defaults-page.c:887
+#: ../src/mail/e-mail-config-defaults-page.c:888
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -3973,16 +4601,16 @@ msgstr "ਘਰ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "ਕੰਮ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "ਹੋਰ"
 
@@ -3997,28 +4625,27 @@ msgid "Notes"
 msgstr "ਨੋਟ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
-#, fuzzy
 #| msgid "_Add "
 msgid "Add _PGP"
-msgstr "ਸ਼ਾਮਲ(_A) "
+msgstr "_PGP ਨੂੰ ਜੋੜੋ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Add _X.509"
-msgstr ""
+msgstr "_X.509 ਜੋੜੋ"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/e-name-selector-dialog.c:1033
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
-#: ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/mail/e-mail-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1050
+#: ../src/mail/em-folder-properties.c:1336
 #: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:848
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:474
@@ -4039,24 +4666,26 @@ msgid "Certificates"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2047
-#: ../src/e-util/e-html-editor-actions.c:945
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/e-util/e-html-editor-actions.c:1004
 msgid "_Undo"
 msgstr ""
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr ""
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2054
-#: ../src/e-util/e-html-editor-actions.c:931
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:990
 msgid "_Redo"
 msgstr ""
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr ""
 
@@ -4073,102 +4702,99 @@ msgstr "ਸੰਪਰਕ ਸੂਚੀ ਗਲਤੀ"
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#, c-format
 #| msgid "Contact Editor - %s"
 msgid "Contact Editor — %s"
-msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
+msgstr "ਸੰਪਰਕ ਸੰਪਾਦਕ — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
-#, fuzzy
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
 #| msgid "Certificates"
 msgid "X.509 certificates"
-msgstr "ਸਰਟੀਫਿਕੇਟ"
+msgstr "X.509 ਸਰਟੀਫਿਕੇਟ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
 msgid "PGP keys"
-msgstr ""
+msgstr "PGP ਕੁੰਜੀਆਂ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/e-util/e-html-editor-actions.c:395
+#: ../src/e-util/e-image-chooser-dialog.c:193
 #: ../src/smime/gui/certificate-manager.c:672
 #: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
-#, fuzzy
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 #| msgid "OpenPGP _Key ID:"
 msgid "Open PGP key"
-msgstr "OpenPGP ਕੁੰਜੀ I_D:"
+msgstr "OpenPGP ਕੁੰਜੀ ਖੋਲ੍ਹੋ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
-#, fuzzy
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 #| msgid "Select certificate"
 msgid "Open X.509 certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
+msgstr "X.509 ਸਰਟੀਫਿਕੇਟ ਖੋਲ੍ਹੋ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
-#: ../src/e-util/e-html-editor-actions.c:304
-#: ../src/e-util/e-html-editor-actions.c:348
-#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
 #: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
-#, fuzzy
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
 #| msgid "Cannot attach file %s: not a regular file"
 msgid "Chosen file is not a local file."
-msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
+msgstr "ਚੁਣੀ ਹੋਈ ਫਾਇਲ ਲੋਕਲ ਫਾਇਲ ਨਹੀਂ ਹੈ।"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
+#, c-format
 #| msgid "Failed to import certificate"
 msgid "Failed to load certificate: %s"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "X.509"
-msgstr ""
+msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "PGP"
-msgstr ""
+msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save PGP key"
-msgstr ""
+msgstr "PGP ਕੁੰਜੀ ਸੰਭਾਲੋ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
-#, fuzzy
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 #| msgid "Select certificate"
 msgid "Save X.509 certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
+msgstr "X.509 ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
+#, c-format
 #| msgid "Failed to import certificate"
 msgid "Failed to save certificate: %s"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 msgid "_No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4176,46 +4802,46 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#, c-format
 #| msgid "'%s' has an invalid format"
 msgid "“%s” has an invalid format"
-msgstr "'%s' ਇੱਕ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
+msgstr "“%s“ ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#, c-format
 #| msgid "'%s' cannot be a future date"
 msgid "“%s” cannot be a future date"
-msgstr "'%s' ਭਵਿੱਖ ਦੀ ਮਿਤੀ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
+msgstr "“%s“ ਭਵਿੱਖ ਦੀ ਮਿਤੀ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#, c-format
 #| msgid "%s'%s' has an invalid format"
 msgid "%s“%s” has an invalid format"
-msgstr "%s'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
+msgstr "%s“%s“ ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4737
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
-#, fuzzy, c-format
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#, c-format
 #| msgid "%s'%s' is empty"
 msgid "%s“%s” is empty"
-msgstr "%s'%s' ਖਾਲੀ ਹੈ"
+msgstr "%s“%s“ ਖਾਲੀ ਹੈ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
 msgid "Invalid contact."
-msgstr "ਗਲਤ ਸੰਬੰਧ"
+msgstr "ਗਲਤ ਸੰਪਰਕ ਹੈ।"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:260
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:255
+#: ../src/e-util/e-html-editor-link-dialog.c:243
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
 #: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
 #: ../src/e-util/e-rule-editor.c:934 ../src/e-util/e-send-options.ui.h:17
@@ -4225,22 +4851,20 @@ msgstr "ਗਲਤ ਸੰਬੰਧ"
 #: ../src/e-util/e-timezone-dialog.ui.h:3
 #: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
-#: ../src/mail/mail-dialogs.ui.h:23 ../src/mail/mail-vfolder-ui.c:150
-#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
 #: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
-#, fuzzy
 #| msgid "OK"
 msgid "_OK"
-msgstr "ਠੀਕ ਹੈ"
+msgstr "ਠੀਕ ਹੈ(_O)"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "Contact Quick-Add"
-msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
+msgstr "ਸੰਪਰਕ ਤੁਰੰਤ-ਜੋੜੋ"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Edit Full"
@@ -4329,7 +4953,7 @@ msgid "_Suffix:"
 msgstr "ਪਿਛੇਤਰ(_S):"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਸੰਪਾਦਕ"
 
@@ -4371,43 +4995,40 @@ msgid "_Top"
 msgstr ""
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3474 ../src/e-util/filter.ui.h:29
-#, fuzzy
+#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
 #| msgid "_Update"
 msgid "_Up"
 msgstr "ਅੱਪਡੇਟ(_U)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:30
-#, fuzzy
+#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
 #| msgid "Move _Down"
 msgid "_Down"
 msgstr "ਹੇਠਾਂ ਭੇਜੋ(_D)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../src/e-util/filter.ui.h:31
-#, fuzzy
 #| msgid "Bottom:"
 msgid "_Bottom"
-msgstr "ਹੇਠਾਂ:"
+msgstr "ਹੇਠਾਂ(_B):"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
 msgid "Contact List Members"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮੈਂਬਰ"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
 msgid "_Members"
 msgstr "ਮੈਂਬਰ(_M)"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error modifying list"
 msgstr "ਸੋਧ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
 msgid "Error removing list"
 msgstr "ਹਟਾਉਣ ਸੂਚੀ ਗਲਤੀ"
 
@@ -4426,9 +5047,9 @@ msgstr "ਈ-ਮੇਲ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
 #: ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:809
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1017
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Any field contains"
 msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
 
@@ -4443,210 +5064,198 @@ msgid "Copy _Email Address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_E)"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:428
+#: ../src/e-util/e-web-view.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:440
-msgid "_Send New Message To..."
+#: ../src/e-util/e-web-view.c:442
+#| msgid "_Send New Message To..."
+msgid "_Send New Message To…"
 msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:442
+#: ../src/e-util/e-web-view.c:444
 msgid "Send a mail message to this address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਨੂੰ ਮੇਲ ਸੁਨੇਹਾ ਭੇਜੋ"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1441
+#: ../src/e-util/e-web-view.c:1668
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy, c-format
+#, c-format
 #| msgid "Click to open %s"
 msgid "Click to open map for %s"
-msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
+msgstr "%sਲਈ ਨਕਸ਼ਾ ਖੋਲ੍ਹੋ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ"
 
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "ਨਕਸ਼ਾ ਖੋਲ੍ਹੋ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "List Members:"
 msgstr "ਲਿਸਟ ਮੈਂਬਰ:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+msgid "Fax"
+msgstr "ਫੈਕਸ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+msgid "Phone"
+msgstr "ਫੋਨ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "ਆਮ ਨਾਂ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "GroupWise"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "Gadu-Gadu"
 msgstr "ਗਡੂ-ਗਡੂ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
 msgid "Skype"
 msgstr "ਸਕਾਈਪੀ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
 msgid "Twitter"
 msgstr "ਟਵਿੱਟਰ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "ਦਫਤਰ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
 msgid "Profession"
 msgstr "ਕਿੱਤਾ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Position"
 msgstr "ਸਥਿਤੀ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "ਮੈਨੇਜਰ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "ਸਹਾਇਕ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
 msgid "Video Chat"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
-msgid "Phone"
-msgstr "ਫੋਨ"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
-msgid "Fax"
-msgstr "ਫੈਕਸ"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
 msgid "Address"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 msgid "Home Page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
 msgid "Web Log"
 msgstr "ਵੈਬ ਲਾਗ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
-#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "ਮੋਬਾਇਲ ਫੋਨ"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "ਸਾਥੀ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "ਨੋਟ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
 msgid "List Members"
 msgstr "ਲਿਸਟ ਮੈਂਬਰ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
 msgid "Job Title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
 msgid "Home page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
 msgid "Blog"
 msgstr "Blog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:322
-#: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:526
-#: ../src/calendar/gui/e-task-table.c:210
-#: ../src/calendar/gui/e-task-table.c:225
-#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3600
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:305
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1143
 msgid "Cancelled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:495
 msgid "Merge Contact"
 msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:758
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:747
 msgid "Duplicate Contact Detected"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੰਪਰਕ ਹਟਾਓ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
-#, fuzzy
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:805
 #| msgid ""
 #| "The name or email of this contact already exists in this folder. Would "
 #| "you like to save the changes anyway?"
@@ -4654,12 +5263,10 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਬਦਲਾਅ"
-" ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ "
-"ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+"ਸੰਪਰਕ ਦਾ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਐਡੈਰਸ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ।\n"
+"ਕੀ ਤੁਸੀਂ ਬਦਲਾਅ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
-#, fuzzy
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:808
 #| msgid ""
 #| "The name or email address of this contact already exists\n"
 #| "in this folder.  Would you like to add it anyway?"
@@ -4670,23 +5277,22 @@ msgstr ""
 "ਸੰਪਰਕ ਦਾ ਤਬਦੀਲ ਨਾਂ ਜਾਂ ਈ-ਮੇਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ\n"
 "ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:823
 msgid "Changed Contact:"
 msgstr "ਬਦਲਿਆ ਸੰਪਰਕ:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:825
 msgid "New Contact:"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:864
 msgid "Conflicting Contact:"
 msgstr "ਸੰਪਰਕ ਟਕਰਾ:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
-#, fuzzy
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:866
 #| msgid "Contact: "
 msgid "Old Contact:"
-msgstr "ਸੰਪਰਕ:  "
+msgstr "ਪੁਰਾਣਾ ਸੰਪਰਕ:"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
@@ -4827,71 +5433,71 @@ msgstr "ਖੋਜ ਰੋਕੀ ਗਈ"
 msgid "Error modifying card"
 msgstr "ਸੋਧਿਆ ਕਾਰਡ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
 msgid "Cut selected contacts to the clipboard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕੱਟੋ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
 msgid "Copy selected contacts to the clipboard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
 msgid "Paste contacts from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਸੰਪਰਕ ਚੇਪੋ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Select all visible contacts"
 msgstr "ਸਭ ਵੇਖਾਈ ਦਿੰਦੇ ਸੰਪਰਕ ਚੁਣੋ"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1294
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1298
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਲਿਸਟ (%s)ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸਭ ਸੰਪਰਕ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1308
 msgid "Are you sure you want to delete this contact?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1312
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ (%s) ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2005
-#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:783
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1323
+#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
 #: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2688
-#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/e-util/e-webdav-browser.c:2697
+#: ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:699
-#: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:697
+#: ../src/modules/calendar/e-task-shell-view-actions.c:851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/shell/e-shell-window-actions.c:917
 #: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1471
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4906,13 +5512,12 @@ msgstr[1] ""
 "%d ਸੰਪਰਕ ਖੋਲ੍ਹਣ ਨਾਲ %d ਵਿੰਡੋਜ਼ ਖੋਲ੍ਹ ਜਾਣਗੀਆਂ।\n"
 "ਕੀ ਤੁਸੀਂ ਇਹ ਸਭ ਸੰਪਰਕ ਵੇਖਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
-#, fuzzy
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 #| msgid "_Don't Display"
 msgid "_Don’t Display"
 msgstr "ਨਾ ਵੇਖਾਓ(_D)"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਵੇਖੋ(_A)"
 
@@ -4980,6 +5585,10 @@ msgstr "ਘਰ ਫੈਕਸ"
 msgid "ISDN Phone"
 msgstr "ISDN ਫੋਨ"
 
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "ਮੋਬਾਇਲ ਫੋਨ"
+
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "ਹੋਰ ਫੋਨ"
@@ -5023,7 +5632,7 @@ msgid "Title"
 msgstr "ਟਾਇਟਲ"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:671
+#: ../src/calendar/gui/e-meeting-list-view.c:663
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "ਰੋਲ"
@@ -5081,36 +5690,38 @@ msgstr "ਸੰਪਰਕ ਨਕਸ਼ਾ"
 
 #. Zoom-in button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:409
-#, fuzzy
 #| msgid "_Zoom In"
 msgid "Zoom _In"
-msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
+msgstr "ਜ਼ੂਮ ਅੰਦਰ(_I)"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2829
+#: ../src/mail/e-mail-reader.c:2861
 msgid "Zoom _Out"
 msgstr "ਜ਼ੂਮ ਬਾਹਰ(_O)"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:2015
-#: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:929
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:2081
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:987
 #| msgid "_Find Now"
 msgid "_Find"
-msgstr "ਹੁਣ ਖੋਜ(_F)"
+msgstr "ਖੋਜੋ(_F)"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:186
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
 msgid ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 msgstr ""
 "\n"
 "\n"
-"ਸੰਪਰਕ ਦੀ ਖੋਜ ਜਾਰੀ..."
+"ਸੰਪਰਕ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ…"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
@@ -5160,51 +5771,49 @@ msgstr ""
 "\n"
 "ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਸੂਚੀ ਨਹੀਂ ਹੈ।"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:749
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:478
-#: ../src/calendar/importers/icalendar-importer.c:971
-#: ../src/calendar/importers/icalendar-importer.c:1011
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
-msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
-
-#: ../src/addressbook/importers/evolution-csv-importer.c:931
-#, fuzzy
+#: ../src/calendar/importers/icalendar-importer.c:499
+#: ../src/calendar/importers/icalendar-importer.c:1003
+#: ../src/calendar/importers/icalendar-importer.c:1043
+#| msgid "Importing..."
+msgid "Importing…"
+msgstr "ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"
+
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
 #| msgid "Can not open file"
 msgid "Can’t open .csv file"
-msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
+msgstr ".csv ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਆਉਟਲੁੱਕ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1101
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "ਆਉਟਲੁੱਕ ਸੰਪਰਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1109
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਮੌਜੀਲਾ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1110
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "ਮੌਜੀਲਾ ਸੰਪਰਕ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1118
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1119
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਪਰਕ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
 #: ../src/addressbook/importers/evolution-ldif-importer.c:717
-#, fuzzy
 #| msgid "Can not open file"
 msgid "Can’t open .ldif file"
-msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
+msgstr ".ldif ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
 #: ../src/addressbook/importers/evolution-ldif-importer.c:819
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -5230,123 +5839,106 @@ msgid "Page %d"
 msgstr "%d ਪੇਜ਼"
 
 #: ../src/addressbook/util/eab-book-util.c:34
-#, fuzzy
 #| msgid "Work Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "ਕੰਮਕਾਜੀ ਈ-ਮੇਲ"
 
 #: ../src/addressbook/util/eab-book-util.c:35
-#, fuzzy
 #| msgid "Home Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "ਘਰ ਈ-ਮੇਲ"
 
 #: ../src/addressbook/util/eab-book-util.c:36
-#, fuzzy
 #| msgid "Other Email"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "ਹੋਰ ਈ-ਮੇਲ"
 
 #: ../src/addressbook/util/eab-book-util.c:42
-#, fuzzy
 #| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
-msgstr "ਕੰਮ"
+msgstr "ਕੰਮ SIP"
 
 #: ../src/addressbook/util/eab-book-util.c:43
-#, fuzzy
 #| msgid "Home Page"
 msgctxt "addressbook-label"
 msgid "Home SIP"
-msgstr "ਮੁੱਖ ਸਫਾ"
+msgstr "ਘਰ SIP"
 
 #: ../src/addressbook/util/eab-book-util.c:44
-#, fuzzy
 #| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
-msgstr "ਹੋਰ"
+msgstr "ਹੋਰ  SIP"
 
 #: ../src/addressbook/util/eab-book-util.c:72
-#, fuzzy
 #| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
 #: ../src/addressbook/util/eab-book-util.c:73
-#, fuzzy
 #| msgid "Jabber"
 msgctxt "addressbook-label"
 msgid "Jabber"
-msgstr "ਜਾਬਰ"
+msgstr "Jabber"
 
 #: ../src/addressbook/util/eab-book-util.c:74
-#, fuzzy
 #| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
 #: ../src/addressbook/util/eab-book-util.c:75
-#, fuzzy
 #| msgid "Gadu-Gadu"
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "ਗਡੂ-ਗਡੂ"
 
 #: ../src/addressbook/util/eab-book-util.c:76
-#, fuzzy
 #| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
 #: ../src/addressbook/util/eab-book-util.c:77
-#, fuzzy
 #| msgid "ICQ"
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../src/addressbook/util/eab-book-util.c:78
-#, fuzzy
 #| msgid "GroupWise"
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼"
 
 #: ../src/addressbook/util/eab-book-util.c:79
-#, fuzzy
 #| msgid "Skype"
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "ਸਕਾਈਪੀ"
 
 #: ../src/addressbook/util/eab-book-util.c:80
-#, fuzzy
 #| msgid "Twitter"
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "ਟਵਿੱਟਰ"
 
 #: ../src/addressbook/util/eab-book-util.c:81
-#, fuzzy
 #| msgid "Google"
 msgctxt "addressbook-label"
 msgid "Google Talk"
-msgstr "ਗੂਗਲ"
+msgstr "ਗੂਗਲ ਟਾਕ"
 
 #. To Translators:
 #. * if an email address type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../src/addressbook/util/eab-book-util.c:124
-#, fuzzy
 #| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
@@ -5360,7 +5952,7 @@ msgstr "ਈ-ਮੇਲ"
 #: ../src/addressbook/util/eab-book-util.c:171
 msgctxt "addressbook-label"
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
 #. To Translators:
 #. * if an IM address type is not one of the predefined types,
@@ -5368,18 +5960,16 @@ msgstr ""
 #. * IM=Instant Messaging
 #.
 #: ../src/addressbook/util/eab-book-util.c:214
-#, fuzzy
 #| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
-msgstr "AIM"
+msgstr "IM"
 
 #. To Translators:
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../src/addressbook/util/eab-book-util.c:269
-#, fuzzy
 #| msgid "Phone"
 msgctxt "addressbook-label"
 msgid "Phone"
@@ -5407,7 +5997,7 @@ msgid "_Send Notice"
 msgstr "ਸੂਚਨਾ ਭੇਜੋ(_S)"
 
 #: ../src/calendar/calendar.error.xml.h:5
-#: ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/gui/e-cal-dialogs.c:504
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੀਟਿੰਗ ਨੂੰ ਹਟਾਓ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
@@ -5428,7 +6018,7 @@ msgstr ""
 "ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../src/calendar/calendar.error.xml.h:9
-#: ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਕੰਮ ਹਟਾਓ ਬਾਰੇ ਤਿਆਰ ਹੋ?"
@@ -5452,7 +6042,7 @@ msgstr ""
 "ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../src/calendar/calendar.error.xml.h:13
-#: ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੀਮੋ ਨੂੰ ਹਟਾਓ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
@@ -5463,16 +6053,14 @@ msgstr ""
 "ਇਸ ਮੀਮੋ ਦੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਮੁੜ ਸਟੋਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੇਗੀ।"
 
 #: ../src/calendar/calendar.error.xml.h:15
-#, fuzzy
 #| msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੁਲਾਕਾਤ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੁਲਾਕਾਤ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:16
-#, fuzzy
 #| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the appointment titled “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ ਮੁਲਾਕਾਤ '{0}' ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਮੁਲਾਕਾਤ “{0}“ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:17
 msgid ""
@@ -5486,16 +6074,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੁਲਾਕਾਤ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:19
-#, fuzzy
 #| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to delete the “{0}” task?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਕੰਮ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਕੰਮ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:20
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete the memo “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
@@ -5656,13 +6242,11 @@ msgid ""
 msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
 
 #: ../src/calendar/calendar.error.xml.h:52
-#, fuzzy
 #| msgid "Would you like to send this task to participants?"
 msgid "Would you like to send this memo to participants?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੂਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਮੀਮੋ ਬਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੂਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:53
-#, fuzzy
 #| msgid ""
 #| "Email invitations will be sent to all participants and allow them to "
 #| "accept this task."
@@ -5670,68 +6254,62 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this memo."
 msgstr ""
-"ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਇਸ ਕੰਮ ਬਾਰੇ ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ ਹੈ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਇਹ ਕੰਮ"
+"ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਇਸ ਮੀਮੋ ਬਾਰੇ ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ ਹੈ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਇਹ ਕੰਮ"
 " ਮਨਜ਼ੂਰ ਕਰਨ ਦਾ "
 "ਅਧਿਕਾਰ ਵੀ ਹੈ।"
 
 #: ../src/calendar/calendar.error.xml.h:54
-#, fuzzy
 #| msgid "Would you like to send updated meeting information to participants?"
 msgid "Would you like to send updated memo information to participants?"
-msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਮੋ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:55
-#, fuzzy
 #| msgid ""
 #| "Sending updated information allows other participants to keep their task "
 #| "lists up to date."
 msgid ""
 "Sending updated information allows other participants to keep their memo "
 "lists up to date."
-msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
+msgstr ""
+"ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣੀ ਮੀਮੋ ਲਿਸਟ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
 
 #: ../src/calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "ਐਡੀਟਰ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #: ../src/calendar/calendar.error.xml.h:57
-#, fuzzy
 #| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to delete calendar “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਕੰਮ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਕੰਮ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "ਇਹ ਕੈਲੰਡਰ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../src/calendar/calendar.error.xml.h:59
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete task list “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "ਇਹ ਕੰਮ ਸੂਚੀ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
 #: ../src/calendar/calendar.error.xml.h:61
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete memo list “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "ਇਹ ਮੀਮੋ ਸੂਚੀ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
 #: ../src/calendar/calendar.error.xml.h:63
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete remote calendar “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਰਿਮੋਟ ਕੈਲੰਡਰ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:64
-#, fuzzy
 #| msgid ""
 #| "This will permanently remove the calendar '{0}' from the server. Are you "
 #| "sure you want to proceed?"
@@ -5739,17 +6317,15 @@ msgid ""
 "This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਕੈਲੰਡਰ '{0}' ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ"
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਕੈਲੰਡਰ “{0}“ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ"
 " ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:66
-#, fuzzy
 #| msgid "Are you sure you want to delete these contact lists?"
 msgid "Are you sure you want to delete remote task list “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਰਿਮੋਟ ਕੰਮ ਸੂਚੀ “{0}” ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:67
-#, fuzzy
 #| msgid ""
 #| "This will permanently remove the task list '{0}' from the server. Are you "
 #| "sure you want to proceed?"
@@ -5757,18 +6333,16 @@ msgid ""
 "This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਟਾਸਕ ਲਿਸਟ '{0}' ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ"
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਟਾਸਕ ਲਿਸਟ “{0}“ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ"
 " ਰੱਖਣਾ ਚਾਹੁੰਦੇ "
 "ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:68
-#, fuzzy
 #| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete remote memo list “{0}”?"
-msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ “{0}“ ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/calendar/calendar.error.xml.h:69
-#, fuzzy
 #| msgid ""
 #| "This will permanently remove the memo list '{0}' from the server. Are you "
 #| "sure you want to proceed?"
@@ -5776,8 +6350,8 @@ msgid ""
 "This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr ""
-"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਰਿਮੋਟ ਮੀਮੋ ਲਿਸਟ '{0}' ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ"
-" ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ "
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਮੀਮੋ ਲਿਸਟ “{0}“ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ"
+" ਰੱਖਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
@@ -5815,10 +6389,9 @@ msgstr "ਕੀ ਤੁਸੀਂ ਮੀਮੋ ਨੂੰ ਸੰਖੇਪ ਜਾਣ
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:76
-#, fuzzy
 #| msgid "Error loading calendar '{0}'"
 msgid "Error loading calendar “{0}”"
-msgstr "'{0}' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ "
+msgstr "“{0}“ ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ "
 
 #: ../src/calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
@@ -5830,7 +6403,6 @@ msgstr "ਘਟਨਾ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:80
-#, fuzzy
 #| msgid ""
 #| "'{0}' is a read-only calendar and cannot be modified. Please select a "
 #| "different calendar that can accept appointments."
@@ -5838,7 +6410,7 @@ msgid ""
 "“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ"
+"“{0}“ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਕੈਲੰਡਰ ਸਰੋਤ ਹੈ। ਕੈਲੰਡਰ ਝਲਕ ਲਈ ਸਵਿੱਚ ਕਰੋ ਅਤੇ ਇੱਕ ਕੈਲੰਡਰ"
 " ਹਾਈਲਾਈਟ ਕਰੋ "
 "ਤਾਂ ਕਿ ਮੁਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
 
@@ -5848,20 +6420,18 @@ msgstr "ਟਾਸਕ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:83
-#, fuzzy
 #| msgid ""
 #| "'{0}' does not support assigned tasks, please select a different task "
 #| "list."
 msgid ""
 "“{0}” does not support assigned tasks, please select a different task list."
-msgstr "'{0}' ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਟਾਸਕ ਲਈ ਸਹਾਇਕ ਨਹੀਂ, ਵੱਖਰੀ ਟਾਸਕ ਸੂਚੀ ਚੁਣੋ ਜੀ।"
+msgstr "“{0}“ ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਟਾਸਕ ਲਈ ਸਹਾਇਕ ਨਹੀਂ, ਵੱਖਰੀ ਟਾਸਕ ਸੂਚੀ ਚੁਣੋ ਜੀ।"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:85
-#, fuzzy
 #| msgid "Error loading task list '{0}'"
 msgid "Error loading task list “{0}”"
-msgstr "'{0}' ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+msgstr "“{0}“ ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
 #: ../src/calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
@@ -5869,10 +6439,9 @@ msgstr "ਕੰਮ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿ
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:88
-#, fuzzy
 #| msgid "Error loading memo list '{0}'"
 msgid "Error loading memo list “{0}”"
-msgstr "'{0}' ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+msgstr "“{0}“ ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
 #: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
@@ -5885,289 +6454,248 @@ msgstr ""
 
 #. The {0} is a calendar/memo list/task list name, which is useless here
 #: ../src/calendar/calendar.error.xml.h:93
-#, fuzzy
 #| msgid "Could not save attachments"
 msgid "Failed to save attachments"
-msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:95
-#, fuzzy
 #| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to open calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:97
-#, fuzzy
 #| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to open memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "“{0}“ ਮੀਮੋ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:99
-#, fuzzy
 #| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to open task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "“{0}“ ਕੰਮ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:101
-#, fuzzy
 #| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to create an event in the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:103
-#, fuzzy
 #| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to create a memo in the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:105
-#, fuzzy
 #| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to create a task in the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:107
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to modify an event in the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚ ਸੋਧਣ ਲਈ ਫੇਲ੍ਹ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:109
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to modify a memo in the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਸੋਧ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:111
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to modify a task in the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਸੋਧ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:113
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to delete an event in the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:115
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to delete a memo in the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:117
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to delete a task in the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚੋਂ ਸੋਧਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:119
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to update an event in the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:121
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to update a memo in the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:123
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to update a task in the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:125
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to send an event to the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚੋਂ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:127
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to send a memo to the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:129
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to send a task to the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:131
-#, fuzzy
 #| msgid "Error loading calendar '{0}'"
 msgid "Error creating view for the calendar “{0}”"
-msgstr "'{0}' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ "
+msgstr "ਕੈਲੰਡਰ “{0}” ਲਈ ਝਲਕ ਬਣਾਉਣ ਲਈ ਗ਼ਲਤੀ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:133
-#, fuzzy
 #| msgid "Error loading task list '{0}'"
 msgid "Error creating view for the task list “{0}”"
-msgstr "'{0}' ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+msgstr "ਟਾਸਕ ਸੂਚੀ “{0}” ਲਈ ਝਲਕ ਬਣਾਉਣ ਲਈ ਗ਼ਲਤੀ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:135
-#, fuzzy
 #| msgid "Error loading memo list '{0}'"
 msgid "Error creating view for the memo list “{0}”"
-msgstr "'{0}' ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
+msgstr "ਮੀਮੋ ਸੂਚੀ “{0}” ਲਈ ਝਲਕ ਬਣਾਉਣ ਲਈ ਗ਼ਲਤੀ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:137
-#, fuzzy
 #| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to copy an event into the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“  ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:139
-#, fuzzy
 #| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to copy a task into the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:141
-#, fuzzy
 #| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to copy a memo into the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:143
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to move an event into the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:145
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to move a task into the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:147
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to move a memo into the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:149
-#, fuzzy
 #| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to get an event from the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚੋਂ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:151
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to get a task from the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚੋਂ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:153
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to get a memo from the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚੋਂ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:155
-#, fuzzy
 #| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:157
-#, fuzzy
 #| msgid "Copying a task into the task list '{0}'"
 msgid "Copying a task into the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:159
-#, fuzzy
 #| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying a memo into the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:161
-#, fuzzy
 #| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar “{0}”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“  ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:163
-#, fuzzy
 #| msgid "Moving a task into the task list '{0}'"
 msgid "Moving a task into the task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਕੰਮ ਨੂੰ “{0}“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:165
-#, fuzzy
 #| msgid "Moving a memo into the memo list '{0}'"
 msgid "Moving a memo into the memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “{0}“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:167
-#, fuzzy
 #| msgid "Failed to refresh folder &quot;{0}&quot;."
 msgid "Failed to refresh calendar “{0}”"
-msgstr "ਫੋਲਡਰ “{0}“ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+msgstr "ਕੈਲੰਡਰ “{0}” ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:169
-#, fuzzy
 #| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to refresh task list “{0}”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "“{0}“ ਕੰਮ ਸੂਚੀ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:171
-#, fuzzy
 #| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to refresh memo list “{0}”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "“{0}“ ਮੀਮੋ ਸੂਚੀ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #: ../src/calendar/calendar.error.xml.h:172
-#, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Failed to make an occurrence movable"
-msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
+msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
 
 #: ../src/calendar/calendar.error.xml.h:173
 #, fuzzy
@@ -6214,7 +6742,7 @@ msgstr ""
 #: ../src/calendar/gui/e-task-table.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:1
 #: ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
@@ -6237,7 +6765,7 @@ msgstr "ਸ਼ਾਮਿਲ ਨਹੀ ਹੈ"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1893
+#: ../src/e-util/e-collection-account-wizard.c:1956
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6269,23 +6797,23 @@ msgid "is not"
 msgstr "ਇਹ ਨਹੀਂ"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:243
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445
 #: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "ਸਰਵਜਨਕ"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:244
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-list-view.c:245
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
+#: ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113
 #: ../src/e-util/e-send-options.ui.h:7
@@ -6299,6 +6827,7 @@ msgid "Organizer"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-list-view.c:623
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6310,7 +6839,7 @@ msgstr "ਦਰਸ਼ਕ"
 #: ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
@@ -6324,8 +6853,8 @@ msgstr "ਕੈਟਾਗਰੀ"
 #: ../src/calendar/gui/caltypes.xml.in.h:16
 #: ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
-#: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/em-format/e-mail-formatter-print.c:50
+#: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
@@ -6348,7 +6877,7 @@ msgid "Do Not Exist"
 msgstr "ਬਾਹਰ ਨਾ ਜਾਓ"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
 msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
@@ -6380,19 +6909,78 @@ msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 msgid "Description Contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2366
+#: ../src/calendar/gui/comp-util.c:1544
+#: ../src/modules/itip-formatter/itip-view.c:2229
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/calendar/gui/comp-util.c:1546
-#, fuzzy, c-format
+#: ../src/calendar/gui/comp-util.c:1603
+#, c-format
 #| msgid "Comment:"
 msgid "Comments: %s"
-msgstr "ਟਿੱਪਣੀ:"
+msgstr "ਟਿੱਪਣੀਆਂ: %s"
+
+#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+#| msgid "None"
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../src/calendar/gui/comp-util.c:1618
+#| msgid "Tentative"
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "ਆਰਜ਼ੀ"
+
+#: ../src/calendar/gui/comp-util.c:1619
+#| msgid "Confirm expunge"
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "ਪੁਸ਼ਟੀ ਕੀਤਾ"
+
+#: ../src/calendar/gui/comp-util.c:1621
+#| msgid "Draft"
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "ਡਰਾਫਟ"
+
+#: ../src/calendar/gui/comp-util.c:1622
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr "ਫਾਈਨਲ"
+
+#: ../src/calendar/gui/comp-util.c:1623
+#| msgid "Not Started"
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
+
+#: ../src/calendar/gui/comp-util.c:1624
+#| msgid "Needs Action"
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
+
+#: ../src/calendar/gui/comp-util.c:1625
+#| msgid "In Progress"
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "ਜਾਰੀ ਹੈ"
+
+#: ../src/calendar/gui/comp-util.c:1626
+#| msgid "Completed"
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
+
+#: ../src/calendar/gui/comp-util.c:1627
+#| msgid "Cancelled"
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "ਰੱਦ ਕੀਤਾ"
 
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
@@ -6495,85 +7083,39 @@ msgstr "ਜੰਪ ਬਟਨ"
 msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ਦਿਨ"
-msgstr[1] "%d ਦਿਨ"
-
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d ਹਫਤਾ"
-msgstr[1] "%d ਹਫਤਾ"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ਘੰਟਾ"
-msgstr[1] "%d ਘੰਟੇ"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d ਮਿੰਟ"
-msgstr[1] "%d ਮਿੰਟ"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ਸਕਿੰਟ"
-msgstr[1] "%d ਸਕਿੰਟ"
-
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1820
-#, fuzzy
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
 #| msgid "Play a sound"
 msgctxt "cal-reminders"
 msgid "Play a sound"
-msgstr "ਧੁਨੀ ਚਲਾਉ"
+msgstr "ਧੁਨੀ ਚਲਾਓ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1818
-#, fuzzy
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
 #| msgid "Pop up an alert"
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1824
-#, fuzzy
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
 #| msgid "Send an email"
 msgctxt "cal-reminders"
 msgid "Send an email"
-msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
+msgstr "ਈ-ਮੇਲ ਭੇਜੋ"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1822
-#, fuzzy
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 #| msgid "Run a program"
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
-#: ../src/calendar/gui/e-alarm-list.c:437
-#, fuzzy
+#: ../src/calendar/gui/e-alarm-list.c:405
 #| msgid "Unknown action to be performed"
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
@@ -6581,62 +7123,62 @@ msgstr "ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਹੈ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:421
+#, c-format
 #| msgid "%s %s before the start of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
-msgstr "ਮੁਲਾਕਾਤ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ %s %s"
+msgstr "ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:427
+#, c-format
 #| msgid "%s %s after the start of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
-msgstr "%s %s ਮੁਲਾਕਾਤ ਦੇ ਸ਼ੁਰੂ ਬਾਅਦ"
+msgstr "%s %s ਦੇ ਸ਼ੁਰੂ ਬਾਅਦ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:434
+#, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
 msgid "%s at the start"
-msgstr "%s ਨੱਥੀ"
+msgstr "ਸ਼ੁਰੂ ਵੇਲੇ %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:447
+#, c-format
 #| msgid "%s %s before the end of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
-msgstr "%s %s ਮੁਲਾਕਾਤ ਦੇ ਅੰਤ ਤੋਂ ਪਹਿਲਾਂ"
+msgstr "ਖ਼ਤਮ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:453
+#, c-format
 #| msgid "%s %s after the end of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
-msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਬਾਅਦ %s %s "
+msgstr "ਖ਼ਤਮ ਹੋਣ ਦੇ ਬਾਅਦ %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:460
+#, c-format
 #| msgid "%s attachment"
 msgctxt "cal-reminders"
 msgid "%s at the end"
-msgstr "%s ਨੱਥੀ"
+msgstr "ਖ਼ਤਮ ਹੋਣ ਉੱਤੇ %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:484
+#, c-format
 #| msgid "%s at %s"
 msgctxt "cal-reminders"
 msgid "%s at %s"
@@ -6644,12 +7186,12 @@ msgstr "%s, %s ਤੇ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-alarm-list.c:492
+#, c-format
 #| msgid "%s for an unknown trigger type"
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
-msgstr "ਅਣਜਾਣ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
+msgstr "ਅਣਜਾਣ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ %s"
 
 #: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
@@ -6669,363 +7211,345 @@ msgstr "ਮਹੀਨੇ ਦੀ ਕੈਲੰਡਰ ਦਿੱਖ"
 msgid "calendar view for one or more weeks"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਹਫਤਿਆਂ ਲਈ ਕੈਲੰਡਰ ਝਲਕ"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:216
+#: ../src/calendar/gui/e-cal-component-preview.c:237
 #: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:224
+#: ../src/calendar/gui/e-cal-component-preview.c:251
 msgid "Categories:"
 msgstr "ਕੈਟਾਗਰੀਆਂ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:258
+#: ../src/calendar/gui/e-cal-component-preview.c:288
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
+#: ../src/modules/itip-formatter/itip-view.c:1635
+#: ../src/modules/itip-formatter/itip-view.c:1746
 msgid "Location:"
 msgstr "ਟਿਕਾਣਾ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:266
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:277
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "ਮਿਆਦ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:300
-#, fuzzy
+#: ../src/calendar/gui/e-cal-component-preview.c:326
 #| msgid "Recurring:"
 msgid "Recurs:"
-msgstr "ਆਵਿਰਤੀ:"
+msgstr "ਮੁੜ-ਵਾਪਰਨ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1802
+#: ../src/calendar/gui/e-cal-component-preview.c:338
+#: ../src/modules/itip-formatter/itip-view.c:1638
+#: ../src/modules/itip-formatter/itip-view.c:1755
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:316
-#: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:522
-#: ../src/calendar/gui/e-cal-model-tasks.c:603
-#: ../src/calendar/gui/e-task-table.c:206
-#: ../src/calendar/gui/e-task-table.c:221
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3594
-msgid "In Progress"
-msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:319
-#: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:524
-#: ../src/calendar/gui/e-meeting-store.c:205
-#: ../src/calendar/gui/e-meeting-store.c:228
-#: ../src/calendar/gui/e-task-table.c:208
-#: ../src/calendar/gui/e-task-table.c:223
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3597
-#: ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "ਸਮਾਪਤ"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:326
-#: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:520
-#: ../src/calendar/gui/e-task-table.c:204
-#: ../src/calendar/gui/e-task-table.c:219
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3591
-#: ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:339
-msgid "Priority:"
-msgstr "ਪਹਿਲ:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:341
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/e-cal-component-preview.c:347
+#: ../src/calendar/gui/e-task-table.c:471
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:328
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
 msgid "High"
 msgstr "ਉਚਤਮ"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1872
+#: ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:327
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:333
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:345
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-task-table.c:473
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:326
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
 msgid "Low"
 msgstr "ਨਿਊਨਤਮ"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:364
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "ਪਹਿਲ:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "ਪ੍ਰਬੰਧਕ:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+#| msgid "Attendees: "
+msgid "Attendees:"
+msgstr "ਦਰਸ਼ਕ:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
 #: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:395
+#: ../src/calendar/gui/e-cal-component-preview.c:507
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1709
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-data-model.c:1753
+#, c-format
 #| msgid "Creating folder '%s'"
 msgid "Creating view for calendar “%s”"
-msgstr "'%s' ਫੋਲਡਰ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "“%s“ ਕੈਲੰਡਰ ਲਈ ਝਲਕ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1713
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-data-model.c:1757
+#, c-format
 #| msgid "Create a new task list"
 msgid "Creating view for task list “%s”"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਉ"
+msgstr "“%s“ ਟਾਸਕ ਸੂਚੀ ਲਈ ਝਲਕ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1717
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-data-model.c:1761
+#, c-format
 #| msgid "Create a new memo list"
 msgid "Creating view for memo list “%s”"
-msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
+msgstr "ਮੀਮੋ ਸੂਚੀ “%s“ ਲਈ ਝਲਕ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1976
 msgid "Destination is read only"
-msgstr "ਨਿਯਤ ਸਿਰਫ ਪੜਨ ਲਈ ਹੈ"
+msgstr "ਟਿਕਾਣਾ ਸਿਰਫ ਪੜਨ ਲਈ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:299
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-dialogs.c:297
+#, c-format
 #| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying events to the calendar “%s”"
-msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਈਵੈਂਟਾਂ ਨੂੰ ਕੈਲੰਡਰ “%s“ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:305
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-dialogs.c:303
+#, c-format
 #| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying memos to the memo list “%s”"
-msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਮੀਮੋ ਨੂੰ “%s“ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:311
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-dialogs.c:309
+#, c-format
 #| msgid "Copying a task into the task list '{0}'"
 msgid "Copying tasks to the task list “%s”"
-msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਕੰਮਾਂ ਨੂੰ “%s“ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
-#, fuzzy
+#: ../src/calendar/gui/e-cal-dialogs.c:528
 #| msgid "_Delete this item from all other recipient's mailboxes?"
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr "ਹੋਰ ਸਭ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਦੇ ਪੱਤਰ-ਬਕਸੇ ਵਿੱਚ ਇਹ ਇਕਾਈ ਹਟਾਉਣੀ ਹੈ?(_D)"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:533
+#: ../src/calendar/gui/e-cal-dialogs.c:531
 msgid "_Retract comment"
 msgstr "ਟਿੱਪਣੀ ਰੀਟਰੇਸ(_R)"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:688
 msgid "Select Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_T)"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "January"
 msgstr "ਜਨਵਰੀ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "February"
 msgstr "ਫਰਵਰੀ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "March"
 msgstr "ਮਾਰਚ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "April"
 msgstr "ਅਪਰੈਲ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "May"
 msgstr "ਮਈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "June"
 msgstr "ਜੂਨ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "July"
 msgstr "ਜੁਲਾਈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "August"
 msgstr "ਅਗਸਤ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "September"
 msgstr "ਸਤੰਬਰ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "October"
 msgstr "ਅਕਤੂਬਰ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "November"
 msgstr "ਨਵੰਬਰ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:719
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:871
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:875
+#: ../src/calendar/gui/e-cal-dialogs.c:873
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਘਟਨਾ ਲਈ ਪ੍ਰਤੀਨਿਧ ਕਰ ਰਹੇ ਹੋ, ਤੁਸੀਂ ਕੀ ਪ੍ਰਤੀਨਿਧ ਬਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:879
+#: ../src/calendar/gui/e-cal-dialogs.c:877
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਕੰਮ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:883
+#: ../src/calendar/gui/e-cal-dialogs.c:881
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਮੀਮੋ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:909
+#: ../src/calendar/gui/e-cal-dialogs.c:908
 msgid "This Instance Only"
 msgstr "ਇਸ ਮੌਕੇ ਤੇ ਹੀ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:912
 msgid "This and Prior Instances"
 msgstr "ਇਹ ਅਤੇ ਪਹਿਲ ਮੌਕੇ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:918
 msgid "This and Future Instances"
 msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:923
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174
-#: ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Send my reminders with this event"
 msgstr "ਇਸ ਈਵੈਂਟ ਲਈ ਮੇਰੇ ਰੀਮਾਈਂਡਰ ਭੇਜੋ"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176
-#: ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1175
+#: ../src/calendar/gui/e-cal-dialogs.c:1257
 msgid "Notify new attendees _only"
 msgstr "ਕੇਵਲ ਦਰਸ਼ਕਾਂ ਲਈ ਸੂਚਨਾ ਦਿਓ(_o)"
 
-#: ../src/calendar/gui/e-calendar-view.c:464
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Cut selected events to the clipboard"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../src/calendar/gui/e-calendar-view.c:470
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Copy selected events to the clipboard"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/calendar/gui/e-calendar-view.c:476
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Paste events from the clipboard"
 msgstr "ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
 
-#: ../src/calendar/gui/e-calendar-view.c:482
+#: ../src/calendar/gui/e-calendar-view.c:496
 msgid "Delete selected events"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਹਟਾਓ"
 
-#: ../src/calendar/gui/e-calendar-view.c:866
+#: ../src/calendar/gui/e-calendar-view.c:906
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr ""
 
-#: ../src/calendar/gui/e-calendar-view.c:877
-#: ../src/calendar/gui/e-cal-ops.c:1556
-#, fuzzy
+#: ../src/calendar/gui/e-calendar-view.c:917
+#: ../src/calendar/gui/e-cal-ops.c:1567
 #| msgid "Default Calendar Client"
 msgid "Default calendar not found"
-msgstr "ਡਿਫਾਲਟ ਕੈਲੰਡਰ ਕਲਾਇਟ"
+msgstr "ਡਿਫਾਲਟ ਕੈਲੰਡਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/calendar/gui/e-calendar-view.c:882
-#: ../src/calendar/gui/e-cal-ops.c:1559
-#, fuzzy
+#: ../src/calendar/gui/e-calendar-view.c:922
+#: ../src/calendar/gui/e-cal-ops.c:1570
 #| msgid "Default Memo Client"
 msgid "Default memo list not found"
-msgstr "ਡਿਫਾਲਟ ਮੀਮੋ ਕਲਾਇਟ"
+msgstr "ਡਿਫਾਲਟ ਮੀਮੋ ਸੂਚੀ ਨਹੀਂ ਲੱਭੀ"
 
-#: ../src/calendar/gui/e-calendar-view.c:887
-#: ../src/calendar/gui/e-cal-ops.c:1562
-#, fuzzy
+#: ../src/calendar/gui/e-calendar-view.c:927
+#: ../src/calendar/gui/e-cal-ops.c:1573
 #| msgid "Default Task Client"
 msgid "Default task list not found"
-msgstr "ਡਿਫਾਲਟ ਟਾਸਕ ਕਲਾਇਟ"
+msgstr "ਡਿਫਾਲਟ ਕੰਮ ਸੂਚੀ ਨਹੀਂ ਲੱਭੀ"
 
-#: ../src/calendar/gui/e-calendar-view.c:976
+#: ../src/calendar/gui/e-calendar-view.c:1019
 msgid "No suitable component found"
-msgstr ""
+msgstr "ਕੋਈ ਢੁੱਕਵਾਂ ਭਾਗ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/calendar/gui/e-calendar-view.c:1046
-#, fuzzy
+#: ../src/calendar/gui/e-calendar-view.c:1089
 #| msgid "Loading Calendar"
 msgid "Pasting iCalendar data"
-msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਆਈ-ਕੈਲੰਡਰ ਚੇਪਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1854
-#: ../src/calendar/gui/e-memo-table.c:499
-#: ../src/calendar/gui/e-task-table.c:819
+#: ../src/calendar/gui/e-calendar-view.c:1889
+#: ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
 #, c-format
 msgid "Organizer: %s <%s>"
-msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
+msgstr "ਪਰਬੰਧਕ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1858
-#: ../src/calendar/gui/e-memo-table.c:504
-#: ../src/calendar/gui/e-task-table.c:823
+#: ../src/calendar/gui/e-calendar-view.c:1892
+#: ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1874
+#: ../src/calendar/gui/e-calendar-view.c:1911
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:839
-#: ../src/calendar/gui/e-to-do-pane.c:363 ../src/calendar/gui/print.c:3545
+#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1914
-#: ../src/calendar/gui/e-to-do-pane.c:460
+#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2309
-#: ../src/calendar/gui/e-calendar-view.c:2312
-#: ../src/calendar/gui/e-calendar-view.c:2315
-#: ../src/calendar/gui/e-calendar-view.c:2316
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. The string is used for Birthday & Anniversary events where the first year is
+#. know, constructing a summary which also shows how many years the birthday or
+#. anniversary is for. Example: "Birthday: John Doe (13)"
+#: ../src/calendar/gui/e-calendar-view.c:2117
+#, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -7034,14 +7558,14 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-day-view.c:3095
-#: ../src/calendar/gui/e-day-view-top-item.c:865
+#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-day-view.c:3079
+#: ../src/calendar/gui/e-day-view-top-item.c:858
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -7051,16 +7575,16 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:861
+#: ../src/calendar/gui/e-calendar-view.c:2333
+#: ../src/calendar/gui/e-day-view.c:3063
+#: ../src/calendar/gui/e-day-view-top-item.c:854
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2325
-#: ../src/calendar/gui/e-calendar-view.c:2327
-#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -7076,7 +7600,7 @@ msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
 #: ../src/calendar/gui/e-task-table.etspec.h:14
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "ਬਣਾਇਆ"
 
@@ -7093,131 +7617,137 @@ msgstr "ਆਖਰੀ ਸੋਧ"
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../src/calendar/gui/e-cal-model.c:316
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:10
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "ਸਥਿਤੀ"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:11
+#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../src/calendar/gui/e-memo-table.etspec.h:3
+#: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-accounts-window.c:1443
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1997
+#: ../src/e-util/e-webdav-browser.c:2390
+#: ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "ਕਿਸਮ"
+
+#: ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
-#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3560
-#: ../src/modules/itip-formatter/itip-view.c:6382
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
+#: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3395
+#: ../src/modules/itip-formatter/itip-view.c:6440
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/calendar/gui/e-cal-model.c:1417 ../src/calendar/gui/e-cal-ops.c:614
-#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:435
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:615
+#: ../src/calendar/gui/e-cal-ops.c:1252
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1522 ../src/calendar/gui/e-cal-ops.c:186
-#: ../src/calendar/gui/e-cal-ops.c:1367
-#, fuzzy
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
+#: ../src/calendar/gui/e-cal-ops.c:1369
 #| msgid "Create an _Event"
 msgid "Creating an event"
-msgstr "ਈਵੈਂਟ ਬਣਾਓ(_E)"
+msgstr "ਈਵੈਂਟ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-model.c:1526 ../src/calendar/gui/e-cal-ops.c:190
-#: ../src/calendar/gui/e-cal-ops.c:1371
-#, fuzzy
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
+#: ../src/calendar/gui/e-cal-ops.c:1373
 #| msgid "Create a Mem_o"
 msgid "Creating a memo"
-msgstr "ਮੀਮੋ ਬਣਾਓ(_o)"
+msgstr "ਮੀਮੋ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-model.c:1530 ../src/calendar/gui/e-cal-ops.c:194
-#: ../src/calendar/gui/e-cal-ops.c:1375
-#, fuzzy
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
+#: ../src/calendar/gui/e-cal-ops.c:1377
 #| msgid "Create a _Task"
 msgid "Creating a task"
-msgstr "ਟਾਸਕ ਬਣਾਓ(_T)"
+msgstr "ਕੰਮ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-model.c:1913
+#: ../src/calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
-msgstr "ਆਵਿਰਤੀ"
+msgstr "ਮੁੜ-ਵਾਪਰਨ"
 
-#: ../src/calendar/gui/e-cal-model.c:1915
+#: ../src/calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:177
-#: ../src/calendar/gui/e-meeting-store.c:187
-#: ../src/calendar/gui/e-meeting-store.c:1098
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../src/calendar/gui/e-cal-model.c:1918
-#: ../src/calendar/gui/e-cal-model-tasks.c:1144
-#: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "ਨਹੀ"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
-#: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:197
-#: ../src/calendar/gui/e-meeting-store.c:220
-#: ../src/modules/itip-formatter/itip-view.c:6370
+#: ../src/calendar/gui/e-cal-model.c:3787
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:179
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/modules/itip-formatter/itip-view.c:6428
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../src/calendar/gui/e-cal-model.c:3823
-#: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:199
-#: ../src/calendar/gui/e-meeting-store.c:222
-#: ../src/modules/itip-formatter/itip-view.c:6376
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-meeting-store.c:181
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/modules/itip-formatter/itip-view.c:6434
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
 
-#: ../src/calendar/gui/e-cal-model.c:3824
-#: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:201
-#: ../src/calendar/gui/e-meeting-store.c:224
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-meeting-store.c:183
+#: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
-#: ../src/calendar/gui/e-cal-model.c:3825
-#: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:203
-#: ../src/calendar/gui/e-meeting-store.c:226
-#: ../src/modules/itip-formatter/itip-view.c:6379
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-meeting-store.c:185
+#: ../src/calendar/gui/e-meeting-store.c:208
+#: ../src/modules/itip-formatter/itip-view.c:6437
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
-#: ../src/calendar/gui/e-cal-model.c:3826
+#: ../src/calendar/gui/e-cal-model.c:3791
 msgid "Needs action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3881
-#: ../src/calendar/gui/e-meeting-list-view.c:700
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../src/calendar/gui/e-task-table.etspec.h:11
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "ਸਥਿਤੀ"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:144
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
+#: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "ਵੇਹਲਾ"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:147
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:608
+#: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:466
+#: ../src/calendar/gui/e-cal-model-tasks.c:458
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7227,230 +7757,220 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:518
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
+#: ../src/calendar/gui/e-cal-model-tasks.c:555
+msgid "In Progress"
+msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:305
+#: ../src/calendar/gui/e-cal-ops.c:311
 msgid "Modifying an event"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:309
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:315
 #| msgid "Loading memos"
 msgid "Modifying a memo"
-msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
+msgstr "ਮੀਮੋ ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:313
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:319
 #| msgid "Loading tasks"
 msgid "Modifying a task"
-msgstr "ਟਾਸਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
+msgstr "ਕੰਮ ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:417 ../src/calendar/gui/e-to-do-pane.c:2074
 #| msgid "Removing attachments"
 msgid "Removing an event"
-msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨਅਟੈਚਮੈਂਟ hਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹ"
+msgstr "ਈਵੈਂਟ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:421 ../src/calendar/gui/e-to-do-pane.c:2078
 #| msgid "Removing attachments"
 msgid "Removing a memo"
-msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨਅਟੈਚਮੈਂਟ hਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹ"
+msgstr "ਮੀਮੋ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:425 ../src/calendar/gui/e-to-do-pane.c:2082
 #| msgid "Removing attachments"
 msgid "Removing a task"
-msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨਅਟੈਚਮੈਂਟ hਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹ"
+msgstr "ਕੰਮ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:513
+#, c-format
 #| msgid "Meeting information sent"
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
-msgstr[0] "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
-msgstr[1] "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
+msgstr[0] "ਈਵੈਂਟ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਈਵੈਂਟ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:515
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:517
+#, c-format
 #| msgid "Delete Memo"
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
-msgstr[0] "ਮੀਮੋ ਹਟਾਓ"
-msgstr[1] "ਮੀਮੋ ਹਟਾਓ"
+msgstr[0] "ਮੀਮੋ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਮੀਮੋ ਹਟਾਇਆ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:519
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:521
+#, c-format
 #| msgid "Delete Task"
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
-msgstr[0] "ਟਾਸਕ ਹਟਾਓ"
-msgstr[1] "ਟਾਸਕ ਹਟਾਓ"
+msgstr[0] "ਕੰਮ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਕੰਮ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:722
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:727
+#, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
-msgstr[0] "ਇਹ ਈਵੈਂਟ ਪਰਿੰਟ ਕਰੋ"
-msgstr[1] "ਇਹ ਈਵੈਂਟ ਪਰਿੰਟ ਕਰੋ"
+msgstr[0] "ਈਵੈਂਟ ਚੇਪਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਈਵੈਂਟ ਚੇਪੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:737
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:742
+#, c-format
 #| msgid "Loading memos"
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
-msgstr[0] "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
-msgstr[1] "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
+msgstr[0] "ਮੀਮੋ ਚੇਪਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਮੀਮੋ ਚੇਪੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:752
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:757
+#, c-format
 #| msgid "Loading tasks"
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
-msgstr[0] "ਟਾਸਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
-msgstr[1] "ਟਾਸਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
+msgstr[0] "ਕੰਮ ਚੇਪਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਕੰਮ ਚੇਪੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:853
 #| msgid "Updating objects"
 msgid "Updating an event"
-msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਈਵੈਂਟ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:857
 #| msgid "Updating objects"
 msgid "Updating a memo"
-msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਮੀਮੋ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:859
-#, fuzzy
+#: ../src/calendar/gui/e-cal-ops.c:861
 #| msgid "Updating objects"
 msgid "Updating a task"
-msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਕੰਮ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:967
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:974
+#, c-format
 #| msgid "Permission denied to open the calendar"
 msgid "Getting events to purge in the calendar “%s”"
-msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ"
+msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:971
+#: ../src/calendar/gui/e-cal-ops.c:978
 #, fuzzy, c-format
 #| msgid "Moving a memo into the memo list '{0}'"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:975
+#: ../src/calendar/gui/e-cal-ops.c:982
 #, fuzzy, c-format
 #| msgid "Moving a task into the task list '{0}'"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1001
+#: ../src/calendar/gui/e-cal-ops.c:1008
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar '{0}'"
 msgid "Purging events in the calendar “%s”"
 msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1005
+#: ../src/calendar/gui/e-cal-ops.c:1012
 #, fuzzy, c-format
 #| msgid "Moving a memo into the memo list '{0}'"
 msgid "Purging memos in the memo list “%s”"
 msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1009
+#: ../src/calendar/gui/e-cal-ops.c:1016
 #, fuzzy, c-format
 #| msgid "Moving a task into the task list '{0}'"
 msgid "Purging tasks in the task list “%s”"
 msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1111
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1115
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1117
+#: ../src/calendar/gui/e-cal-ops.c:1119
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/calendar/gui/e-cal-ops.c:1219
+#: ../src/calendar/gui/e-cal-ops.c:1221
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2060
+#: ../src/calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ਈਵੈਂਟ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਈਵੈਂਟ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2061
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:2070
+#, c-format
 #| msgid "Copying Items"
 msgid "Copying an event"
 msgid_plural "Copying %d events"
-msgstr[0] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
-msgstr[1] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
+msgstr[0] "ਈਵੈਂਟ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਈਵੈਂਟ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2067
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:2076
+#, c-format
 #| msgid "Moving Items"
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
-msgstr[0] "ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-msgstr[1] "ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+msgstr[0] "ਮੀਮੋ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਮੀਮੋ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2068
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:2077
+#, c-format
 #| msgid "Copying Items"
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
-msgstr[0] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
-msgstr[1] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
+msgstr[0] "ਮੀਮੋ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਮੀਮੋ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2074
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:2083
+#, c-format
 #| msgid "Moving Items"
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
-msgstr[0] "ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-msgstr[1] "ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+msgstr[0] "ਕੰਮ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਕੰਮ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/calendar/gui/e-cal-ops.c:2075
-#, fuzzy, c-format
+#: ../src/calendar/gui/e-cal-ops.c:2084
+#, c-format
 #| msgid "Copying Items"
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
-msgstr[0] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
-msgstr[1] "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
+msgstr[0] "ਕੰਮ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr[1] "%d ਕੰਮ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7461,198 +7981,181 @@ msgstr ""
 "%s"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:100
-#, fuzzy
 #| msgid "Event's start time is in the past"
 msgid "Event’s time is in the past"
-msgstr "ਈਵੈਂਟ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
+msgstr "ਈਵੈਂਟ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ ਵਿੱਚ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:206
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 #| msgid "Event cannot be edited, because the selected calendar is read only"
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
-msgstr "ਈਵੈਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਕੈਲੰਡਰ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ।"
+msgstr "ਈਵੈਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:208
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ਈਵੈਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਕੈਲੰਡਰ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ।"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:214
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ਈਵੈਂਟ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:460
-#: ../src/calendar/gui/e-comp-editor-task.c:546
-#| msgid "File is not a valid .desktop file"
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "ਸ਼ੁਰੂ ਮਿਤੀ ਠੀਕ ਮਿਤੀ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:462
-#| msgid "File is not a valid .desktop file"
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "Start time is not a valid time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ ਠੀਕ ਸਮਾਂ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:466
-#: ../src/calendar/gui/e-comp-editor-event.c:482
+#: ../src/calendar/gui/e-comp-editor-event.c:512
+#: ../src/calendar/gui/e-comp-editor-event.c:528
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:337
-#: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/e-util/e-misc-utils.c:4202 ../src/e-util/e-misc-utils.c:4214
-#: ../src/e-util/e-misc-utils.c:4228 ../src/mail/e-mail-autoconfig.c:998
-#: ../src/mail/e-mail-display.c:2292 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3969 ../src/mail/em-composer-utils.c:4000
-#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:97
+#: ../src/e-util/e-misc-utils.c:4262 ../src/e-util/e-misc-utils.c:4274
+#: ../src/e-util/e-misc-utils.c:4288 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2376 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3838 ../src/mail/em-composer-utils.c:3869
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1221
-#: ../src/shell/e-shell.c:1245 ../src/smime/gui/certificate-manager.c:357
+#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
 #, c-format
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:476
-#| msgid "File is not a valid .desktop file"
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 msgid "End date is not a valid date"
 msgstr "ਅੰਤ ਮਿਤੀ ਠੀਕ ਮਿਤੀ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:478
-#| msgid "File is not a valid .desktop file"
+#: ../src/calendar/gui/e-comp-editor-event.c:524
 msgid "End time is not a valid time"
 msgstr "ਅੰਤ ਸਮਾਂ ਠੀਕ ਸਮਾਂ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:677
+#: ../src/calendar/gui/e-comp-editor-event.c:726
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:651
+#: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "ਕੈਟਾਗਰੀ(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:679
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:653
+#: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਝਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:685
-#: ../src/calendar/gui/e-comp-editor-task.c:659
+#: ../src/calendar/gui/e-comp-editor-event.c:734
+#: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:687
-#: ../src/calendar/gui/e-comp-editor-task.c:661
+#: ../src/calendar/gui/e-comp-editor-event.c:736
+#: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:693
+#: ../src/calendar/gui/e-comp-editor-event.c:742
 msgid "All _Day Event"
 msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_D)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:695
+#: ../src/calendar/gui/e-comp-editor-event.c:744
 msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:701
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Show Time as _Busy"
 msgstr "ਸਮਾਂ ਰੁਝੇ ਵਾਂਗ ਵੇਖਾਓ(_B)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:703
+#: ../src/calendar/gui/e-comp-editor-event.c:752
 msgid "Toggles whether to show time as busy"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "Pu_blic"
 msgstr "ਪਬਲਿਕ(_b)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as public"
 msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-event.c:768
 msgid "_Private"
 msgstr "ਨਿੱਜੀ(_P)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-event.c:770
 msgid "Classify as private"
 msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
+#: ../src/calendar/gui/e-comp-editor-event.c:775
 msgid "_Confidential"
 msgstr "ਗੁਪਤ(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
+#: ../src/calendar/gui/e-comp-editor-event.c:777
 msgid "Classify as confidential"
 msgstr "ਗੁਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:846
-#| msgid "_Start time:"
+#: ../src/calendar/gui/e-comp-editor-event.c:895
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:851
-#| msgid "_End time:"
+#: ../src/calendar/gui/e-comp-editor-event.c:900
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ(_E):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:861
-#| msgid "All _Day Event"
+#: ../src/calendar/gui/e-comp-editor-event.c:910
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_y)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:919
-#: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:829
-#| msgid "General"
+#: ../src/calendar/gui/e-comp-editor-event.c:978
+#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:922
-#: ../src/calendar/gui/e-comp-editor-task.c:852
-#| msgid "Reminders"
+#: ../src/calendar/gui/e-comp-editor-event.c:981
+#: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "ਰੀਮਾਈਂਡਰ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:925
-#: ../src/calendar/gui/e-comp-editor-task.c:856
-#| msgid "Recurrence"
+#: ../src/calendar/gui/e-comp-editor-event.c:984
+#: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:928
-#: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:860
-#| msgid "Attachments"
+#: ../src/calendar/gui/e-comp-editor-event.c:987
+#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "ਨੱਥੀ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:938
-#| msgid "Shell Module"
+#: ../src/calendar/gui/e-comp-editor-event.c:997
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "ਸੈਡਿਊਲ"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-event.c:1032
 #, c-format
-#| msgid "Meeting - %s"
 msgid "Meeting — %s"
 msgstr "ਮੀਟਿੰਗ — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-event.c:1033
 #, c-format
-#| msgid "Appointment - %s"
 msgid "Appointment — %s"
 msgstr "ਮੁਲਾਕਾਤ — %s"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:96
-#, fuzzy
 #| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
-msgstr "ਮੀਮੋ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਮੀਮੋ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
+msgstr "ਮੀਮੋ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਚੁਣੀ ਮੀਮੋ ਸੂਚੀ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀਆਂ"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:98
 msgid "Memo cannot be edited, because the selected memo list is read only"
@@ -7663,26 +8166,23 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ਮੀਮੋ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:760
+#: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "ਲਿਸਟ(_L):"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:770
-#| msgid "Sta_rt date:"
+#: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ(_r):"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:256
+#: ../src/calendar/gui/e-comp-editor-memo.c:266
 #, c-format
-#| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "ਜਾਰੀ ਕੀਤੇ ਮੀਮੋ — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:257
+#: ../src/calendar/gui/e-comp-editor-memo.c:267
 #, c-format
-#| msgid "Memo - %s"
 msgid "Memo — %s"
 msgstr "ਮੀਮੋ — %s"
 
@@ -7700,7 +8200,6 @@ msgstr[1] "ਅਟੈਚਮੈਂਟ"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
 #: ../src/e-util/e-attachment.c:2469
 #, c-format
-#| msgid "Could not load '%s'"
 msgid "Could not load “%s”"
 msgstr "“%s“ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
@@ -7710,7 +8209,7 @@ msgstr "“%s“ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 msgid "Could not load the attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in "
@@ -7723,58 +8222,57 @@ msgstr ""
 " ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ "
 "ਸਕਦਾ ਹੈ।"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
 #: ../src/composer/e-composer-actions.c:312
-msgid "_Attachment..."
-msgstr "ਨੱਥੀ(_A)..."
+#| msgid "_Attachments"
+msgid "_Attachment…"
+msgstr "ਅਟੈਚਮੈਂਟ(_A)…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
 #: ../src/composer/e-composer-actions.c:314
 #: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਅਟੈਚ ਕਰੋ"
+msgstr "ਫਾਇਲ ਅਟੈਚ ਕਰੋ"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
-#| msgid "Attachments"
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
 msgid "_Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
-#| msgid "Show Attachments"
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
 msgid "Show attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਵੇਖਾਓ"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "ਆਈਕਾਨ ਝਲਕ"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "ਲਿਸਟ ਝਲਕ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:387
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:394
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -7782,117 +8280,116 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 msgstr[1] "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:510
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
 msgid "Organizer address is not a valid user mail address"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:675
-#| msgid "Attendees"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "A_ttendees"
 msgstr "ਦਰਸ਼ਕ(_t)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:677
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 #, fuzzy
 #| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਕ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:686
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "R_ole Field"
 msgstr "ਰੋਲ ਖੇਤਰ(_O)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:688
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:694
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:696
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:702
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:704
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:710
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
 msgid "_Type Field"
 msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਕ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
 msgid ""
 "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
 msgid ""
 "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
-#| msgid "Atte_ndees..."
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#| msgid "Atte_ndees"
 msgctxt "ECompEditor"
-msgid "Atte_ndees..."
-msgstr "ਦਰਸ਼ਕ(_n)..."
+msgid "Atte_ndees…"
+msgstr "ਦਰਸ਼ਕ(_n)…"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor.c:2113
 #: ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:954
+#: ../src/e-util/e-html-editor-actions.c:1013
 #: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:175
+#: ../src/e-util/e-webdav-browser.c:2690 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:217
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:843
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1045 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
 msgid "Add exception"
-msgstr "ਅਪਵਾਦ ਸ਼ਾਮਲ"
+msgstr "ਅਪਵਾਦ ਜੋੜੋ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
 msgid "Modify exception"
-msgstr "ਅਪਵਾਦ ਸੋਧ"
+msgstr "ਅਪਵਾਦ ਸੋਧੋ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
 msgid "on"
 msgstr "ਚਾਲੂ"
 
@@ -7900,8 +8397,7 @@ msgstr "ਚਾਲੂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
-#| msgid "first"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
@@ -7911,8 +8407,7 @@ msgstr "ਪਹਿਲਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
-#| msgid "second"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "ਦੂਜਾ"
@@ -7921,8 +8416,7 @@ msgstr "ਦੂਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
-#| msgid "third"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "ਤੀਜਾ"
@@ -7931,8 +8425,7 @@ msgstr "ਤੀਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
-#| msgid "fourth"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "ਚੌਥਾ"
@@ -7941,8 +8434,7 @@ msgstr "ਚੌਥਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
-#| msgid "fifth"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "ਪੰਜਵਾਂ"
@@ -7951,16 +8443,14 @@ msgstr "ਪੰਜਵਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
-#| msgid "last"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "ਆਖਰੀ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
-#| msgid "Other Date"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
@@ -7969,8 +8459,7 @@ msgstr "ਹੋਰ ਮਿਤੀ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
-#| msgid "1st to 10th"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
@@ -7979,8 +8468,7 @@ msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
-#| msgid "11th to 20th"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
@@ -7989,8 +8477,7 @@ msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
-#| msgid "21st to 31st"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "੨੧ਵੇਂ ਤੋਂ ੩੧ਵਾਂ"
@@ -7998,51 +8485,42 @@ msgstr "੨੧ਵੇਂ ਤੋਂ ੩੧ਵਾਂ"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
-#| msgid "day"
-#| msgid_plural "days"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "ਦਿਨ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
-#| msgid "Monday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
-#| msgid "Tuesday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
-#| msgid "Wednesday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
-#| msgid "Thursday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
-#| msgid "Friday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
-#| msgid "Saturday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
-#| msgid "Sunday"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
@@ -8050,611 +8528,522 @@ msgstr "ਐਤਵਾਰ"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
-#| msgid "on the"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
-#| msgid "occurrences"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2023
-#| msgid "This appointment rec_urs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "ਇਹ ਮੁਲਾਕਾਤ ਮੁੜ ਹੈ(_u)"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
-#| msgid "This task recurs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "ਇਹ ਕੰਮ ਫੇਰ ਹੋਵੇਗਾ(_u)"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
-#| msgid "This memo recurs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ(_ u)"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
-#| msgid "This appointment rec_urs"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "ਇਹ ਭਾਗ ਮੁੜ ਹੈ(_u)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "ਆਵਰਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
 #, fuzzy
 #| msgid "End time of the recurrence was before event's start"
 msgid "End time of the recurrence is before the start"
 msgstr "ਮੁੜ-ਹੋਣ ਦਾ ਸਮਾਂ ਈਵੈਂਟ ਸ਼ੁਰੂ ਹੋਣ ਦੇ ਸਮੇਂ ਤੋਂ ਪਹਿਲਾਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
-#| msgid "Recurrence"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "R_ecurrence"
 msgstr "ਦੁਹਰਾਓ(_e)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
 #, fuzzy
 #| msgid "It has recurrences."
 msgid "Set or unset recurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ।"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
-#| msgid "Every"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "ਹਰੇਕ"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
-#| msgid "day(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
 msgctxt "ECompEditorPageRecur"
 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
-#| msgctxt "recurrpage"
-#| msgid "week(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
 msgctxt "ECompEditorPageRecur"
 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
-#| msgctxt "recurrpage"
-#| msgid "month(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 msgctxt "ECompEditorPageRecur"
 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
-#| msgctxt "recurrpage"
-#| msgid "year(s)"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
-#| msgctxt "eventpage"
-#| msgid "for"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 msgctxt "ECompEditorPageRecur"
 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
-#| msgctxt "eventpage"
-#| msgid "until"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 msgctxt "ECompEditorPageRecur"
 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])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
-#| msgctxt "recurrpage"
-#| msgid "forever"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2158
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 msgid "Exceptions"
 msgstr "ਛੋਟ"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
-#: ../src/mail/e-mail-config-identity-page.c:853
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/mail/e-mail-config-identity-page.c:854
 #: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
 #: ../src/mail/mail-config.ui.h:69
-#| msgid "_Remove"
 msgid "Re_move"
 msgstr "ਹਟਾਓ(_m)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
 msgid "Preview"
 msgstr "ਝਲਕ"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:39
-#| msgid "Send To:"
 msgid "Send To"
 msgstr "ਨੂੰ ਭੇਜੋ"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
 msgid "_Reminders"
 msgstr "ਰੀਮਾਈਂਡਰ(_R)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਰੀਮਾਈਂਡਰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰੋ"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Reminders"
-msgstr "ਰੀਮਾਈਂਡਰ"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1639
-msgid "_Reminder"
-msgstr "ਰੀਮਾਈਂਡਰ(_R)"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1672
-#, c-format
-#| msgid "%d day ago"
-#| msgid_plural "%d days ago"
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1679
-#, c-format
-#| msgid "%d hour before appointment"
-#| msgid_plural "%d hours before appointment"
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1686
-#, c-format
-#| msgid "%d minute before appointment"
-#| msgid_plural "%d minutes before appointment"
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
-
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
-#| msgid "15 minutes"
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "੧੫ ਮਿੰਟ ਪਹਿਲਾਂ"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1698
-#| msgid "1 hour ago"
-#| msgid_plural "%d hours ago"
+#. Translators: This constructs predefined reminder's description, for example "15 minutes before",
+#. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
+#. "2 days 13 hours 1 minute before".
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#, c-format
+#| msgid "is before"
 msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "੧ ਘੰਟਾ ਪਹਿਲਾਂ"
+msgid "%s before"
+msgstr "%s ਪਹਿਲਾਂ"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1700
-#| msgid "is before"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#| msgid "%s attachment"
 msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "੧ ਦਿਨ ਪਹਿਲਾਂ"
+msgid "at the start"
+msgstr "ਸ਼ੁਰੂ ਸਮੇਂ"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1712
-#| msgid "Custom"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "ਪਸੰਦੀਦਾ"
 
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+msgid "Set a custom predefined time to"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "da_ys"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#| msgctxt "cal-reminders"
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "_hours"
+msgstr "ਘੰਟੇ(_h)"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#| msgctxt "cal-reminders"
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "_minutes"
+msgstr "ਮਿੰਟ(_m)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+#| msgid "_End time:"
+msgid "_Add time"
+msgstr "ਸਮਾਂ ਜੋੜੋ(_A)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Reminders"
+msgstr "ਰੀਮਾਈਂਡਰ"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+msgid "_Reminder"
+msgstr "ਰੀਮਾਈਂਡਰ(_R)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+msgid "Add custom predefined time"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+msgid "Remove custom predefined times"
+msgstr ""
+
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1855
-#| msgid "minute(s)"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "ਮਿੰਟ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1857
-#| msgid "hour(s)"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "ਘੰਟੇ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1859
-#| msgid "day(s)"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "ਦਿਨ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1876
-#| msgid "before"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "ਪਹਿਲਾਂ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
-#| msgid "after"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "ਬਾਅਦ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
-#| msgid "Start"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "ਸ਼ੁਰੂ"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1896
-#| msgid "_Send"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "ਅੰਤ"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1915
-#| msgid "_Repeat the reminder"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 msgid "Re_peat the reminder"
 msgstr "ਰੀਮਾਈਂਡਰ ਦੁਹਰਾਓ(_p)"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1940
-#| msgid "extra times every"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "ਹੋਰ ਵਾਧੂ ਸਮਾਂ"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1977
-#| msgid "minutes"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
-#| msgid "hours"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "ਘੰਟੇ"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1981
-#| msgid "days"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "ਦਿਨ"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2175
-#| msgid "Custom _message"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹਾ(_m)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2062
-#| msgid "Custom reminder sound"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "ਪਸੰਦੀਦਾ ਰੀਮਾਈਂਡਰ ਸਾਊਂਡ(_s)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2073
-#| msgid "Select sound file"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgid "Select a sound file"
 msgstr "ਸਾਊਂਡ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
 msgid "_Program:"
 msgstr "ਪ੍ਰੋਗਰਾਮ(_P):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
 msgid "_Arguments:"
 msgstr "ਆਰਗੂਮਿੰਟ(_A):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2158
-#| msgid "Send To:"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
 msgid "_Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
-#| msgid "Shell Module"
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
 msgid "_Schedule"
 msgstr "ਮੋਡੀਊਲ(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
 msgid "Query free / busy information for the attendees"
 msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
-#| msgid "_Summary:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "ਸੰਖੇਪ(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
-#| msgid "_Location:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
-#| msgid "Ca_tegories..."
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
+#| msgid "_Categories"
 msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "ਕੈਟਾਗਰੀ(_C)..."
+msgid "_Categories…"
+msgstr "ਕੈਟਾਗਰੀ(_C)…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
-#| msgid "_Description:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "ਵੇਰਵਾ(_D):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
-#| msgid "_Web Page:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "ਵੈਬ ਸਫ਼ਾ(_W):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
-#| msgid "D_ue date:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "ਮਿਆਦ(_u):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
-#| msgid "Date _completed:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "ਪੂਰਾ ਹੋਣ ਮਿਤੀ(_c):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
-#| msgid "Public"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "ਪਬਲਿਕ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
-#| msgid "Private"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
-#| msgid "Confidential"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
-#| msgid "C_lassification:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "ਵਰਗੀਕਰਨ(_l):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
-#| msgid "Not Started"
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
-#| msgid "In Progress"
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
-#| msgid "Completed"
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "ਸਮਾਪਤ"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
-#| msgid "Cancelled"
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "ਰੱਦ ਕੀਤਾ"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
-#| msgid "_Status:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "ਹਾਲਤ(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
-#| msgid "Undefined"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
-#| msgid "High"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "ਉੱਚ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
-#| msgid "Normal"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
-#| msgid "Low"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "ਘੱਟ"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
-#| msgid "Priorit_y:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "ਤਰਜੀਹ(_y):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
-#| msgid "_Percent complete:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "ਫੀਸਦੀ ਮੁਕੰਮਲ:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
-#| msgid "Time _zone:"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "ਸਮਾਂ ਖੇਤਰ(_z):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
-#| msgid "Show Time as _Busy"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "ਸਮਾਂ ਰੁਝੇ ਵਾਂਗ ਵੇਖਾਓ(_b)"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
-#| msgid "None"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1960
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:241
-#| msgid "Task's start date is in the past"
+#: ../src/calendar/gui/e-comp-editor-task.c:281
 msgid "Task’s start date is in the past"
 msgstr "ਟਾਸਕ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:249
-#| msgid "Task's due date is in the past"
+#: ../src/calendar/gui/e-comp-editor-task.c:289
 msgid "Task’s due date is in the past"
 msgstr "ਟਾਸਕ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:485
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-task.c:530
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid ""
 "Task cannot be edited, because the selected task list could not be opened"
-msgstr "ਟਾਸਕ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
+msgstr "ਮੀਮੋ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਸੂਚੀ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:487
+#: ../src/calendar/gui/e-comp-editor-task.c:532
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ਟਾਸਕ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:489
+#: ../src/calendar/gui/e-comp-editor-task.c:534
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ਟਾਸਕ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:560
+#: ../src/calendar/gui/e-comp-editor-task.c:605
 msgid "Start date is required for recurring tasks"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-task.c:572
-#| msgid "File is not a valid .desktop file"
+#: ../src/calendar/gui/e-comp-editor-task.c:621
 msgid "Due date is not a valid date"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਠੀਕ ਮਿਤੀ ਨਹੀਂ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:583
-#| msgid "Completed date is wrong"
+#: ../src/calendar/gui/e-comp-editor-task.c:632
 msgid "Completed date is not a valid date"
 msgstr "ਪੂਰਾ ਕਰਨ ਮਿਤੀ ਠੀਕ ਮਿਤੀ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:594
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-task.c:643
 #| msgid "1 minute in the future"
 #| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
-msgstr "ਆਉਣ ਵਾਲਾ ੧ ਮਿੰਟ"
+msgstr "ਪੂਰਾ ਕਰਨ ਮਿਤੀ ਭਵਿੱਖ ਵਿੱਚ ਨਹੀਂਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:667
-#| msgid "All _Day Event"
+#: ../src/calendar/gui/e-comp-editor-task.c:720
 msgid "All _Day Task"
 msgstr "ਸਭ ਦਿਨ ਦਾ ਕੰਮ(_D)"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:669
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor-task.c:722
 #| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
+msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੇ ਕੰਮ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:893
+#: ../src/calendar/gui/e-comp-editor-task.c:946
 #, c-format
-#| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "ਮਿਲੇ ਕੰਮ — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:894
+#: ../src/calendar/gui/e-comp-editor-task.c:947
 #, c-format
-#| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "ਕੰਮ — %s"
 
 #: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
 msgid "attachment"
 msgstr "ਅਟੈਚਮੈਂਟ"
 
 #  FIXME: domain/code
-#: ../src/calendar/gui/e-comp-editor.c:607
-#, fuzzy
+#: ../src/calendar/gui/e-comp-editor.c:610
 #| msgid "Send _updates to attendees"
-msgid "Sending notifications to attendees..."
-msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
+msgid "Sending notifications to attendees…"
+msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਸੂਚਨਾ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ…"
 
-#: ../src/calendar/gui/e-comp-editor.c:996
+#: ../src/calendar/gui/e-comp-editor.c:985
+#: ../src/e-util/e-webdav-browser.c:1818
 #| msgid "_Save Changes"
-msgid "Saving changes..."
-msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ..."
+msgid "Saving changes…"
+msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1256
+#: ../src/calendar/gui/e-comp-editor.c:1245
 msgid "No Summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984
+#: ../src/calendar/gui/e-comp-editor.c:2027
 #: ../src/composer/e-composer-actions.c:319
 #: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
@@ -8662,157 +9051,159 @@ msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:131 ../src/mail/e-mail-notes.c:964
-#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1172
-#: ../src/mail/em-subscription-editor.c:1739
+#: ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758
+#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1741
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:882
 #: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:1986
+#: ../src/calendar/gui/e-comp-editor.c:2029
 msgid "Close the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:138
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:845
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:969 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:469 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
 msgid "_Copy"
 msgstr "ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
-#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
-#: ../src/e-util/e-web-view.c:2075 ../src/mail/e-mail-browser.c:140
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:471
+#: ../src/e-util/e-web-view.c:2044 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Copy the selection"
 msgstr "ਚੁਣੇ ਦੀ ਕਾਪੀ ਕਰੋ"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:852
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:976 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
 msgid "Cu_t"
 msgstr "ਕੱਟੋ(_t)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
-#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2084
-#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:854
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2053
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
 msgid "Cut the selection"
 msgstr "ਚੁਣੇ ਕੱਟੋ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
-#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
+#: ../src/shell/e-shell-window-actions.c:919
 msgid "Delete the selection"
 msgstr "ਚੁਣੇ ਹਟਾਓ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2014
+#: ../src/calendar/gui/e-comp-editor.c:2057
 msgid "View help"
 msgstr "ਮੱਦਦ ਵੇਖੋ"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:880
-#| msgid "Paste"
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:983 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
 msgid "_Paste"
 msgstr "ਚੇਪੋ(_P)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
-#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2093
-#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:882
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2062
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
 msgid "Paste the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਚੇਪੋ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2717
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2749
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
-msgid "_Print..."
-msgstr "ਪਰਿੰਟ ਕਰੋ(_P)..."
+#| msgid "_Print"
+msgid "_Print…"
+msgstr "ਪਰਿੰਟ ਕਰੋ(_P)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
 #| msgid "Preview"
-msgid "Pre_view..."
-msgstr "ਝਲਕ(_v)..."
+msgid "Pre_view…"
+msgstr "ਝਲਕ(_v)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
-#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:997 ../src/e-util/e-web-view.c:486
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1008
 msgid "Select _All"
 msgstr "ਸਭ ਚੁਣੋ(_A)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
-#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:952
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1010
 msgid "Select all text"
 msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2063
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "_Classification"
 msgstr "ਵਰਗੀਕਰਨ(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077
-#: ../src/e-util/e-html-editor-actions.c:961
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:168
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:987
+#: ../src/calendar/gui/e-comp-editor.c:2120
+#: ../src/e-util/e-html-editor-actions.c:1020
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1052
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091
-#: ../src/e-util/e-html-editor-actions.c:982
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/e-util/e-html-editor-actions.c:1041
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098
+#: ../src/calendar/gui/e-comp-editor.c:2141
 #: ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "ਚੋਣ(_O)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:182
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/e-util/e-html-editor-actions.c:1062 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1095
 #: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2117
+#: ../src/calendar/gui/e-comp-editor.c:2160
 msgid "Save current changes"
 msgstr "ਮੌਜੂਦਾ ਬਦਲਾਅ ਸੰਭਾਲੋ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2122
+#: ../src/calendar/gui/e-comp-editor.c:2165
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2124
+#: ../src/calendar/gui/e-comp-editor.c:2167
 msgid "Save current changes and close editor"
 msgstr "ਮੌਜੂਦਾ ਬਦਲਾਅ ਸੰਭਾਲੋ ਅਤੇ ਐਡੀਟਰ ਬੰਦ ਕਰੋ"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
-#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
-#: ../src/calendar/gui/print.c:2655
+#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
+#: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
-#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
-#: ../src/calendar/gui/print.c:2657
+#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
+#: ../src/calendar/gui/print.c:2685
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
@@ -8822,15 +9213,15 @@ msgstr "ਸ਼ਾਮ"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:857
+#: ../src/calendar/gui/e-day-view.c:3046
+#: ../src/calendar/gui/e-day-view-top-item.c:850
 #: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2102
+#: ../src/calendar/gui/print.c:2117
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3790
+#: ../src/calendar/gui/e-day-view.c:3787
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
@@ -8841,29 +9232,30 @@ msgstr "ਹਫ਼ਤਾ %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
 msgid "Show the second time zone"
 msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:333
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
-msgstr "ਚੁਣੋ..."
+#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-timezone-entry.c:346
+#: ../src/modules/calendar/e-calendar-preferences.c:393
+#| msgid "Select"
+msgid "Select…"
+msgstr "ਚੁਣੋ…"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
@@ -8888,100 +9280,91 @@ msgstr "ਦਰਸ਼ਕ"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1253
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1254
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1255
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1269
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "ਲੋੜੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1271
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1272
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:195
-#: ../src/calendar/gui/e-meeting-store.c:218
-#: ../src/calendar/gui/e-meeting-store.c:1105
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:631
-msgid "Attendee                          "
-msgstr "ਦਰਸ਼ਕ                          "
-
-#: ../src/calendar/gui/e-meeting-list-view.c:657
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../src/calendar/gui/e-memo-table.etspec.h:3
-#: ../src/calendar/gui/e-task-table.etspec.h:3
-#: ../src/e-util/e-accounts-window.c:1443
-#: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1934
-#: ../src/e-util/e-webdav-browser.c:2381
-#: ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "ਕਿਸਮ"
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:686
+#: ../src/calendar/gui/e-meeting-list-view.c:678
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../src/calendar/gui/e-meeting-store.c:207
-#: ../src/calendar/gui/e-meeting-store.c:230
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
-#: ../src/calendar/gui/e-meeting-store.c:1976
+#: ../src/calendar/gui/e-meeting-store.c:2003
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "%s ਸਰਵਰ ਉੱਤੇ %s ਯੂਜ਼ਰ ਵਜੋਂ ਵੇਹਲ/ਰੁੱਝੇ ਜਾਣਕਾਰੀ ਲੈਣ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
+msgstr "%s ਸਰਵਰ ਉੱਤੇ %s ਵਰਤੋਂਕਾਰ ਵਜੋਂ ਵੇਹਲ/ਰੁੱਝੇ ਜਾਣਕਾਰੀ ਲੈਣ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../src/calendar/gui/e-meeting-store.c:1986
+#: ../src/calendar/gui/e-meeting-store.c:2013
 #, c-format
 msgid "Failure reason: %s"
 msgstr "ਫੇਲ੍ਹ ਹੋਣ ਦਾ ਕਾਰਨ: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1991
-#: ../src/e-util/e-collection-account-wizard.c:470
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8996,8 +9379,9 @@ msgid "No Information"
 msgstr "ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-msgid "Atte_ndees..."
-msgstr "ਦਰਸ਼ਕ(_N)..."
+#| msgid "Atte_ndees"
+msgid "Atte_ndees…"
+msgstr "ਦਰਸ਼ਕ(_n)…"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
@@ -9061,7 +9445,7 @@ msgstr ""
 "ਟਿਕਾਣਾ: %s"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:2578
-#: ../src/calendar/gui/print.c:3534
+#: ../src/calendar/gui/print.c:3616
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
@@ -9090,41 +9474,41 @@ msgstr "ਆਮ ਨਾਂ"
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../src/calendar/gui/e-memo-table.c:461
-#: ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:535
+#: ../src/calendar/gui/e-task-table.c:700
 msgid "* No Summary *"
 msgstr "* ਸੰਖੇਪ ਨਹੀਂ *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:546
-#: ../src/calendar/gui/e-task-table.c:879
+#: ../src/calendar/gui/e-memo-table.c:622
+#: ../src/calendar/gui/e-task-table.c:801
 msgid "Start: "
 msgstr "ਸ਼ੁਰੂ:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:566
-#: ../src/calendar/gui/e-task-table.c:898
+#: ../src/calendar/gui/e-memo-table.c:642
+#: ../src/calendar/gui/e-task-table.c:834
 msgid "Due: "
 msgstr "ਬਾਕੀ:"
 
-#: ../src/calendar/gui/e-memo-table.c:775
+#: ../src/calendar/gui/e-memo-table.c:850
 msgid "Cut selected memos to the clipboard"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/calendar/gui/e-memo-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:856
 msgid "Copy selected memos to the clipboard"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/calendar/gui/e-memo-table.c:787
+#: ../src/calendar/gui/e-memo-table.c:862
 msgid "Paste memos from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਮੀਮੋ ਚੇਪੋ"
 
-#: ../src/calendar/gui/e-memo-table.c:793
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:574
+#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "ਚੁਣੇ ਕੰਮ ਹਟਾਓ"
 
-#: ../src/calendar/gui/e-memo-table.c:799
+#: ../src/calendar/gui/e-memo-table.c:874
 msgid "Select all visible memos"
 msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਮੀਮੋ ਚੁਣੋ"
 
@@ -9132,7 +9516,7 @@ msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਮੀਮੋ ਚੁਣੋ"
 msgid "Click to add a memo"
 msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../src/calendar/gui/e-task-table.c:552
+#: ../src/calendar/gui/e-task-table.c:474
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -9142,29 +9526,29 @@ msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:580
+#: ../src/calendar/gui/e-task-table.c:502
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1135
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Cut selected tasks to the clipboard"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../src/calendar/gui/e-task-table.c:1141
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Copy selected tasks to the clipboard"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/calendar/gui/e-task-table.c:1147
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Paste tasks from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਟਾਸਕ ਚੇਪੋ"
 
-#: ../src/calendar/gui/e-task-table.c:1153
-#: ../src/modules/calendar/e-task-shell-view-actions.c:700
+#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਹਟਾਓ"
 
-#: ../src/calendar/gui/e-task-table.c:1159
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Select all visible tasks"
 msgstr "ਸਭ ਦਿਸ ਰਹੀਆਂ ਟਾਸਕਾਂ ਚੁਣੋ"
 
@@ -9181,7 +9565,7 @@ msgid "Completion date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:6
-#: ../src/mail/mail-send-recv.c:1148
+#: ../src/mail/mail-send-recv.c:1145
 msgid "Complete"
 msgstr "ਮੁਕੰਮਲ"
 
@@ -9196,104 +9580,121 @@ msgstr "% ਮੁਕੰਮਲ"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:10
 #: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
-#: ../src/calendar/gui/e-timezone-entry.c:344
+#. Translators: 'None' for a time zone, like 'No time zone being set'
+#: ../src/calendar/gui/e-timezone-entry.c:92
+#: ../src/e-util/e-timezone-dialog.c:55
+#| msgid "None"
+msgctxt "timezone"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
 msgid "Select Timezone"
 msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:406
 #, c-format
-#| msgid "Start: "
 msgid "Start: %s"
 msgstr "ਸ਼ੁਰੂ: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:410
+#: ../src/calendar/gui/e-to-do-pane.c:428
 #, c-format
-#| msgid "Due: "
 msgid "Due: %s"
 msgstr "ਬਾਕੀ: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:424
+#: ../src/calendar/gui/e-to-do-pane.c:442
 #, c-format
-#| msgid "Completed: "
 msgid "Completed: %s"
 msgstr "ਪੂਰਾ: %s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
-#: ../src/modules/itip-formatter/itip-view.c:255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../src/modules/itip-formatter/itip-view.c:256
 msgid "Today"
 msgstr "ਅੱਜ"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1462
+#: ../src/calendar/gui/e-to-do-pane.c:1578
 #: ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:283
+#: ../src/modules/itip-formatter/itip-view.c:284
 msgid "Tomorrow"
 msgstr "ਭਲਕੇ"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1472
-#| msgid "With _Due Date"
+#: ../src/calendar/gui/e-to-do-pane.c:1588
 msgid "Tasks without Due date"
 msgstr "ਮਿਆਦ ਬਿਨਾਂ ਕੰਮ"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
-msgid "New _Appointment..."
-msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)..."
+#: ../src/calendar/gui/e-to-do-pane.c:2165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+#| msgid "New Appointment"
+msgid "New _Appointment…"
+msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
-msgid "New _Meeting..."
-msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)..."
+#: ../src/calendar/gui/e-to-do-pane.c:2173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+#| msgid "New Meeting"
+msgid "New _Meeting…"
+msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
+#: ../src/calendar/gui/e-to-do-pane.c:2181
 #| msgid "New _Task"
-msgid "New _Task..."
-msgstr "ਨਵਾਂ ਕੰਮ(_T)..."
+msgid "New _Task…"
+msgstr "ਨਵਾਂ ਕੰਮ(_T)…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2069
-#| msgid "New assigned task"
-msgid "_New Assigned Task..."
+#: ../src/calendar/gui/e-to-do-pane.c:2189
+#| msgid "_New Assigned Task..."
+msgid "_New Assigned Task…"
 msgstr "ਨਵਾਂ ਜਾਰੀ ਕੀਤਾ ਕੰਮ(_N)..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-to-do-pane.c:2202
 #| msgid "_Open"
-msgid "_Open..."
-msgstr "ਖੋਲ੍ਹੋ(_O)..."
+msgid "_Open…"
+msgstr "…ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
-#| msgid "Delete This _Occurrence"
-msgid "_Delete This Instance..."
-msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_D)..."
+#: ../src/calendar/gui/e-to-do-pane.c:2216
+#| msgid "_Delete This Instance..."
+msgid "_Delete This Instance…"
+msgstr "…ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_D)"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
-#| msgid "All Instances"
-msgid "D_elete All Instances..."
-msgstr "ਸਾਰੇ ਮੌਕੇ ਹਟਾਓ(_e)..."
+#: ../src/calendar/gui/e-to-do-pane.c:2224
+#| msgid "D_elete All Instances..."
+msgid "D_elete All Instances…"
+msgstr "…ਸਾਰੇ ਮੌਕੇ ਹਟਾਓ(_e)"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2112
+#: ../src/calendar/gui/e-to-do-pane.c:2232
 #| msgid "_Delete"
-msgid "_Delete..."
-msgstr "ਹਟਾਓ(_D)..."
+msgid "_Delete…"
+msgstr "…ਹਟਾਓ(_D)"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2129
+#: ../src/calendar/gui/e-to-do-pane.c:2249
 msgid "_Show Tasks without Due date"
 msgstr ""
 
 #  forest green
-#: ../src/calendar/gui/e-to-do-pane.c:2395
+#: ../src/calendar/gui/e-to-do-pane.c:2515
 msgid "To Do"
 msgstr "ਕਰਨ-ਲਈ"
 
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3705
+#, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #  strftime format %d = day of month, %B = full
 #  month name. You can change the order but don't
 #  change the specifiers or add anything.
@@ -9301,36 +9702,36 @@ msgstr "ਕਰਨ-ਲਈ"
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-week-view-main-item.c:222
-#: ../src/calendar/gui/print.c:2081
+#: ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
-#: ../src/calendar/gui/itip-utils.c:982
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
 msgid "An organizer must be set."
-msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+msgstr "ਇੱਕ ਪਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../src/calendar/gui/itip-utils.c:839
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
 msgid "Memo information"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
 msgid "Free/Busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../src/calendar/gui/itip-utils.c:1082
+#: ../src/calendar/gui/itip-utils.c:1120
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
@@ -9338,7 +9739,7 @@ msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
@@ -9347,7 +9748,7 @@ msgstr "ਮਨਜ਼ੂਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1126
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
@@ -9359,7 +9760,7 @@ msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
@@ -9368,7 +9769,7 @@ msgstr "ਇਨਕਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1140
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
@@ -9376,7 +9777,7 @@ msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1153
+#: ../src/calendar/gui/itip-utils.c:1194
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵੀਨ"
@@ -9384,7 +9785,7 @@ msgstr "ਨਵੀਨ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1201
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
@@ -9392,7 +9793,7 @@ msgstr "ਰੱਦ ਕਰੋ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1208
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
@@ -9400,168 +9801,205 @@ msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174
+#: ../src/calendar/gui/itip-utils.c:1215
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸੁਝਾਅ"
 
-#: ../src/calendar/gui/itip-utils.c:1252
+#: ../src/calendar/gui/itip-utils.c:1295
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1260
+#: ../src/calendar/gui/itip-utils.c:1303
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../src/calendar/gui/itip-utils.c:1289
+#: ../src/calendar/gui/itip-utils.c:1332
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਨਵਾਂ ਈਵੈਂਟ ਪਹਿਲਾਂ ਦੇ ਕਿਸੇ ਨਾਲ ਟਕਰਾ ਰਿਹਾ ਹੈ।"
 
-#: ../src/calendar/gui/itip-utils.c:1294
-#, fuzzy
+#: ../src/calendar/gui/itip-utils.c:1337
 #| msgid "Unable to book a resource, error: %s"
 msgid "Unable to book a resource, error: "
-msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਗਲਤੀ: %s"
+msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਗਲਤੀ:"
 
-#: ../src/calendar/gui/itip-utils.c:1465
+#: ../src/calendar/gui/itip-utils.c:1530
 msgid "You must be an attendee of the event."
-msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
+msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ।"
 
-#: ../src/calendar/gui/itip-utils.c:2210
-#, fuzzy
+#: ../src/calendar/gui/itip-utils.c:2312
 #| msgid "Sending message"
 msgid "Sending an event"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਈਵੈਂਟ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/itip-utils.c:2214
-#, fuzzy
+#: ../src/calendar/gui/itip-utils.c:2316
 #| msgid "Sending mail"
 msgid "Sending a memo"
-msgstr "ਮੇਲ ਭੇਜਣੀਆਂ"
+msgstr "ਮੀਮੋ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/gui/itip-utils.c:2218
-#, fuzzy
+#: ../src/calendar/gui/itip-utils.c:2320
 #| msgid "Sending mail"
 msgid "Sending a task"
-msgstr "ਮੇਲ ਭੇਜਣੀਆਂ"
+msgstr "ਕੰਮ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. Translator: This is used as a placeholder when an event doesn't have set a location
+#: ../src/calendar/gui/itip-utils.c:2572
+#| msgctxt "email-custom-header-Security"
+#| msgid "Unclassified"
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "ਦਿੱਤਾ ਨਹੀਂ"
+
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ਦਿਨ"
+msgstr[1] "%d ਦਿਨ"
+
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ਘੰਟਾ"
+msgstr[1] "%d ਘੰਟੇ"
+
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ਮਿੰਟ"
+msgstr[1] "%d ਮਿੰਟ"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ਸਕਿੰਟ"
+msgstr[1] "%d ਸਕਿੰਟ"
 
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:730
 msgid "Mo"
 msgstr "ਸੋ"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:731
 msgid "Tu"
 msgstr "ਮੰ"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:732
 msgid "We"
 msgstr "ਬੁੱ"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:733
 msgid "Th"
 msgstr "ਵੀ"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:737
+#: ../src/calendar/gui/print.c:734
 msgid "Fr"
 msgstr "ਸ਼ੁੱ"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:738
+#: ../src/calendar/gui/print.c:735
 msgid "Sa"
 msgstr "ਸ਼"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:739
+#: ../src/calendar/gui/print.c:736
 msgid "Su"
 msgstr "ਐਤ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3327
+#: ../src/calendar/gui/print.c:3408
 msgid " to "
 msgstr " ਵੱਲ "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3337
+#: ../src/calendar/gui/print.c:3418
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3343
+#: ../src/calendar/gui/print.c:3424
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3353
+#: ../src/calendar/gui/print.c:3434
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3360
+#: ../src/calendar/gui/print.c:3441
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../src/calendar/gui/print.c:3504
+#: ../src/calendar/gui/print.c:3586
 msgid "Appointment"
 msgstr "ਮੁਲਾਕਾਤ"
 
-#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3588 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../src/calendar/gui/print.c:3508
+#: ../src/calendar/gui/print.c:3590
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../src/calendar/gui/print.c:3564
+#: ../src/calendar/gui/print.c:3647
 msgid "Attendees: "
 msgstr "ਦਰਸ਼ਕ:"
 
-#: ../src/calendar/gui/print.c:3608
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../src/calendar/gui/print.c:3624
+#: ../src/calendar/gui/print.c:3692
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3707
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3722
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3670
+#: ../src/calendar/gui/print.c:3738
 #, c-format
 msgid "Categories: %s"
 msgstr "ਕੈਟਾਗਰੀ: %s"
 
-#: ../src/calendar/gui/print.c:3681
+#: ../src/calendar/gui/print.c:3750
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
+
 #: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
@@ -9587,213 +10025,210 @@ msgstr "ਤੋ ਘੱਟ ਹੈ"
 msgid "Appointments and Meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ"
 
-#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:108
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:322
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:89
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:330
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ"
 
-#: ../src/calendar/importers/icalendar-importer.c:351
-#, fuzzy
+#: ../src/calendar/importers/icalendar-importer.c:372
 #| msgid "Create a new calendar"
 msgid "Cre_ate new calendar"
-msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
+msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ(_a)"
 
-#: ../src/calendar/importers/icalendar-importer.c:355
-#, fuzzy
+#: ../src/calendar/importers/icalendar-importer.c:376
 #| msgid "Create a new task list"
 msgid "Cre_ate new task list"
-msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਉ"
+msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਓ(_a)"
 
-#: ../src/calendar/importers/icalendar-importer.c:500
-#: ../src/calendar/importers/icalendar-importer.c:939
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
 msgid "Opening calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/calendar/importers/icalendar-importer.c:647
+#: ../src/calendar/importers/icalendar-importer.c:668
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾਇਲਾਂ (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:669
 msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../src/calendar/importers/icalendar-importer.c:740
+#: ../src/calendar/importers/icalendar-importer.c:764
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../src/calendar/importers/icalendar-importer.c:825
+#: ../src/calendar/importers/icalendar-importer.c:859
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ਫਾਇਲਾਂ (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:860
 msgid "Evolution vCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1102
+#: ../src/calendar/importers/icalendar-importer.c:1134
 msgid "Calendar Events"
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1145
-#| msgid "New Calendar"
+#: ../src/calendar/importers/icalendar-importer.c:1177
 msgid "GNOME Calendar"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1178
 msgid "Evolution Calendar intelligent importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੁਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ਮੀਟਿੰਗ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1217
-#: ../src/calendar/importers/icalendar-importer.c:1531
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ਈਵੈਂਟ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1220
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1223
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1232
+#: ../src/calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ਮੁੜ-ਵਾਪਰਦਾ ਹੈ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ਇੱਕ ਮੌਕਾ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1279
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ਰੀਮਾਈਂਡਰ ਹਨ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ਨੱਥੀ"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1296
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ਪਬਲਿਕ"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1263
+#: ../src/calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ਪ੍ਰਾਈਵੇਟ"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1266
+#: ../src/calendar/importers/icalendar-importer.c:1302
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1270
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ਵਰਗੀਕਰਨ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1275
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1281
+#: ../src/calendar/importers/icalendar-importer.c:1318
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1289
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1300
+#: ../src/calendar/importers/icalendar-importer.c:1336
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ਮੁਕੰਮਲ"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1312
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1322
+#: ../src/calendar/importers/icalendar-importer.c:1356
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ਕੈਟਾਗਰੀਆਂ"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1346
+#: ../src/calendar/importers/icalendar-importer.c:1381
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1354
+#: ../src/calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1365
-#: ../src/calendar/importers/icalendar-importer.c:1368
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1388
-#: ../src/calendar/importers/icalendar-importer.c:1391
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ਦਰਸ਼ਕ"
 
-#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1456
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1565
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "ਕਿਸਮ"
@@ -10693,7 +11128,6 @@ msgid "Asia/Kashgar"
 msgstr "ਏਸ਼ੀਆ/ਕਾਸ਼ਗਾਰ"
 
 #: ../src/calendar/zones.h:242
-#| msgid "Asia/Katmandu"
 msgid "Asia/Kathmandu"
 msgstr "ਏਸ਼ੀਆ/ਕਾਠਮੰਡੂ"
 
@@ -11350,8 +11784,9 @@ msgid "Pacific/Yap"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਯਾਪੀ"
 
 #: ../src/composer/e-composer-actions.c:226
-msgid "Save as..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+#| msgid "Save Task"
+msgid "Save as…"
+msgstr "… ਇੰਝ ਸੰਭਾਲੋ"
 
 #: ../src/composer/e-composer-actions.c:321
 msgid "Close the current file"
@@ -11365,14 +11800,13 @@ msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(_M)"
 msgid "Open New Message window"
 msgstr "ਨਵੀਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1453
-#: ../src/shell/e-shell-window-actions.c:894
-#| msgid "Prefere_nces"
+#: ../src/composer/e-composer-actions.c:333
+#: ../src/shell/e-shell-window-actions.c:952
 msgid "_Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ(_P)"
 
 #: ../src/composer/e-composer-actions.c:335
-#: ../src/shell/e-shell-window-actions.c:896
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "Configure Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਰਚਨਾ"
 
@@ -11381,7 +11815,8 @@ msgid "Save the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
 
 #: ../src/composer/e-composer-actions.c:347
-msgid "Save _As..."
+#| msgid "Save _As..."
+msgid "Save _As…"
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)..."
 
 #: ../src/composer/e-composer-actions.c:349
@@ -11485,10 +11920,9 @@ msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
 #: ../src/composer/e-composer-actions.c:524
-#, fuzzy
 #| msgid "_From Field"
 msgid "_From Override Field"
-msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
+msgstr "ਵੱਲੋਂ ਅਣਡਿੱਠਾ ਕੀਤਾ ਖੇਤਰ(_F)"
 
 #: ../src/composer/e-composer-actions.c:526
 #, fuzzy
@@ -11519,12 +11953,12 @@ msgid "Save Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1966
+#: ../src/e-util/e-collection-account-wizard.c:2029
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2417
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:550
-#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/mail/e-mail-config-identity-page.c:551
+#: ../src/mail/e-mail-config-summary-page.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "ਨਾਂ(_N):"
@@ -11577,7 +12011,7 @@ msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:743
+#: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
@@ -11589,14 +12023,14 @@ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕ
 msgid "Click here to select folders to post to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/composer/e-msg-composer.c:1003
+#: ../src/composer/e-msg-composer.c:1023
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ਬਾਹਰੀ ਸੁਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../src/composer/e-msg-composer.c:1012
+#: ../src/composer/e-msg-composer.c:1032
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11605,22 +12039,37 @@ msgstr ""
 "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ੍ਰਿਪਸ਼ਨ"
 " ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
+#: ../src/composer/e-msg-composer.c:1823 ../src/composer/e-msg-composer.c:2497
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../src/composer/e-msg-composer.c:4987
+#: ../src/composer/e-msg-composer.c:4928
+#| msgid "Remove attachments"
+msgid "Review attachment before sending."
+msgid_plural "Review attachments before sending."
+msgstr[0] "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਅਟੈਚਮੈਂਟ ਦੀ ਪੜਤਾਲ ਕਰੋ।"
+msgstr[1] "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਅਟੈਚਮੈਂਟਾਂ ਦੀ ਪੜਤਾਲ ਕਰੋ।"
+
+#: ../src/composer/e-msg-composer.c:4933
+#, c-format
+msgid ""
+"There had been added %d attachment. Make sure it does not contain any "
+"sensitive information before sending the message."
+msgid_plural ""
+"There had been added %d attachments. Make sure they do not contain any "
+"sensitive information before sending the message."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/composer/e-msg-composer.c:5066
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ਲੇਖਣ ਵਿੱਚ ਕੁਝ ਨਾ-ਟੈਕਸਟ ਭਾਗ ਹੈ, ਜਿਸ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/composer/mail-composer.error.xml.h:1
-#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgid "You cannot attach the file “{0}” to this message."
 msgstr "ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨਾਲ “{0}“ ਫਾਇਲ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: ../src/composer/mail-composer.error.xml.h:2
-#| msgid ""
-#| "The file '{0}' is not a regular file and cannot be sent in a message."
 msgid "The file “{0}” is not a regular file and cannot be sent in a message."
 msgstr "ਫਾਇਲ `“{0}“ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -11636,7 +12085,6 @@ msgstr "{0} ਨਾਲ ਨੱਥੀ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹ
 #  system:no-load-file secondary
 #: ../src/composer/mail-composer.error.xml.h:4
 #: ../src/e-util/e-system.error.xml.h:5
-#| msgid "Because \"{1}\"."
 msgid "Because “{1}”."
 msgstr "ਕਿਉਂਕਿ “{1}“"
 
@@ -11674,19 +12122,14 @@ msgid ""
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:11
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Could not save to autosave file “{0}”."
 msgstr "ਆਟੋਮੈਟਿਕ ਫਾਇਲ “{0}“ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/composer/mail-composer.error.xml.h:12
-#| msgid "Error saving to autosave because &quot;{1}&quot;."
 msgid "Error saving to autosave because “{1}”."
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ ਕਿਉਕਿ “{1}“।"
 
 #: ../src/composer/mail-composer.error.xml.h:13
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
 msgid ""
 "Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
@@ -11715,9 +12158,6 @@ msgid "_Save Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_S)"
 
 #: ../src/composer/mail-composer.error.xml.h:19
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr ""
 "ਕੀ ਤੁਸੀਂ ਲਿਖੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਟਾਇਟਲ “{0}“ ਨਾਲ, ਨੂੰ ਤੁਸੀਂ ਨਿਕਾਰ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ? "
@@ -11727,17 +12167,18 @@ msgid "Could not create message."
 msgstr "ਸੁਨੇਹਾ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/composer/mail-composer.error.xml.h:21
-#, fuzzy
 #| msgid ""
 #| "Because &quot;{0}&quot;, you may need to select different mail options."
 msgid ""
 "You may need to select different mail options.\n"
 "\n"
 "Detailed error: {0}"
-msgstr "ਕਿਉਕਿ “{0}“, ਤੁਹਾਨੂੰ ਵੱਖਰੀਆਂ ਪੱਤਰ ਚੋਣਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਪਵੇਗੀ।"
+msgstr ""
+"ਸ਼ਾਇਦ ਤੁਹਾਨੂੰ ਵੱਖਰੀਆਂ ਪੱਤਰ ਚੋਣਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਪਵੇਗੀ।\n"
+"\n"
+"ਵੇਰਵੇ ਸਮੇਤ ਗਲਤੀ: {0}"
 
 #: ../src/composer/mail-composer.error.xml.h:24
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Could not read signature file “{0}”."
 msgstr "ਦਸਤਖਤ ਫਾਇਲ “{0}“ ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -11759,7 +12200,6 @@ msgstr ""
 "ਆਉਟਬਾਕਸ ਫੋਲਡਰ ਸੰਭਤੁਹਾਡੇ ਆਉਟਬਾਕਸ ਫੋਲਡਰ '"
 
 #: ../src/composer/mail-composer.error.xml.h:28
-#, fuzzy
 #| msgid ""
 #| "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgid "The reported error was “{0}”. The message has not been sent."
@@ -11773,7 +12213,6 @@ msgstr ""
 "ਆਈਤੁਹਾਡੇ ਡਰਾਫਟ ਫੋਲਡਰ ਨੂੰ ਸਭਤੁਹਾਡੇ ਡਾ"
 
 #: ../src/composer/mail-composer.error.xml.h:30
-#, fuzzy
 #| msgid ""
 #| "The reported error was &quot;{0}&quot;. The message has most likely not "
 #| "been saved."
@@ -11791,7 +12230,6 @@ msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:32
 #: ../src/mail/mail.error.xml.h:178
-#, fuzzy
 #| msgid "The reported error was &quot;{0}&quot;."
 msgid "The reported error was “{0}”."
 msgstr "ਰਿਪੋਰਟ ਕੀਤੀ ਗਲਤੀ “{0}“ ਸੀ।"
@@ -11801,7 +12239,7 @@ msgid "_Save to Outbox"
 msgstr "ਆਉਟਬਾਕਸ 'ਚ ਸੰਭਾਲੋ(_S)"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:643
+#: ../src/e-util/e-collection-account-wizard.c:694
 msgid "_Try Again"
 msgstr "ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ(_T)"
 
@@ -11817,7 +12255,6 @@ msgstr ""
 "ਆਉਟਬਾਕਸ 'ਚ ਸ'ਸੁਨੇਹਾ ਆਉਟਪੁ"
 
 #: ../src/composer/mail-composer.error.xml.h:37
-#, fuzzy
 #| msgid ""
 #| "The message will be saved to your local Outbox folder, because the "
 #| "destination service is currently unavailable. You can send the message by "
@@ -11832,11 +12269,10 @@ msgstr ""
 "ਹੈ। ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਟੂਲਬਾਰ ਤੋਂ ਭੇਜੋ/ਲਵੋ ਬਟਨ ਨਾਲ ਸੁਨੇਹੇ ਨੂੰ ਭੇਜ ਸਕਦੇ ਹੋ।"
 
 #: ../src/composer/mail-composer.error.xml.h:38
-#, fuzzy
 #| 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?"
 msgid "Are you sure you want to send the message?"
-msgstr "ਕੀ ਤੁਸੀਂ %d ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲ੍ਹਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹਾ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/composer/mail-composer.error.xml.h:39
 msgid ""
@@ -11861,26 +12297,20 @@ msgid "_Don’t lose formatting"
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:44
-#, fuzzy
 #| msgid "Address formatting"
 msgid "Lose _formatting"
-msgstr "ਐਡਰੈਸ ਫਾਰਮੈਟ"
+msgstr "ਫਾਰਮੈਟ ਭੁਲਾ ਦਿਓ(_f)"
 
 #: ../src/composer/mail-composer.error.xml.h:45
-#, fuzzy
 #| msgid "An error occurred while saving to your Drafts folder."
 msgid "An error occurred while saving to your Templates folder."
 msgstr ""
-"ਤੁਹਾਡੇ ਡਰਾਫਟ ਫੋਲਡਰ ਨੂੰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ।ਤੁਹਾਡੇ ਡਰਾਫਟ ਫੋਲਡਰ ਨੂੰ ਸੰਭਾਲਣ"
-" ਦੌਰਾਨ ਗਲਤੀ "
-"ਆਈਤੁਹਾਡੇ ਡਰਾਫਟ ਫੋਲਡਰ ਨੂੰ ਸਭਤੁਹਾਡੇ ਡਾ"
 
 #  mail:ask-send-no-subject primary
 #: ../src/composer/mail-composer.error.xml.h:46
-#, fuzzy
 #| msgid "Are you sure you want to send a message without a subject?"
 msgid "Are you sure you want to convert the message into a meeting?"
-msgstr "ਕੀ ਤੁਸੀਂ ਪੱਤਰ ਨੂੰ ਵਿਸ਼ੇ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਮੀਟਿੰਗ ਵਿੱਚ ਬਦਲਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/composer/mail-composer.error.xml.h:47
 msgid ""
@@ -11889,10 +12319,9 @@ msgid ""
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:48
-#, fuzzy
 #| msgid "Con_vert to Meeting"
 msgid "Convert to _Meeting"
-msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
+msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_M)"
 
 #  mail:ask-send-no-subject primary
 #: ../src/composer/mail-composer.error.xml.h:49
@@ -11908,10 +12337,9 @@ msgid ""
 msgstr ""
 
 #: ../src/composer/mail-composer.error.xml.h:51
-#, fuzzy
 #| msgid "Con_vert to Meeting"
 msgid "Convert to _Message"
-msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
+msgstr "ਸੁਨੇਹੇ ਲਈ ਤਬਦੀਲ(_M)"
 
 #  mail:ask-send-no-subject primary
 #: ../src/composer/mail-composer.error.xml.h:52
@@ -11968,21 +12396,29 @@ msgstr "ਆਡੀਓ ਪਲੇਅਰ"
 msgid "Play the attachment in embedded audio player"
 msgstr "ਇੰਬੈਡ ਕੀਤੇ ਆਡੀਓ ਪਲੇਅਰ ਵਿੱਚ ਅਟੈਚਮੈਂਟ ਚਲਾਉ"
 
-#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-formatter-headers.c:109
 #: ../src/em-format/e-mail-part-headers.c:46
 #: ../src/mail/e-mail-tag-editor.c:196 ../src/mail/message-list.etspec.h:5
 #: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "ਵਲੋਂ"
 
-#: ../src/em-format/e-mail-formatter-headers.c:132
+#: ../src/em-format/e-mail-formatter-headers.c:134
 msgid "(no subject)"
 msgstr "(ਵਿਸ਼ਾ ਨਹੀਂ)"
 
+#: ../src/em-format/e-mail-formatter-headers.c:150
+#: ../src/em-format/e-mail-formatter-headers.c:514
+#: ../src/mail/e-mail-remote-content-popover.c:381
+#, fuzzy
+#| msgid "Request a _read receipt for this message"
+msgid "Remote content download had been blocked for this message."
+msgstr "ਇਹ ਸੁਨੇਹੇ ਲਈ ਇੱਕ ਪੜ੍ਹਨ ਰਸੀਦ ਦੀ ਮੰਗ ਹੈ(_r)"
+
 #. Translators: This message suggests to the receipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:339
+#: ../src/em-format/e-mail-formatter-headers.c:359
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "ਇਹ ਸੁਨੇਹਾ %s ਵਲੋਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
@@ -11995,29 +12431,29 @@ msgstr "ਨਿਯਮਤ ਚਿੱਤਰ"
 msgid "Display part as an image"
 msgstr "ਚਿੱਤਰ ਵਜੋਂ ਭਾਗ ਵੇਖਾਉ"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
 msgid "RFC822 message"
 msgstr "RFC822 ਸੁਨੇਹਾ"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
 msgid "Format part as an RFC822 message"
 msgstr "RFC822 ਸੁਨੇਹੇ ਵਜੋਂ ਫਾਰਮੈਟ ਭਾਗ"
 
-#: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/e-util/e-webdav-browser.c:2352
+#: ../src/em-format/e-mail-formatter-print.c:50
+#: ../src/e-util/e-webdav-browser.c:2361
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
 #: ../src/e-util/e-attachment-tree-view.c:193
 #: ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "ਅਕਾਰ"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
 #: ../src/em-format/e-mail-part-headers.c:51
 #: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
@@ -12029,11 +12465,11 @@ msgstr "ਵਿਸ਼ਾ"
 
 #  pseudo-header
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:346
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
-#: ../src/modules/mail/em-mailer-prefs.c:1619
-#: ../src/modules/mail/em-mailer-prefs.c:1668
+#: ../src/modules/mail/em-mailer-prefs.c:1620
+#: ../src/modules/mail/em-mailer-prefs.c:1669
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
@@ -12048,18 +12484,18 @@ msgid "Display part as enriched text"
 msgstr "ਭਾਗ ਨੂੰ ਇੰਰਿਚ ਟੈਕਸਟ ਵਜੋਂ ਵੇਖਾਓ"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:389
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:387
+#: ../src/em-format/e-mail-formatter-text-html.c:390
 msgid "Format part as HTML"
 msgstr "HTML ਵਾਂਗ ਫਾਰਮੈਟ ਭਾਗ"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1346
+#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "Plain Text"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ"
 
@@ -12068,55 +12504,55 @@ msgstr "ਪਲੇਨ ਟੈਕਸਟ"
 msgid "Format part as plain text"
 msgstr "ਪਲੇਟ ਟੈਕਸਟ ਵਾਂਗ ਫਾਰਮੈਟ ਭਾਗ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:49
+#: ../src/em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:50
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but sender address and signer address do not match"
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਹੈ ਅਤੇ ਜਾਇਜ ਮਤਲਬ ਵੀ ਹੈ, ਪਰ ਇਹ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਲੱਗਦਾ ਹੈ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid "Invalid signature"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:55
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:62
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਜਾਇਜ ਹਨ, ਪਰ ਇਸ ਦੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਾਂਚਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:61
+#: ../src/em-format/e-mail-formatter-secure-button.c:66
 #, fuzzy
 #| msgid ""
 #| "This message is signed with a signature, but there is no corresponding "
@@ -12124,7 +12560,7 @@ msgstr ""
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:68
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -12133,11 +12569,11 @@ msgid ""
 "that this message truly came from that person and that it arrived unaltered."
 msgstr ""
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid "Unencrypted"
 msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:72
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12145,11 +12581,11 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ"
 " ਸਕਦੇ ਹਨ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid "Encrypted, weak"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:73
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12159,11 +12595,11 @@ msgstr ""
 " ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
 "ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid "Encrypted"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:74
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12171,11 +12607,11 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਹੈ, ਇਸ ਸੁਨੇਹੇ ਦੇ ਕਿਸੇ ਭਾਗ ਨੂੰ ਬਾਹਰੋਂ ਵੇਖਣਾ ਸੰਭਵ ਨਹੀਂ"
 " ਹੋਵੇਗਾ।"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid "Encrypted, strong"
 msgstr "ਇੰਕ੍ਰਿਪਟ, ਸਖਤ"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:75
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12185,12 +12621,46 @@ msgstr ""
 " ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
 "ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
 
+#: ../src/em-format/e-mail-formatter-secure-button.c:271
+#| msgid "_View Certificate"
+msgid "View Certificate"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:278
+#| msgid "Imported Certificate"
+msgid "Import Certificate"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰੋ"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:320
+msgid "Details"
+msgstr "ਵੇਰਵੇ"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:412
+msgid "Digital Signature"
+msgstr "ਡਿਜ਼ਟਲ ਦਸਤਖਤ"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:418
+#| msgid "Sign"
+msgid "Signer:"
+msgid_plural "Signers:"
+msgstr[0] "ਦਸਤਖਤੀ:"
+msgstr[1] "ਦਸਤਖਤੀ:"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:429
+msgid "Encryption"
+msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:434
+#| msgid "Encrypted"
+msgid "Encrypted by:"
+msgstr "ਇਸ ਵਲੋਂ ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ:"
+
 #: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr "MIME ਭਾਗ ਦਾ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:205
-#: ../src/em-format/e-mail-formatter-utils.c:222
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48
 #: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
 #: ../src/mail/vfoldertypes.xml.in.h:11
@@ -12198,65 +12668,59 @@ msgstr "MIME ਭਾਗ ਦਾ ਸਰੋਤ ਵੇਖਾਓ"
 msgid "To"
 msgstr "ਵੱਲ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:206
-#: ../src/em-format/e-mail-formatter-utils.c:223
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
 #: ../src/em-format/e-mail-part-headers.c:49
 #: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Cc"
 
-#: ../src/em-format/e-mail-formatter-utils.c:207
-#: ../src/em-format/e-mail-formatter-utils.c:224
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
 #: ../src/em-format/e-mail-part-headers.c:50
 #: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "GPG signed"
 msgstr "GPG ਦਸਤਖਤ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:562
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:577
 #| msgid "GPG signed"
 msgid "partially GPG signed"
-msgstr "GPG ਦਸਤਖਤ ਕੀਤੇ"
+msgstr "ਅਧੂਰੇ GPG ਦਸਤਖਤ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:578
 #| msgid "GPG encrpyted"
 msgid "GPG encrypted"
 msgstr "GPG ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:563
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:578
 #| msgid "GPG encrpyted"
 msgid "partially GPG encrypted"
-msgstr "GPG ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
+msgstr "ਅਧੂਰਾ GPG ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "S/MIME signed"
 msgstr "S/MIME ਸਾਈਨ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:564
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:579
 #| msgid "S/MIME signed"
 msgid "partially S/MIME signed"
-msgstr "S/MIME ਸਾਈਨ ਕੀਤੇ"
+msgstr "ਅਧੂਰਾ S/MIME ਸਾਈਨ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:580
 #| msgid "S/MIME encrpyted"
 msgid "S/MIME encrypted"
 msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:565
-#, fuzzy
+#: ../src/em-format/e-mail-formatter-utils.c:580
 #| msgid "S/MIME encrpyted"
 msgid "partially S/MIME encrypted"
-msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
+msgstr "ਅਧੂਰਾ S/MIME ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
 
-#: ../src/em-format/e-mail-formatter-utils.c:678
+#: ../src/em-format/e-mail-formatter-utils.c:693
 #: ../src/mail/e-mail-config-security-page.c:856
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
@@ -12268,7 +12732,7 @@ msgstr "ਸੁਰੱਖਿਆ"
 msgid "Error parsing MBOX part: %s"
 msgstr "MBOX ਭਾਗ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s"
 
-#: ../src/em-format/e-mail-parser-application-smime.c:101
+#: ../src/em-format/e-mail-parser-application-smime.c:113
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
@@ -12279,7 +12743,7 @@ msgid "Could not parse PGP message: %s"
 msgstr "PGP ਸੁਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
 #: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
-#: ../src/em-format/e-mail-parser-multipart-signed.c:152
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
@@ -12294,10 +12758,10 @@ msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਪੁਆਇੰਟਰ"
 
 #: ../src/em-format/e-mail-parser-message-external.c:110
-#, fuzzy, c-format
+#, c-format
 #| msgid "Pointer to local file (%s) valid at site \"%s\""
 msgid "Pointer to local file (%s) valid at site “%s”"
-msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਪੁਆਇੰਟਰ"
+msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ “%s“ ਦੇ ਲਈ ਪੁਆਇੰਟਰ"
 
 #: ../src/em-format/e-mail-parser-message-external.c:112
 #, c-format
@@ -12310,27 +12774,27 @@ msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮੋਟ ਡਾਟੇ (%s) ਲਈ ਪੁਆਇੰਟਰ"
 
 #: ../src/em-format/e-mail-parser-message-external.c:149
-#, fuzzy, c-format
+#, c-format
 #| msgid "Pointer to unknown external data (\"%s\" type)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟੇ (\"%s\" ਕਿਸਮ) ਲਈ ਪੁਆਇੰਟਰ"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:65
-#: ../src/em-format/e-mail-parser-multipart-signed.c:100
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:80
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
-#: ../src/em-format/e-mail-parser-multipart-signed.c:138
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
@@ -12339,8 +12803,8 @@ msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 msgid "Reply-To"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
-#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
+#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "ਮਿਤੀ"
@@ -12356,31 +12820,16 @@ msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 msgid "Face"
 msgstr "ਫੇਸ"
 
-#: ../src/em-format/e-mail-part-secure-button.c:92
-#, fuzzy, c-format
+#: ../src/em-format/e-mail-part-secure-button.c:96
+#, c-format
 #| msgid "Failed to import certificate"
 msgid "Failed to import certificate: %s"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: ../src/em-format/e-mail-part-secure-button.c:185
-#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
-msgid "_View Certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
-
-#: ../src/em-format/e-mail-part-secure-button.c:198
-#, fuzzy
-#| msgid "Imported Certificate"
-msgid "_Import Certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
 
-#: ../src/em-format/e-mail-part-secure-button.c:207
-msgid "This certificate is not viewable"
-msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
-
-#: ../src/em-format/e-mail-part-utils.c:556
+#: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
-msgstr "%s ਨੱਥੀ"
+msgstr "%s ਅਟੈਚਮੈਂਟ"
 
 #: ../src/e-util/ea-calendar-item.c:312 ../src/e-util/ea-calendar-item.c:321
 msgid "%d %B %Y"
@@ -12397,38 +12846,33 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਇਕਾਈ"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:910
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
 
 #: ../src/e-util/e-accounts-window.c:564 ../src/e-util/e-accounts-window.c:703
 #: ../src/e-util/e-accounts-window.c:908
-#, fuzzy
 #| msgid "Address Book"
 msgid "Address Books"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
 
 #: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
 #: ../src/e-util/e-accounts-window.c:909
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
-#, fuzzy
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #| msgid "Calendar"
 msgid "Calendars"
 msgstr "ਕੈਲੰਡਰ"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
-#, fuzzy
 #| msgctxt "New"
 #| msgid "Memo Li_st"
 msgid "Memo Lists"
-msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
+msgstr "ਮੀਮੋ ਲਿਸਟ"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:88
-#, fuzzy
 #| msgid "Task List"
 msgid "Task Lists"
 msgstr "ਕੰਮ ਲਿਸਟ"
@@ -12440,7 +12884,7 @@ msgstr "ਕੰਮ ਲਿਸਟ"
 #: ../src/plugins/mail-notification/mail-notification.c:1124
 #: ../src/plugins/publish-calendar/publish-calendar.c:854
 msgid "Enabled"
-msgstr "ਯੋਗ ਕੀਤਾ"
+msgstr "ਸਮਰੱਥ ਹੈ"
 
 #: ../src/e-util/e-accounts-window.c:1415
 #: ../src/mail/e-mail-account-tree-view.c:108
@@ -12449,56 +12893,49 @@ msgid "Account Name"
 msgstr "ਅਕਾਊਂਟ ਨਾਂ"
 
 #: ../src/e-util/e-accounts-window.c:1482
-#, fuzzy
 #| msgid "Collection"
 msgid "Collection _Account"
-msgstr "ਭੰਡਾਰ"
+msgstr "ਭੰਡਾਰ ਅਕਾਊਂਟ(_A)"
 
 #: ../src/e-util/e-accounts-window.c:1483
-#, fuzzy
 #| msgid "Mail Accounts"
 msgid "_Mail Account"
-msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
+msgstr "ਪੱਤਰ ਅਕਾਊਂਟ(_M)"
 
 #: ../src/e-util/e-accounts-window.c:1484
-#, fuzzy
 #| msgctxt "New"
 #| msgid "Address _Book"
 msgid "Address _Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ(_B)"
+msgstr "ਐਡਰੈੱਸ ਬੁੱਕ(_B)"
 
 #: ../src/e-util/e-accounts-window.c:1485
-#, fuzzy
 #| msgid "_Calendar:"
 msgid "_Calendar"
-msgstr "ਕੈਲੰਡਰ(_C):"
+msgstr "ਕੈਲੰਡਰ(_C)"
 
 #: ../src/e-util/e-accounts-window.c:1486
-#, fuzzy
 #| msgctxt "New"
 #| msgid "Memo Li_st"
 msgid "M_emo List"
-msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
+msgstr "ਮੀਮੋ ਲਿਸਟ(_e)"
 
 #: ../src/e-util/e-accounts-window.c:1487
-#, fuzzy
 #| msgid "Task List"
 msgid "_Task List"
-msgstr "ਕੰਮ ਲਿਸਟ"
+msgstr "ਕੰਮ ਲਿਸਟ(_T)"
 
 #: ../src/e-util/e-accounts-window.c:1684
-#, fuzzy
 #| msgid "Evolution Account Assistant"
 msgid "Evolution Accounts"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ"
 
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Refresh"
 msgstr "ਤਾਜ਼ਾ ਕਰੋ(_R)"
 
@@ -12540,18 +12977,19 @@ msgstr "%s"
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
 #: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:125
+#: ../src/e-util/e-alert-bar.c:181
 msgid "Close this message (Escape)"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਬੰਦ ਕਰੋ (Esc)"
 
@@ -12560,10 +12998,9 @@ msgid "_Dismiss"
 msgstr "ਮਨਸੂਖ(_D)"
 
 #: ../src/e-util/e-alert-sink.c:244
-#, fuzzy
 #| msgid "Failed to create thread: %s"
 msgid "Failed to create a thread: "
-msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
+msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
 
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
@@ -12574,10 +13011,9 @@ msgid "Attached message"
 msgstr "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ"
 
 #: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
-#, fuzzy
 #| msgid "Import cancelled."
 msgid "Operation was cancelled"
-msgstr "ਇੰਪੋਰਟ ਕਰਨਾ ਰੱਦ ਕੀਤਾ।"
+msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ"
 
 #. Translators: Default attachment filename.
 #: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
@@ -12594,10 +13030,10 @@ msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾਂ ਸੰਭਾਲਣ ਕਾਰਵਾਈ ਜਾਰੀ ਹੈ।"
 
 #: ../src/e-util/e-attachment.c:2757
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not open %s:"
 msgid "Could not open “%s”"
-msgstr "%s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:"
+msgstr "“%s“ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../src/e-util/e-attachment.c:2760
 #, c-format
@@ -12609,10 +13045,10 @@ msgid "Attachment contents not loaded"
 msgstr "ਅਟੈਚਮੈਂਟ ਸਮੱਗਰੀ ਲੋਡ ਨਹੀਂ ਹੈ"
 
 #: ../src/e-util/e-attachment.c:3610
-#, fuzzy, c-format
+#, c-format
 #| msgid "Could not save '%s'"
 msgid "Could not save “%s”"
-msgstr "'%s' ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr "“%s“ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
 #: ../src/e-util/e-attachment.c:3613
 #, c-format
@@ -12624,14 +13060,14 @@ msgid "Attachment Properties"
 msgstr "ਅਟੈਚਮੈਂਟ ਵਿਸ਼ੇਸਤਾ"
 
 #: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-import-assistant.c:277
 msgid "F_ilename:"
 msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
 
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:241
-#: ../src/e-util/e-webdav-browser.c:2447
+#: ../src/e-util/e-html-editor-link-dialog.c:229
+#: ../src/e-util/e-webdav-browser.c:2456
 msgid "_Description:"
 msgstr "ਵੇਰਵਾ(_D):"
 
@@ -12707,44 +13143,44 @@ msgid "Save extracted files and the original _archive"
 msgstr ""
 
 #: ../src/e-util/e-attachment-view.c:308
-msgid "Open With Other Application..."
-msgstr "ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਨਾਲ ਖੋਲ੍ਹੋ..."
+#| msgid "Open With Other Application..."
+msgid "Open With Other Application…"
+msgstr "ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਨਾਲ ਖੋਲ੍ਹੋ…"
 
 #: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
 #: ../src/e-util/e-attachment-view.c:322
-#, fuzzy
 #| msgid "Save As..."
 msgid "Sa_ve As"
-msgstr "...ਵਾਂਗ ਸੰਭਾਲੋ"
+msgstr "ਇੰਝ ਸੰਭਾਲੋ(_v)"
 
 #: ../src/e-util/e-attachment-view.c:331
 #: ../src/plugins/save-calendar/save-calendar.c:348
 #: ../src/plugins/save-calendar/save-calendar.c:387
 #: ../src/plugins/save-calendar/save-calendar.c:426
-#, fuzzy
 #| msgid "Save _As..."
 msgid "Save _As"
-msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)..."
+msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)"
 
 #: ../src/e-util/e-attachment-view.c:341
-msgid "A_dd Attachment..."
-msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਲ(_d)..."
+#| msgid "Add Attachment"
+msgid "A_dd Attachment…"
+msgstr "ਅਟੈਚਮੈਂਟ ਜੋੜੋ(_d)…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)"
 
 #: ../src/e-util/e-attachment-view.c:786
-#, fuzzy, c-format
+#, c-format
 #| msgid "Open With \"%s\""
 msgid "Open With “%s”"
 msgstr "\"%s\" ਨਾਲ ਖੋਲ੍ਹੋ"
@@ -12755,10 +13191,9 @@ msgid "Open this attachment in %s"
 msgstr "ਇਹ ਅਟੈਚਮੈਂਟ %s ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
 #: ../src/e-util/e-attachment-view.c:789
-#, fuzzy
 #| msgid "Open With Other Application..."
 msgid "Open With Default Application"
-msgstr "ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਨਾਲ ਖੋਲ੍ਹੋ..."
+msgstr "ਡਿਫਾਲਟ ਐਪਲੀਕੇਸ਼ਨ ਨਾਲ ਖੋਲ੍ਹੋ"
 
 #: ../src/e-util/e-attachment-view.c:790
 #, fuzzy
@@ -12849,30 +13284,27 @@ msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭ
 msgid "Copy memo list contents locally for offline operation"
 msgstr "ਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/e-util/e-categories-editor.c:246
+#: ../src/e-util/e-categories-editor.c:251
 msgid "Currently _used categories:"
 msgstr "ਇਸ ਸਮੇਂ ਵਰਤੀਆਂ ਕੈਟਾਗਰੀਆਂ(_u):"
 
-#: ../src/e-util/e-categories-editor.c:257
+#: ../src/e-util/e-categories-editor.c:262
 msgid "_Available Categories:"
 msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_g):"
 
-#: ../src/e-util/e-categories-editor.c:297
-#, fuzzy
+#: ../src/e-util/e-categories-editor.c:302
 #| msgid "_New"
 msgctxt "category"
 msgid "_New"
 msgstr "ਨਵਾਂ(_N)"
 
-#: ../src/e-util/e-categories-editor.c:301
-#, fuzzy
+#: ../src/e-util/e-categories-editor.c:306
 #| msgid "_Edit"
 msgctxt "category"
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../src/e-util/e-categories-editor.c:305
-#, fuzzy
+#: ../src/e-util/e-categories-editor.c:310
 #| msgid "_Delete"
 msgctxt "category"
 msgid "_Delete"
@@ -12883,46 +13315,45 @@ msgid "Icon"
 msgstr "ਆਈਕਾਨ"
 
 #: ../src/e-util/e-category-completion.c:304
-#, fuzzy, c-format
+#, c-format
 #| msgid "Create category \"%s\""
 msgid "Create category “%s”"
-msgstr "ਕੈਟਾਗਰੀ \"%s\" ਬਣਾਓ"
+msgstr "ਕੈਟਾਗਰੀ ”%s” ਬਣਾਓ"
 
-#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
 msgid "Category Icon"
 msgstr "ਕੈਟਾਗਰੀ ਆਈਕਾਨ"
 
-#: ../src/e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:171
 msgid "_No Image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../src/e-util/e-category-editor.c:207
+#: ../src/e-util/e-category-editor.c:205
 msgid "Category _Name"
 msgstr "ਕੈਟਾਗਰੀ ਨਾਂ(_N)"
 
-#: ../src/e-util/e-category-editor.c:220
+#: ../src/e-util/e-category-editor.c:218
 msgid "Category _Icon"
 msgstr "ਕੈਟਾਗਰੀ ਆਈਕਾਨ(_I)"
 
-#: ../src/e-util/e-category-editor.c:236
-#, fuzzy
+#: ../src/e-util/e-category-editor.c:234
 #| msgid "Unset Color"
 msgid "_Unset icon"
-msgstr "ਰੰਗ ਨਾ-ਸੈੱਟ"
+msgstr "ਰੰਗ ਨਾ-ਸੈੱਟ(_U)"
 
-#: ../src/e-util/e-category-editor.c:262
+#: ../src/e-util/e-category-editor.c:260
 msgid "Category Properties"
 msgstr "ਕੈਟਾਗਰੀ ਗੁਣ"
 
-#: ../src/e-util/e-category-editor.c:323
-#, fuzzy, c-format
+#: ../src/e-util/e-category-editor.c:321
+#, c-format
 #| msgid ""
 #| "There is already a category '%s' in the configuration. Please use another "
 #| "name"
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
 "name"
-msgstr "ਸੰਰਚਨਾ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ '%s' ਕੈਟਾਗਰੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
+msgstr "ਸੰਰਚਨਾ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ”%s” ਕੈਟਾਗਰੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
 
 #: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
@@ -13043,420 +13474,406 @@ msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ"
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲਈ ਅੱਖਰ ਦਿਓ"
 
-#: ../src/e-util/e-charset-combo-box.c:363
-msgid "Other..."
-msgstr "ਹੋਰ..."
+#: ../src/e-util/e-charset-combo-box.c:364
+#| msgid "Other"
+msgid "Other…"
+msgstr "ਹੋਰ…"
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
-#, fuzzy, c-format
+#, c-format
 #| msgid "Cannot create a client object from extension name '%s'"
 msgid "Cannot create a client object from extension name “%s”"
-msgstr "ਇਕਸਟੈਨਸ਼ਨ ਨਾਂ '%s' ਤੋਂ ਕਲਾਇਟ ਆਬਜੈਕਟ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+msgstr "ਇਕਸਟੈਨਸ਼ਨ ਨਾਂ ”%s” ਤੋਂ ਕਲਾਇਟ ਆਬਜੈਕਟ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
-#, fuzzy
 #| msgid "Finish"
 msgid "_Finish"
-msgstr "ਮੁਕੰਮਲ"
+msgstr "ਮੁਕੰਮਲ(_F)"
 
-#: ../src/e-util/e-collection-account-wizard.c:108
-#: ../src/e-util/e-collection-account-wizard.c:266
-#: ../src/e-util/e-search-bar.c:667
+#: ../src/e-util/e-collection-account-wizard.c:110
+#| msgid "_Skip Lookup"
+msgid "_Look Up"
+msgstr "ਲੱਭਣਾ ਛੱਡੋ(_L)"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273
+#: ../src/e-util/e-search-bar.c:680
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
-#: ../src/e-util/e-collection-account-wizard.c:180
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:184
 #| msgid "Collection"
 msgid "New Collection Account"
-msgstr "ਭੰਡਾਰ"
+msgstr "ਨਵਾਂ ਭੰਡਾਰ ਅਕਾਊਂਟ"
 
-#: ../src/e-util/e-collection-account-wizard.c:251
-#: ../src/e-util/e-search-bar.c:655
+#: ../src/e-util/e-collection-account-wizard.c:258
+#: ../src/e-util/e-search-bar.c:668
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "ਪਿੱਛੇ(_P)"
 
-#: ../src/e-util/e-collection-account-wizard.c:416
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr ""
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:473
-#, fuzzy, c-format
+#: ../src/e-util/e-collection-account-wizard.c:496
+#, c-format
 #| msgid "Enter Google password for user '%s'."
 msgid "Requires password to continue. %s."
-msgstr "ਯੂਜ਼ਰ '%s' ਲਈ ਗੂਗਲ ਪਾਸਵਰਡ ਦਿਓ"
+msgstr "ਜਾਰੀ ਰੱਖਣ ਲਈ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ। %s।"
 
-#: ../src/e-util/e-collection-account-wizard.c:486
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:509
 #| msgid "_View Certificate"
 msgid "View certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
-
-#. Translators: The first %s is replaced with actual error message about site certificate invalidity,
-#. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:490
-#, c-format
-msgctxt "collection-account-wizard"
-msgid "%s %s."
-msgstr ""
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ"
 
-#: ../src/e-util/e-collection-account-wizard.c:528
+#: ../src/e-util/e-collection-account-wizard.c:550
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter "
 "the account manually instead or change above settings."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:530
+#: ../src/e-util/e-collection-account-wizard.c:552
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/e-util/e-collection-account-wizard.c:625
+#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ(_U):"
+
+#: ../src/e-util/e-collection-account-wizard.c:675
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 #: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../src/e-util/e-collection-account-wizard.c:637
+#: ../src/e-util/e-collection-account-wizard.c:688
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 
-#: ../src/e-util/e-collection-account-wizard.c:780
-#: ../src/e-util/e-webdav-browser.c:473
+#: ../src/e-util/e-collection-account-wizard.c:835
+#: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "ਭੰਡਾਰ"
 
-#: ../src/e-util/e-collection-account-wizard.c:781
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:836
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
-msgstr "ਮੇਲ ਪ੍ਰਾਪਤੀ"
+msgstr "ਮੇਲ ਪ੍ਰਾਪਤ"
 
 #  pseudo-header
-#: ../src/e-util/e-collection-account-wizard.c:782
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:837
 #| msgid "Mailer"
 msgid "Mail Send"
-msgstr "ਮੇਲਰ"
+msgstr "ਮੇਲ ਭੇਜੋ"
 
-#: ../src/e-util/e-collection-account-wizard.c:783
+#: ../src/e-util/e-collection-account-wizard.c:838
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
 
-#: ../src/e-util/e-collection-account-wizard.c:785
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:840
 #| msgctxt "New"
 #| msgid "Memo Li_st"
 msgid "Memo List"
-msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
+msgstr "ਮੀਮੋ ਲਿਸਟ"
 
-#: ../src/e-util/e-collection-account-wizard.c:786
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "ਕੰਮ ਲਿਸਟ"
 
-#: ../src/e-util/e-collection-account-wizard.c:1122
+#: ../src/e-util/e-collection-account-wizard.c:1177
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1429
+#: ../src/e-util/e-collection-account-wizard.c:1484
 msgid "Saving account settings, please wait…"
-msgstr ""
+msgstr "ਅਕਾਊਂਟ ਸੈਟਿੰਗਾਂ ਸੰਭਾਲੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ, ਉਡੀਕੋ…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1573
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:1635
 #| msgid "User e_mail:"
 msgid "User details"
-msgstr "ਯੂਜ਼ਰ ਈਮੇਲ(_m):"
+msgstr "ਵਰਤੋਂਕਾਰ ਵੇਰਵੇ"
 
-#: ../src/e-util/e-collection-account-wizard.c:1586
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:1648
 #| msgid "Email Address:"
 msgid "_Email Address or User name:"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ:"
+msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਜਾਂ ਵਰਤੋਂਕਾਰ ਨਾਂ(_E):"
 
-#: ../src/e-util/e-collection-account-wizard.c:1617
-#, fuzzy
+#: ../src/e-util/e-collection-account-wizard.c:1679
 #| msgid "Advanced send options"
 msgid "_Advanced Options"
-msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣਾਂ"
+msgstr "ਤਕਨੀਕੀ ਚੋਣਾਂ(_A)"
 
-#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/e-util/e-collection-account-wizard.c:1684
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
-#: ../src/e-util/e-collection-account-wizard.c:1641
+#: ../src/e-util/e-collection-account-wizard.c:1703
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1833
+#: ../src/e-util/e-collection-account-wizard.c:1896
 #, fuzzy
 #| msgid "Level beyond which the message should be logged."
 msgid "Select which parts should be configured:"
 msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../src/e-util/e-collection-account-wizard.c:1957
-#: ../src/mail/e-mail-config-identity-page.c:541
-#: ../src/mail/e-mail-config-summary-page.c:323
+#: ../src/e-util/e-collection-account-wizard.c:2020
+#: ../src/mail/e-mail-config-identity-page.c:542
+#: ../src/mail/e-mail-config-summary-page.c:325
 msgid "Account Information"
 msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
 
 #: ../src/e-util/e-color-chooser-widget.c:122
-#, fuzzy
 #| msgid "Use custom fonts"
 msgid "Choose custom color"
-msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+msgstr "ਪਸੰਦੀਦਾ ਰੰਗ ਚੁਣੋ"
 
-#: ../src/e-util/e-color-combo.c:79
+#  default charset used in mail view
+#: ../src/e-util/e-color-combo.c:488 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:544
+#: ../src/mail/e-mail-config-security-page.c:708
+#: ../src/mail/e-mail-reader.c:4870 ../src/mail/mail-config.ui.h:78
+msgid "Default"
+msgstr "ਡਿਫਾਲਟ"
+
+#: ../src/e-util/e-color-combo.c:576
 msgid "black"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:577
 msgid "light brown"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:578
 msgid "brown gold"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:579
 msgid "dark green #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:580
 msgid "navy"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:581
 msgid "dark blue"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:582
 msgid "purple #2"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:86
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:583
 #| msgid "Every day"
 #| msgid_plural "Every %d days"
 msgid "very dark gray"
-msgstr "ਹਰ ਦਿਨ"
+msgstr "ਬਹੁਤ ਗੂੜ੍ਹਾ ਸਲੇਟੀ"
 
-#: ../src/e-util/e-color-combo.c:88
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:585
 #| msgid "Mark as _Unread"
 msgid "dark red"
-msgstr "ਨਾ-ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
+msgstr "ਗੂੜ੍ਹਾ ਲਾਲ"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:586
 msgid "red-orange"
-msgstr ""
+msgstr "ਲਾਲ-ਸੰਤਰੀ"
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:587
 msgid "gold"
-msgstr ""
+msgstr "ਸੁਨਹਿਰੀ"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:588
 msgid "dark green"
-msgstr ""
+msgstr "ਗੂੜ੍ਹਾ ਹਰਾ"
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:589
 msgid "dull blue"
-msgstr ""
+msgstr "ਫਿੱਕਾ ਨੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:590
 msgid "blue"
-msgstr ""
+msgstr "ਨੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:591
 msgid "dull purple"
-msgstr ""
+msgstr "ਫਿੱਕਾ ਵੈਂਗਣੀ"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:592
 msgid "dark grey"
-msgstr ""
+msgstr "ਗੂੜਾ ਸਲੇਟੀ"
 
-#: ../src/e-util/e-color-combo.c:97
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:594
 #| msgid "3rd"
 msgid "red"
-msgstr "੩ਜਾ"
+msgstr "ਲਾਲ"
 
-#: ../src/e-util/e-color-combo.c:98
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:595
 #| msgid "Changed"
 msgid "orange"
-msgstr "ਤਬਦੀਲ"
+msgstr "ਸੰਤਰੀ"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:596
 msgid "lime"
-msgstr ""
+msgstr "ਲਾਈਮ"
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:597
 msgid "dull green"
-msgstr ""
+msgstr "ਫਿੱਕਾ ਹਰਾ"
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:598
 msgid "dull blue #2"
-msgstr ""
+msgstr "ਫਿੱਕਾ ਨੀਲਾ #2"
 
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:599
 msgid "sky blue #2"
-msgstr ""
+msgstr "ਅਸਮਾਨੀ ਨੀਲਾ #2"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:600
 msgid "purple"
-msgstr ""
+msgstr "ਵੈਂਗਣੀ"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:601
 msgid "gray"
-msgstr ""
+msgstr "ਸਲੇਟੀ"
 
-#: ../src/e-util/e-color-combo.c:106
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:603
 #| msgid "Image"
 msgid "magenta"
-msgstr "ਚਿੱਤਰ"
+msgstr "ਮੈਜ਼ੀਨਟਾ"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:604
 msgid "bright orange"
-msgstr ""
+msgstr "ਚਮਕੀਲਾ ਸੰਤਰੀ"
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:605
 msgid "yellow"
-msgstr ""
+msgstr "ਪੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:606
 msgid "green"
-msgstr ""
+msgstr "ਹਰਾ"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:607
 msgid "cyan"
-msgstr ""
+msgstr "ਯਰਕਾਨ"
 
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:608
 msgid "bright blue"
-msgstr ""
+msgstr "ਚਮਕੀਲਾ ਨੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:112
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:609
 #| msgid "_Required people"
 msgid "red purple"
-msgstr "ਲੋੜੀਦੇ ਵਿਅਕਤੀ(_R)"
+msgstr "ਲਾਲ ਵੈਂਗਣੀ"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:610
 msgid "light grey"
-msgstr ""
+msgstr "ਹਲਕਾ ਸਲੇਟੀ"
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:612
 msgid "pink"
-msgstr ""
+msgstr "ਗੁਲਾਬੀ"
 
-#: ../src/e-util/e-color-combo.c:116
-#, fuzzy
+#: ../src/e-util/e-color-combo.c:613
 #| msgid "daylight savings time"
 msgid "light orange"
-msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ"
+msgstr "ਹਲਕਾ ਸੰਤਰੀ"
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:614
 msgid "light yellow"
-msgstr ""
+msgstr "ਫਿੱਕਾ ਪੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:615
 msgid "light green"
-msgstr ""
+msgstr "ਹਲਕਾ ਹਰਾ"
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:616
 msgid "light cyan"
-msgstr ""
+msgstr "ਹਲਕਾ ਹਰਾ-ਨੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:617
 msgid "light blue"
-msgstr ""
+msgstr "ਹਲਕਾ ਨੀਲਾ"
 
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:618
 msgid "light purple"
-msgstr ""
+msgstr "ਹਲਕਾ ਵੈਂਗਣੀ"
 
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:619
 msgid "white"
-msgstr ""
-
-#  default charset used in mail view
-#: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708
-#: ../src/mail/e-mail-reader.c:4759 ../src/mail/mail-config.ui.h:78
-msgid "Default"
-msgstr "ਡਿਫਾਲਟ"
+msgstr "ਚਿੱਟਾ"
 
-#: ../src/e-util/e-config-lookup.c:821
+#: ../src/e-util/e-config-lookup.c:819
 msgid "Running…"
-msgstr ""
+msgstr "ਚੱਲ ਰਿਹਾ ਹੈ…"
 
-#: ../src/e-util/e-dateedit.c:524
+#: ../src/e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: ../src/e-util/e-dateedit.c:549
+#: ../src/e-util/e-dateedit.c:558
 msgid "Text entry to input date"
 msgstr "ਮਿਤੀ ਦੇਣ ਲਈ ਟੈਕਸਟ ਇੰਦਰਾਜ਼"
 
-#: ../src/e-util/e-dateedit.c:572
+#: ../src/e-util/e-dateedit.c:581
 msgid "Click this button to show a calendar"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ"
 
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:636
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾਂ ਚੁਣਨ ਲਈ ਲਟਕਦਾ ਬਕਸਾ"
 
-#: ../src/e-util/e-dateedit.c:628
+#: ../src/e-util/e-dateedit.c:637
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../src/e-util/e-dateedit.c:702
+#: ../src/e-util/e-dateedit.c:714
 msgid "No_w"
 msgstr "ਹੁਣੇ(_w)"
 
-#: ../src/e-util/e-dateedit.c:709
+#: ../src/e-util/e-dateedit.c:721
 msgid "_Today"
 msgstr "ਅੱਜ(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:718
+#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "ਕੋਈ ਨਹੀਂ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2131
+#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
 msgctxt "date"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/e-util/e-dateedit.c:2017
+#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
 msgid "Invalid Date Value"
 msgstr "ਗਲਤ ਤਾਰੀਖ ਮੁੱਲ"
 
-#: ../src/e-util/e-dateedit.c:2062
+#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
 msgid "Invalid Time Value"
 msgstr "ਗਲਤ ਸਮਾਂ ਮੁੱਲ"
 
@@ -13531,7 +13948,6 @@ msgstr "ਫਾਰਮੈਟ:"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
 #: ../src/e-util/e-dialog-widgets.c:181
-#, fuzzy
 #| msgid "days"
 msgctxt "time-unit"
 msgid "days"
@@ -13539,7 +13955,6 @@ msgstr "ਦਿਨ"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
 #: ../src/e-util/e-dialog-widgets.c:183
-#, fuzzy
 #| msgid "weeks"
 msgctxt "time-unit"
 msgid "weeks"
@@ -13547,7 +13962,6 @@ msgstr "ਹਫਤੇ"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
 #: ../src/e-util/e-dialog-widgets.c:185
-#, fuzzy
 #| msgid "months"
 msgctxt "time-unit"
 msgid "months"
@@ -13555,7 +13969,6 @@ msgstr "ਮਹੀਨੇ"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
 #: ../src/e-util/e-dialog-widgets.c:187
-#, fuzzy
 #| msgid "years"
 msgctxt "time-unit"
 msgid "years"
@@ -13585,27 +13998,25 @@ msgstr ""
 
 #. Translators: ;-)
 #: ../src/e-util/e-emoticon-chooser.c:42
-#, fuzzy
 #| msgid "_Window"
 msgid "_Wink"
-msgstr "ਵਿੰਡੋ(_W)"
+msgstr "ਝਪਕਣਾ(_W)"
 
 #. Translators: :-P
 #: ../src/e-util/e-emoticon-chooser.c:44
 msgid "Ton_gue"
-msgstr ""
+msgstr "ਜੀਭ ਕੱਢੀ(_g)"
 
 #. Translators: :-))
 #: ../src/e-util/e-emoticon-chooser.c:46
 msgid "Laug_h"
-msgstr ""
+msgstr "ਹੱਸਦਾ(_h)"
 
 #. Translators: :-|
 #: ../src/e-util/e-emoticon-chooser.c:48
-#, fuzzy
 #| msgid "_Plain text"
 msgid "_Plain"
-msgstr "ਪਲੇਨ ਟੈਕਸਟ(_P)"
+msgstr "ਪਲੇਨ(_P)"
 
 #. Translators: :-!
 #: ../src/e-util/e-emoticon-chooser.c:50
@@ -13679,10 +14090,9 @@ msgstr ""
 
 #. Translators: :-(|)
 #: ../src/e-util/e-emoticon-chooser.c:78
-#, fuzzy
 #| msgid "_Mon"
 msgid "_Monkey"
-msgstr "ਸੋਮ(_M)"
+msgstr "ਬਾਂਦਰ(_M)"
 
 #: ../src/e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
@@ -13690,18 +14100,18 @@ msgstr "(ਅਣਜਾਣ ਫਾਇਲ ਨਾਂ)"
 
 #. Translators: The string value is the basename of a file.
 #: ../src/e-util/e-file-utils.c:125
-#, fuzzy, c-format
+#, c-format
 #| msgid "Writing \"%s\""
 msgid "Writing “%s”"
-msgstr "\"%s\" ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "”%s” ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
 #: ../src/e-util/e-file-utils.c:130
-#, fuzzy, c-format
+#, c-format
 #| msgid "Writing \"%s\" to %s"
 msgid "Writing “%s” to %s"
-msgstr "\"%s\" ਨੂੰ %s ਉੱਤੇ ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "”%s” ਨੂੰ %s ਉੱਤੇ ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
@@ -13856,8 +14266,8 @@ msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29
-#: ../src/mail/e-mail-autoconfig.c:763
-#: ../src/mail/e-mail-config-summary-page.c:141
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:143
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
@@ -13887,650 +14297,702 @@ msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
 #: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
+#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1044
+#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1043
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
-#: ../src/e-util/e-html-editor-actions.c:80
-#, fuzzy
+#: ../src/e-util/e-gtkemojichooser.c:753
+#| msgid "Receiving"
+msgctxt "EmojiChooser"
+msgid "Recent"
+msgstr "ਤਾਜ਼ਾ"
+
+#: ../src/e-util/e-gtkemojichooser.c:757
+msgctxt "EmojiChooser"
+msgid "Smileys & People"
+msgstr "ਸਮਾਈਲੀ ਤੇ ਲੋਕ"
+
+#: ../src/e-util/e-gtkemojichooser.c:758
+#| msgid "Body contains"
+msgctxt "EmojiChooser"
+msgid "Body & Clothing"
+msgstr "ਸਰੀਰ ਤੇ ਕੱਪੜੇ"
+
+#: ../src/e-util/e-gtkemojichooser.c:759
+msgctxt "EmojiChooser"
+msgid "Animals & Nature"
+msgstr "ਜਾਨਵਰ ਤੇ ਕੁਦਰਤ"
+
+#: ../src/e-util/e-gtkemojichooser.c:760
+msgctxt "EmojiChooser"
+msgid "Food & Drink"
+msgstr "ਖਾਣ-ਪੀਣ"
+
+#: ../src/e-util/e-gtkemojichooser.c:761
+msgctxt "EmojiChooser"
+msgid "Travel & Places"
+msgstr "ਯਾਤਰਾ ਅਤੇ ਥਾਵਾਂ"
+
+#: ../src/e-util/e-gtkemojichooser.c:762
+#| msgid "Authorities"
+msgctxt "EmojiChooser"
+msgid "Activities"
+msgstr "ਸਰਗਰਮੀਆਂ"
+
+#: ../src/e-util/e-gtkemojichooser.c:763
+#| msgid "Subject"
+msgctxt "EmojiChooser"
+msgid "Objects"
+msgstr "ਚੀਜ਼ਾਂ"
+
+#: ../src/e-util/e-gtkemojichooser.c:764
+msgctxt "EmojiChooser"
+msgid "Symbols"
+msgstr "ਚਿੰਨ੍ਹ"
+
+#: ../src/e-util/e-gtkemojichooser.c:765
+#| msgid "Flags"
+msgctxt "EmojiChooser"
+msgid "Flags"
+msgstr "ਝੰਡੇ"
+
+#: ../src/e-util/e-gtkemojichooser.c:789
+msgctxt "EmojiChooser"
+msgid "No Results Found"
+msgstr "ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਲੱਭਿਆ"
+
+#: ../src/e-util/e-gtkemojichooser.c:797
+#| msgid "Try again with a different password."
+msgctxt "EmojiChooser"
+msgid "Try a different search"
+msgstr "ਵੱਖਰੀ ਖੋਜ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
+
+#: ../src/e-util/e-html-editor-actions.c:81
 #| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
-msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+msgstr "HTML ਫਾਇਲ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।"
 
-#: ../src/e-util/e-html-editor-actions.c:118
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:119
 #| msgid "Failed to import certificate"
 msgid "Failed to insert text file."
-msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+msgstr "ਲਿਖਤ ਫਾਇਲ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ।"
 
-#: ../src/e-util/e-html-editor-actions.c:302
+#: ../src/e-util/e-html-editor-actions.c:340
 msgid "Insert HTML File"
-msgstr ""
+msgstr "HTML ਫਾਇਲ ਜੋੜੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:307
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:345
 #| msgid "HTML _Mode"
 msgid "HTML file"
-msgstr "HT_ML ਮੋਡ"
+msgstr "HTML ਫਾਇਲ"
 
-#: ../src/e-util/e-html-editor-actions.c:345
-#: ../src/e-util/e-html-editor-actions.c:355
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:383
+#: ../src/e-util/e-html-editor-actions.c:401
 #| msgid "Inline Image"
 msgctxt "dialog-title"
 msgid "Insert Image"
-msgstr "ਆਨਲਾਈਨ ਚਿੱਤਰ"
+msgstr "ਚਿੱਤਰ ਪਾਓ"
 
-#: ../src/e-util/e-html-editor-actions.c:352
-#, fuzzy
-#| msgid "Image files"
-msgid "Image file"
+#: ../src/e-util/e-html-editor-actions.c:390
+#: ../src/e-util/e-html-editor-actions.c:408
+#: ../src/e-util/e-image-chooser-dialog.c:188 ../src/plugins/face/face.c:301
+msgid "Image files"
 msgstr "ਤਸਵੀਰ ਫਾਇਲਾਂ"
 
-#: ../src/e-util/e-html-editor-actions.c:428
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:487
 #| msgid "Increase the text size"
 msgid "Insert text file"
-msgstr "ਟੈਕਸਟ ਆਕਾਰ ਵਧਾਓ"
+msgstr "ਲਿਖਤ ਫਾਇਲ ਜੋੜੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:433
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:492
 #| msgid "Select a file"
 msgid "Text file"
-msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
+msgstr "ਲਿਖਤ ਫਾਇਲ"
 
-#: ../src/e-util/e-html-editor-actions.c:912
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:971
 #| msgid "Copy selected events to the clipboard"
 msgid "Copy selected text to the clipboard"
-msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
+msgstr "ਚੁਣੀ ਲਿਖਤ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:919
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:978
 #| msgid "Cut selected events to the clipboard"
 msgid "Cut selected text to the clipboard"
-msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
+msgstr "ਚੁਣੀ ਲਿਖਤ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:926
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:985
 #| msgid "Paste events from the clipboard"
 msgid "Paste text from the clipboard"
-msgstr "ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
+msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਲਿਖਤ ਚੇਪੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:933
+#: ../src/e-util/e-html-editor-actions.c:992
 msgid "Redo the last undone action"
 msgstr "ਆਖਰੀ ਵਾਪਸ ਕੀਤੀ ਕਾਰਵਾਈ ਨੂੰ ਮੁੜ-ਕਰੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:947
+#: ../src/e-util/e-html-editor-actions.c:1006
 msgid "Undo the last action"
 msgstr "ਪਿਛਲੀ ਕਾਰਵਾਈ ਵਾਪਸ ਲਵੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:968
+#: ../src/e-util/e-html-editor-actions.c:1027
 msgid "For_mat"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:975
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1034
 #| msgid "Tool_bar Style"
 msgid "_Paragraph Style"
-msgstr "ਟੂਲਬਾਰ ਸਟਾਈਲ(_b)"
+msgstr "ਪ੍ਹੈਰਾ ਸਟਾਈਲ(_P)"
 
-#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-actions.c:1048
 #: ../src/e-util/e-html-editor-image-dialog.c:590
-#, fuzzy
 #| msgid "A_lignment"
 msgid "_Alignment"
-msgstr "ਇਕਸਾਰ(_L)"
+msgstr "ਇਕਸਾਰ(_A)"
 
-#: ../src/e-util/e-html-editor-actions.c:996
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1055
 #| msgid "_Languages"
 msgid "Current _Languages"
-msgstr "ਭਾਸ਼ਾ(_L)"
+msgstr "ਮੌਜੂਦਾ ਭਾਸ਼ਾਵਾਂ(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1013
+#: ../src/e-util/e-html-editor-actions.c:1072
 msgid "_Increase Indent"
-msgstr ""
+msgstr "ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰੀ ਵਧਾਓ(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:1015
+#: ../src/e-util/e-html-editor-actions.c:1074
 msgid "Increase Indent"
-msgstr ""
+msgstr "ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰੀ ਵਧਾਓ"
 
-#: ../src/e-util/e-html-editor-actions.c:1020
-msgid "_HTML File..."
-msgstr ""
+#: ../src/e-util/e-html-editor-actions.c:1079
+#: ../src/e-util/e-html-editor-actions.c:2087
+msgid "E_moji"
+msgstr "ਈਮੋਜ਼ੀ(_m)"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
-msgid "Te_xt File..."
-msgstr ""
+#: ../src/e-util/e-html-editor-actions.c:1081
+#| msgid "Insert Send options"
+msgid "Insert Emoji"
+msgstr "ਈਮੋਜ਼ੀ ਪਾਓ"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1086
+#| msgid "HTML _Mode"
+msgid "_HTML File…"
+msgstr "_HTML ਫਾਇਲ…"
+
+#: ../src/e-util/e-html-editor-actions.c:1093
+#| msgid "Message Filters"
+msgid "Te_xt File…"
+msgstr "ਲਿਖਤ ਫਾਇਲ(_x)…"
+
+#: ../src/e-util/e-html-editor-actions.c:1100
 msgid "Paste _Quotation"
-msgstr ""
+msgstr "ਹਵਾਲਾ ਚੇਪੋ(_Q)"
 
-#: ../src/e-util/e-html-editor-actions.c:1041
-#, fuzzy
-#| msgid "_Find in Memo..."
-msgid "_Find..."
-msgstr "ਮੀਮੋ 'ਚ ਖੋਜ(_F)..."
+#: ../src/e-util/e-html-editor-actions.c:1107
+#| msgid "_Find Now"
+msgid "_Find…"
+msgstr "…ਖੋਜੋ(_F)"
 
-#: ../src/e-util/e-html-editor-actions.c:1043
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "Search for text"
-msgstr "ਟੈਕਸਟ ਖੋਜੋ"
+msgstr "ਲਿਖਤ ਲਈ ਖੋਜੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1114
 #| msgid "Find _next"
 msgid "Find A_gain"
-msgstr "ਅੱਗੇ ਖੋਜ(_n)"
+msgstr "ਮੁਡ਼ ਖੋਜੋ(_g)"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
-#, fuzzy
-#| msgid "_Replace"
-msgid "Re_place..."
-msgstr "ਬਦਲੋ(_R)"
+#: ../src/e-util/e-html-editor-actions.c:1121
+#| msgid "Re_place"
+msgid "Re_place…"
+msgstr "ਬਦਲੋ(_p)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1057
+#: ../src/e-util/e-html-editor-actions.c:1123
 msgid "Search for and replace text"
 msgstr "ਟੈਕਸਟ ਦੀ ਖੋਜ ਕਰੋ ਅਤੇ ਬਦਲੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:1062
-#, fuzzy
+#: ../src/e-util/e-html-editor-actions.c:1128
 #| msgid "Canceling..."
-msgid "Check _Spelling..."
-msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgid "Check _Spelling…"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ(_S)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1069
+#: ../src/e-util/e-html-editor-actions.c:1135
 msgid "_Decrease Indent"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1071
+#: ../src/e-util/e-html-editor-actions.c:1137
 msgid "Decrease Indent"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1076
+#: ../src/e-util/e-html-editor-actions.c:1142
 #, fuzzy
 #| msgid "Max lines"
 msgid "_Wrap Lines"
 msgstr "ਅਧਿਕਤਮ ਲਾਈਨਾਂ"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1152
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1088
+#: ../src/e-util/e-html-editor-actions.c:1154
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Center Alignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1159
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 #, fuzzy
 #| msgid "Left:"
 msgid "_Left"
 msgstr "ਖੱਬਾ:"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1161
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Left Alignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1166
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 #, fuzzy
 #| msgid "Right:"
 msgid "_Right"
 msgstr "ਸੱਜਾ:"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1168
 #, fuzzy
 #| msgid "A_lignment"
 msgid "Right Alignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1110
+#: ../src/e-util/e-html-editor-actions.c:1176
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1112
+#: ../src/e-util/e-html-editor-actions.c:1178
 msgid "HTML editing mode"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1117
+#: ../src/e-util/e-html-editor-actions.c:1183
 #, fuzzy
 #| msgid "Plain Text"
 msgid "Plain _Text"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ"
 
-#: ../src/e-util/e-html-editor-actions.c:1119
+#: ../src/e-util/e-html-editor-actions.c:1185
 #, fuzzy
 #| msgid "Plain Text Mode"
 msgid "Plain text editing mode"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
 
-#: ../src/e-util/e-html-editor-actions.c:1127
+#: ../src/e-util/e-html-editor-actions.c:1193
 #, fuzzy
 #| msgid "Normal"
 msgid "_Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/e-util/e-html-editor-actions.c:1134
+#: ../src/e-util/e-html-editor-actions.c:1200
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _1"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1141
+#: ../src/e-util/e-html-editor-actions.c:1207
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _2"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1148
+#: ../src/e-util/e-html-editor-actions.c:1214
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _3"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1155
+#: ../src/e-util/e-html-editor-actions.c:1221
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _4"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1162
+#: ../src/e-util/e-html-editor-actions.c:1228
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _5"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1169
+#: ../src/e-util/e-html-editor-actions.c:1235
 #, fuzzy
 #| msgid "Headings"
 msgid "Heading _6"
 msgstr "ਹੈਡਿੰਗ"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1242
 #, fuzzy
 #| msgid "View _Unformatted"
 msgid "_Preformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1249
 #, fuzzy
 #| msgid "Address"
 msgid "A_ddress"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../src/e-util/e-html-editor-actions.c:1190
+#: ../src/e-util/e-html-editor-actions.c:1256
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../src/e-util/e-html-editor-actions.c:1197
+#: ../src/e-util/e-html-editor-actions.c:1263
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1204
+#: ../src/e-util/e-html-editor-actions.c:1270
 #, fuzzy
 #| msgid "Retrieve _List"
 msgid "Numbered _List"
 msgstr "ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1277
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1227
-#: ../src/e-util/e-html-editor-actions.c:1265
-#| msgid "Save _Image..."
-msgid "_Image..."
-msgstr "ਚਿੱਤਰ(_I)..."
+#: ../src/e-util/e-html-editor-actions.c:1293
+#: ../src/e-util/e-html-editor-actions.c:1331
+#, fuzzy
+#| msgid "_Image"
+msgid "_Image…"
+msgstr "ਚਿੱਤਰ(_I)"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1230
+#: ../src/e-util/e-html-editor-actions.c:1296
 #, fuzzy
 #| msgid "Inline Image"
 msgid "Insert Image"
 msgstr "ਆਨਲਾਈਨ ਚਿੱਤਰ"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
-#: ../src/e-util/e-html-editor-actions.c:1272
-msgid "_Link..."
+#: ../src/e-util/e-html-editor-actions.c:1301
+#: ../src/e-util/e-html-editor-actions.c:1338
+msgid "_Link…"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1237
+#: ../src/e-util/e-html-editor-actions.c:1303
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Link"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1243
-#: ../src/e-util/e-html-editor-actions.c:1287
+#: ../src/e-util/e-html-editor-actions.c:1309
+#: ../src/e-util/e-html-editor-actions.c:1353
 #, fuzzy
-#| msgid "_Rename..."
-msgid "_Rule..."
-msgstr "ਨਾਂ ਬਦਲੋ(_R)..."
+#| msgid "Add Rule"
+msgid "_Rule…"
+msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1246
+#: ../src/e-util/e-html-editor-actions.c:1312
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Rule"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../src/e-util/e-html-editor-actions.c:1251
-#: ../src/e-util/e-html-editor-actions.c:1294
-#| msgid "Table"
-msgid "_Table..."
-msgstr "ਟੇਬਲ(_ T)..."
+#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1360
+#, fuzzy
+#| msgid "_Table"
+msgid "_Table…"
+msgstr "ਟੇਬਲ(_ T)"
 
-#: ../src/e-util/e-html-editor-actions.c:1253
+#: ../src/e-util/e-html-editor-actions.c:1319
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Table"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../src/e-util/e-html-editor-actions.c:1258
-msgid "_Cell..."
+#: ../src/e-util/e-html-editor-actions.c:1324
+msgid "_Cell…"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1279
+#: ../src/e-util/e-html-editor-actions.c:1345
 #, fuzzy
 #| msgid "Save _Image..."
-msgid "Pa_ge..."
+msgid "Pa_ge…"
 msgstr "ਚਿੱਤਰ ਇੰਝ ਸੰਭਾਲੋ(_I)..."
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1369
 #, fuzzy
 #| msgid "Folder Size"
 msgid "Font _Size"
 msgstr "ਆਕਾਰ(_S)"
 
-#: ../src/e-util/e-html-editor-actions.c:1310
+#: ../src/e-util/e-html-editor-actions.c:1376
 #, fuzzy
 #| msgid "_Forward style:"
 msgid "_Font Style"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਈਲ(_F):"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
+#: ../src/e-util/e-html-editor-actions.c:1383
 msgid "Paste As _Text"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1394
 #: ../src/e-util/e-html-editor-text-dialog.c:201
-#| msgid "Bold"
 msgid "_Bold"
 msgstr "ਗੂੜ੍ਹਾ(_B)"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "Bold"
 msgstr "ਗੂੜਾ"
 
-#: ../src/e-util/e-html-editor-actions.c:1336
+#: ../src/e-util/e-html-editor-actions.c:1402
 #: ../src/e-util/e-html-editor-text-dialog.c:212
-#| msgid "Italy"
 msgid "_Italic"
 msgstr "ਤਿਰਛਾ(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:1338
-#| msgid "Italy"
+#: ../src/e-util/e-html-editor-actions.c:1404
 msgid "Italic"
 msgstr "ਤਿਰਛੇ"
 
-#: ../src/e-util/e-html-editor-actions.c:1344
-#| msgid "Plain Text"
+#: ../src/e-util/e-html-editor-actions.c:1410
 msgid "_Plain Text"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ(_P)"
 
-#: ../src/e-util/e-html-editor-actions.c:1352
+#: ../src/e-util/e-html-editor-actions.c:1418
 #: ../src/e-util/e-html-editor-text-dialog.c:233
-#| msgid "Strikeout"
 msgid "_Strikethrough"
 msgstr "ਵਿੰਨੋ(_S)"
 
-#: ../src/e-util/e-html-editor-actions.c:1354
-#| msgid "Strikeout"
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "Strikethrough"
 msgstr "ਵਿੰਨ੍ਹੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1426
 #: ../src/e-util/e-html-editor-text-dialog.c:223
-#| msgid "Undefined"
 msgid "_Underline"
 msgstr "ਹੇਠਾਂ ਲਾਈਨ(_U)"
 
-#: ../src/e-util/e-html-editor-actions.c:1362
+#: ../src/e-util/e-html-editor-actions.c:1428
 #, fuzzy
 #| msgid "Undefined"
 msgid "Underline"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "-2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1380
-#| msgid "1"
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1454
 msgid "+0"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1396
-#| msgid "1"
+#: ../src/e-util/e-html-editor-actions.c:1462
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1404
+#: ../src/e-util/e-html-editor-actions.c:1470
 msgid "+2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "+3"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1486
 msgid "+4"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1439
+#: ../src/e-util/e-html-editor-actions.c:1505
 #, fuzzy
 #| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1512
 #, fuzzy
 #| msgid "Bold Column"
 msgid "Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
-#| msgid "Low"
+#: ../src/e-util/e-html-editor-actions.c:1519
 msgid "Row"
 msgstr "ਕਤਾਰ"
 
-#: ../src/e-util/e-html-editor-actions.c:1460
+#: ../src/e-util/e-html-editor-actions.c:1526
 msgid "Table"
 msgstr "ਟੇਬਲ"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1536
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Delete"
 msgstr "ਟੇਬਲ ਸੈੱਲ"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1544
 #, fuzzy
 #| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "ਟੇਬਲ ਸੈੱਲ"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
-#| msgid "_Properties"
+#: ../src/e-util/e-html-editor-actions.c:1551
 msgid "Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../src/e-util/e-html-editor-actions.c:1503
+#: ../src/e-util/e-html-editor-actions.c:1569
 #, fuzzy
 #| msgid "Column Width"
 msgid "Column After"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../src/e-util/e-html-editor-actions.c:1510
+#: ../src/e-util/e-html-editor-actions.c:1576
 msgid "Column Before"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1517
+#: ../src/e-util/e-html-editor-actions.c:1583
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert _Link"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../src/e-util/e-html-editor-actions.c:1524
+#: ../src/e-util/e-html-editor-actions.c:1590
 msgid "Row Above"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1531
+#: ../src/e-util/e-html-editor-actions.c:1597
 msgid "Row Below"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1538
-msgid "Cell..."
+#: ../src/e-util/e-html-editor-actions.c:1604
+msgid "Cell…"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1545
+#: ../src/e-util/e-html-editor-actions.c:1611
+#, fuzzy
 #| msgid "Image"
-msgid "Image..."
-msgstr "ਚਿੱਤਰ..."
+msgid "Image…"
+msgstr "ਚਿੱਤਰ"
 
-#: ../src/e-util/e-html-editor-actions.c:1552
-msgid "Link..."
+#: ../src/e-util/e-html-editor-actions.c:1618
+msgid "Link…"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1559
+#: ../src/e-util/e-html-editor-actions.c:1625
+#, fuzzy
 #| msgid "Pager"
-msgid "Page..."
-msgstr "ਸਫ਼ਾ..."
+msgid "Page…"
+msgstr "ਪੇਜ਼ਰ"
 
-#: ../src/e-util/e-html-editor-actions.c:1566
-#| msgid "Paraguay"
-msgid "Paragraph..."
+#: ../src/e-util/e-html-editor-actions.c:1632
+#, fuzzy
+#| msgid "Paragraph..."
+msgid "Paragraph…"
 msgstr "ਪ੍ਹੈਰਾ..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1574
+#: ../src/e-util/e-html-editor-actions.c:1640
 #, fuzzy
-#| msgid "Full _Name..."
-msgid "Rule..."
-msgstr "ਪੂਰਾ ਨਾਂ(_N)..."
+#| msgid "Add Rule"
+msgid "Rule…"
+msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:1581
+#: ../src/e-util/e-html-editor-actions.c:1647
+#, fuzzy
 #| msgid "Table"
-msgid "Table..."
-msgstr "ਟੇਬਲ..."
+msgid "Table…"
+msgstr "ਟੇਬਲ"
 
-#: ../src/e-util/e-html-editor-actions.c:1588
-#| msgid "Text"
-msgid "Text..."
-msgstr "ਲਿਖਤ..."
+#: ../src/e-util/e-html-editor-actions.c:1654
+#, fuzzy
+#| msgid "_Text:"
+msgid "Text…"
+msgstr "ਲਿਖਤ(_T):"
 
-#: ../src/e-util/e-html-editor-actions.c:1595
-#| msgid "_Remove"
+#: ../src/e-util/e-html-editor-actions.c:1661
 msgid "Remove Link"
 msgstr "ਲਿੰਕ ਹਟਾਓ"
 
-#: ../src/e-util/e-html-editor-actions.c:1612
+#: ../src/e-util/e-html-editor-actions.c:1678
 #, fuzzy
 #| msgid "Add \"%s\" to Dictionary"
 msgid "Add Word to Dictionary"
 msgstr "\"%s\" ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:1619
+#: ../src/e-util/e-html-editor-actions.c:1685
 #, fuzzy
 #| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "ਗਲਤ ਸ਼ਬਦ-ਜੋੜ ਅੱਖਰਾਂ ਦਾ ਰੰਗ(_m):"
 
-#: ../src/e-util/e-html-editor-actions.c:1626
+#: ../src/e-util/e-html-editor-actions.c:1692
 msgid "Add Word To"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1635
-#| msgid "(no suggestions)"
+#: ../src/e-util/e-html-editor-actions.c:1701
 msgid "More Suggestions"
 msgstr "ਹੋਰ ਸੁਝਾਅ"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1870
+#: ../src/e-util/e-html-editor-actions.c:1936
 #, c-format
-#| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "%s ਸ਼ਬਦ-ਕੋਸ਼"
 
-#: ../src/e-util/e-html-editor-actions.c:1949
+#: ../src/e-util/e-html-editor-actions.c:2015
 msgid "_Emoticon"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1950
+#: ../src/e-util/e-html-editor-actions.c:2016
 #, fuzzy
 #| msgid "Insert Send options"
 msgid "Insert Emoticon"
 msgstr "ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
 
-#: ../src/e-util/e-html-editor-actions.c:2018
-#| msgid "_Replace"
+#: ../src/e-util/e-html-editor-actions.c:2084
 msgid "Re_place"
 msgstr "ਬਦਲੋ(_p)"
 
-#: ../src/e-util/e-html-editor-actions.c:2021
-#| msgid "Image"
+#: ../src/e-util/e-html-editor-actions.c:2090
 msgid "_Image"
 msgstr "ਚਿੱਤਰ(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:2024
+#: ../src/e-util/e-html-editor-actions.c:2093
 msgid "_Link"
 msgstr ""
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2028
+#: ../src/e-util/e-html-editor-actions.c:2097
 #, fuzzy
 #| msgid "Add Rule"
 msgid "_Rule"
 msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../src/e-util/e-html-editor-actions.c:2031
+#: ../src/e-util/e-html-editor-actions.c:2100
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
-#| msgid "Table"
 msgid "_Table"
 msgstr "ਟੇਬਲ(_ T)"
 
@@ -14547,12 +15009,10 @@ msgid "Editing Mode"
 msgstr "ਰੀਮਾਈਂਡਰ ਸੋਧ"
 
 #: ../src/e-util/e-html-editor.c:769
-#| msgid "Unset Color"
 msgid "Font Color"
 msgstr "ਫੋਂਟ ਰੰਗ"
 
 #: ../src/e-util/e-html-editor.c:779
-#| msgid "Folder Size"
 msgid "Font Size"
 msgstr "ਫੋਂਟ ਸਾਈਜ਼"
 
@@ -14581,7 +15041,6 @@ msgstr ""
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
 #: ../src/e-util/e-html-editor-hrule-dialog.c:328
 #: ../src/e-util/e-html-editor-table-dialog.c:648
-#| msgid "Left:"
 msgid "Left"
 msgstr "ਖੱਬਾ"
 
@@ -14594,7 +15053,6 @@ msgstr ""
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
 #: ../src/e-util/e-html-editor-hrule-dialog.c:332
 #: ../src/e-util/e-html-editor-table-dialog.c:650
-#| msgid "Right:"
 msgid "Right"
 msgstr "ਸੱਜਾ"
 
@@ -14606,19 +15064,16 @@ msgstr "ਖਿਤਿਜੀ ਸਥਿਤੀ"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
 #: ../src/e-util/e-html-editor-image-dialog.c:580
-#| msgid "Top:"
 msgid "Top"
 msgstr "ਉੱਤੇ"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
 #: ../src/e-util/e-html-editor-image-dialog.c:581
-#| msgid "_Middle:"
 msgid "Middle"
 msgstr "ਮੱਧ"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
 #: ../src/e-util/e-html-editor-image-dialog.c:582
-#| msgid "Bottom:"
 msgid "Bottom"
 msgstr "ਹੇਠਾਂ"
 
@@ -14645,13 +15100,11 @@ msgstr "ਹੈੱਡਰ ਮੁੱਲ"
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
 #: ../src/e-util/e-html-editor-image-dialog.c:520
 #: ../src/e-util/e-html-editor-table-dialog.c:560
-#| msgid "<b>Notes</b>"
 msgid "<b>Layout</b>"
 msgstr "<b>ਲੇਆਉਟ</b>"
 
 #. Width
 #: ../src/e-util/e-html-editor-cell-dialog.c:551
-#| msgid "Width"
 msgid "_Width"
 msgstr "ਚੌੜਾਈ(_W)"
 
@@ -14665,7 +15118,6 @@ msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
 #: ../src/e-util/e-html-editor-table-dialog.c:664
-#| msgid "<b>Tracking Options</b>"
 msgid "<b>Background</b>"
 msgstr "<b>ਬੈਕਗਰਾਊਂਡ</b>"
 
@@ -14685,7 +15137,6 @@ msgstr "ਕਸਟਮ ਰੰਗ ਵਾਂਗ(_o):"
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
 #: ../src/e-util/e-html-editor-image-dialog.c:476
 #: ../src/e-util/e-html-editor-table-dialog.c:692
-#| msgid "Image"
 msgid "Images"
 msgstr "ਚਿੱਤਰ"
 
@@ -14695,12 +15146,10 @@ msgstr "ਚਿੱਤਰ"
 #: ../src/e-util/e-html-editor-image-dialog.c:484
 #: ../src/e-util/e-html-editor-table-dialog.c:697
 #: ../src/e-util/e-html-editor-table-dialog.c:702
-#| msgid "Choose Image"
 msgid "Choose Background Image"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਚਿੱਤਰ ਚੁਣੋ"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:662
-#| msgid "Image"
 msgid "_Image:"
 msgstr "ਚਿੱਤਰ(_I):"
 
@@ -14731,7 +15180,6 @@ msgid "Search _backwards"
 msgstr "ਖੋਜ ਬੇਸ(_b):"
 
 #: ../src/e-util/e-html-editor-find-dialog.c:222
-#| msgid "Case _sensitive"
 msgid "Case _Sensitive"
 msgstr "ਅੱਖਰ ਅਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ(_S)"
 
@@ -14741,14 +15189,13 @@ msgstr "ਅੱਖਰ ਅਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ
 msgid "_Wrap Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
 #, fuzzy
 #| msgid "_Find Now"
 msgid "Find"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:263
-#| msgid "<b>Server</b>"
 msgid "<b>Size</b>"
 msgstr "<b>ਅਕਾਰ</b>"
 
@@ -14756,17 +15203,14 @@ msgstr "<b>ਅਕਾਰ</b>"
 #: ../src/e-util/e-html-editor-hrule-dialog.c:283
 #: ../src/e-util/e-html-editor-image-dialog.c:538
 #: ../src/e-util/e-html-editor-table-dialog.c:571
-#| msgid "Width:"
 msgid "_Width:"
 msgstr "ਚੌੜਾਈ(_W):"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:308
-#| msgid "Size:"
 msgid "_Size:"
 msgstr "ਆਕਾਰ(_S):"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:315
-#| msgid "<b>Notes</b>"
 msgid "<b>Style</b>"
 msgstr "<b>ਸਟਾਈਲ</b>"
 
@@ -14791,7 +15235,6 @@ msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
 #: ../src/e-util/e-html-editor-image-dialog.c:465
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:64
 #: ../src/e-util/e-html-editor-table-dialog.c:514
-#| msgid "<b>Server</b>"
 msgid "<b>General</b>"
 msgstr "<b>ਸਧਾਰਨ</b>"
 
@@ -14821,18 +15264,16 @@ msgid "_Border:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-image-dialog.c:645
-#| msgid "<b>Work</b>"
 msgid "<b>Link</b>"
 msgstr "<b>ਲਿੰਕ</b>"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-link-dialog.c:213
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:668
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
+msgid "_Test URL…"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-image-dialog.c:685
@@ -14841,12 +15282,11 @@ msgstr ""
 msgid "Image Properties"
 msgstr "ਕੈਟਾਗਰੀ ਗੁਣ"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:248
-#| msgid "_Remove"
+#: ../src/e-util/e-html-editor-link-dialog.c:236
 msgid "_Remove Link"
 msgstr "ਲਿੰਕ ਹਟਾਓ(_R)"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:261
 #, fuzzy
 #| msgid "Font Properties"
 msgid "Link Properties"
@@ -14885,12 +15325,10 @@ msgid "Graph Paper"
 msgstr "ਸਫਾ"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:379
-#| msgid "<b>Work</b>"
 msgid "<b>Colors</b>"
 msgstr "<b>ਰੰਗ</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:398
-#| msgid "Text"
 msgid "_Text:"
 msgstr "ਲਿਖਤ(_T):"
 
@@ -14903,12 +15341,10 @@ msgid "_Visited Link:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-page-dialog.c:443
-#| msgid "Set as _Background"
 msgid "_Background:"
 msgstr "ਬੈਕਗਰਾਊਂਡ(_B):"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:451
-#| msgid "<b>Account Name</b>"
 msgid "<b>Background Image</b>"
 msgstr "<b>ਬੈਕਗਰਾਊਂਡ ਚਿੱਤਰ</b>"
 
@@ -14920,12 +15356,11 @@ msgid "_Template:"
 msgstr "ਟੈਪਲੇਟ:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:488
-#| msgid "_Custom"
 msgid "_Custom:"
 msgstr "ਕਸਟਮ(_C):"
 
@@ -14936,12 +15371,10 @@ msgid "Page Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)"
 
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:81
-#| msgid "Style name:"
 msgid "_Style:"
 msgstr "ਸਟਾਈਲ(_S):"
 
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:88
-#| msgid "<b>Alarm</b>"
 msgid "<b>Alignment</b>"
 msgstr "<b>ਇਕਸਾਰ</b>"
 
@@ -14999,7 +15432,6 @@ msgid "Replace _All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
 #: ../src/e-util/e-html-editor-replace-dialog.c:349
-#| msgid "_Replace"
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "ਤਬਦੀਲ"
@@ -15009,54 +15441,50 @@ msgstr "ਤਬਦੀਲ"
 msgid "<b>Suggestions for “%s”</b>"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
-#| msgid "<b>Options</b>"
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:387
 msgid "<b>Suggestions</b>"
 msgstr "<b>ਸੁਝਾਅ</b>"
 
 #. Replace
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:422
 #, fuzzy
 #| msgid "_Replace"
 msgid "Replace"
 msgstr "ਬਦਲੋ(_R)"
 
 #. Replace All
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:431
 #, fuzzy
 #| msgid "_Replace"
 msgid "Replace All"
 msgstr "ਬਦਲੋ(_R)"
 
 #. Ignore
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:440
 #: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
 #. Skip
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:449
 msgid "Skip"
 msgstr ""
 
 #. Back
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
-#| msgid "Go Back"
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:458
 msgid "Back"
 msgstr "ਪਿੱਛੇ"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
-#| msgid "<b>Options</b>"
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:467
 msgid "<b>Dictionary</b>"
 msgstr "<b>ਸ਼ਬਦਕੋਸ਼</b>"
 
 #. Add Word button
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
-#| msgid "Add Folder"
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:487
 msgid "Add word"
 msgstr "ਸ਼ਬਦ ਜੋੜੋ"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:504
 #: ../src/mail/mail-config.ui.h:42
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
@@ -15085,18 +15513,15 @@ msgstr "ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
 #: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2418
-#| msgid "Color:"
+#: ../src/e-util/e-webdav-browser.c:2427
 msgid "_Color:"
 msgstr "ਰੰਗ(_C):"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:716
-#| msgid "Image"
 msgid "Image:"
 msgstr "ਚਿੱਤਰ:"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:743
-#| msgid "Calendar Properties"
 msgid "Table Properties"
 msgstr "ਸਾਰਣੀ ਵਿਸ਼ੇਸਤਾ"
 
@@ -15105,7 +15530,6 @@ msgid "Si_ze:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-text-dialog.c:283
-#| msgid "Font Properties"
 msgid "Text Properties"
 msgstr "ਲਿਖਤ ਵਿਸ਼ੇਸ਼ਤਾ"
 
@@ -15116,87 +15540,83 @@ msgid ""
 msgstr ""
 "ਫਾਇਲ, ਜੋ ਵੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਆਯਾਤ ਕਰਨੀ ਹੈ ਅਤੇ ਇਸ ਦੀ ਕਿਸਮ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੋ।"
 
-#: ../src/e-util/e-import-assistant.c:300
-#: ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301
+#: ../src/e-util/e-import-assistant.c:480
 msgid "File _type:"
 msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
-#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:956
+#: ../src/e-util/e-import-assistant.c:344
+#: ../src/e-util/e-import-assistant.c:962
 msgid "Choose the destination for this import"
 msgstr "ਇਸ ਆਯਾਤ ਲਈ ਨਿਯਤ ਸਥਾਨ ਚੁਣੋ"
 
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "ਚਲਾਉਣ ਲਈ ਆਯਾਤਕਾਰ ਦੀ ਕਿਸਮ ਚੁਣੋ:"
 
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
 msgid "Import data and settings from _older programs"
 msgstr "ਪੁਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਆਯਾਤ ਕਰੋ"
 
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
 msgid "Import a _single file"
 msgstr "ਇੱਕ ਇਕਹੇਰੀ ਫਾਇਲ ਆਯਾਤ ਕਰੋ(_s)"
 
-#: ../src/e-util/e-import-assistant.c:406
+#: ../src/e-util/e-import-assistant.c:409
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ ਜੀ:"
 
-#: ../src/e-util/e-import-assistant.c:536
-#| 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."
+#: ../src/e-util/e-import-assistant.c:541
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
 "would like to try again, please click the “Back” button."
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਨੇ ਹੇਠ ਲਿਖਿਆਂ ਤੋਂ ਸੈਟਿੰਗ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਜਾਂਚ ਕੀਤੀ ਹੈ: Pine, Netscape,"
-" Elm, "
-"ਕੇਮੇਲ। ਕੋਈ ਸੈਟਿੰਗ, ਜੋ ਕਿ ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਸਕੇ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ"
-" ਹੋ ਤਾਂ ”ਪਿੱਛੇ” "
-"ਬਟਨ ਨੂੰ ਦਬਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।"
+" Elm, ਕੇਮੇਲ। ਕੋਈ "
+"ਸੈਟਿੰਗ, ਜੋ ਕਿ ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਸਕੇ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ"
+" ”ਪਿੱਛੇ” ਬਟਨ ਨੂੰ ਦਬਾ ਕੇ ਮੁੜ "
+"ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../src/e-util/e-import-assistant.c:562
+#: ../src/e-util/e-import-assistant.c:568
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "%s ਤੋਂ:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:808
+#: ../src/e-util/e-import-assistant.c:814
 msgid "_Cancel Import"
 msgstr "ਇੰਪੋਰਟ ਕਰਨਾ ਰੱਦ ਕਰੋ(_C)"
 
-#: ../src/e-util/e-import-assistant.c:955
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Preview data to be imported"
 msgstr "ਇੰਪੋਰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡਾਟੇ ਦੀ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/e-util/e-import-assistant.c:961
-#: ../src/e-util/e-import-assistant.c:974
-#: ../src/e-util/e-import-assistant.c:1327
-#: ../src/e-util/e-import-assistant.c:1403
-#: ../src/e-util/e-import-assistant.c:1412
+#: ../src/e-util/e-import-assistant.c:967
+#: ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
 msgid "Import Data"
 msgstr "ਖਾਸ ਡਾਟਾ"
 
-#: ../src/e-util/e-import-assistant.c:969
+#: ../src/e-util/e-import-assistant.c:975
 msgid "Select what type of file you want to import from the list."
 msgstr "ਫਾਇਲ ਦੀ ਕਿਸਮ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਲਿਸਟ ਤੋਂ ਇੰਪੋਰਟ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../src/e-util/e-import-assistant.c:1317
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1359
 msgid "Evolution Import Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੰਪੋਰਟ ਸਹਾਇਕ"
 
-#: ../src/e-util/e-import-assistant.c:1334
-#: ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1340
+#: ../src/e-util/e-import-assistant.c:1397
 msgid "Import Location"
 msgstr "ਇੰਪੋਰਟ ਟਿਕਾਣਾ"
 
-#: ../src/e-util/e-import-assistant.c:1345
+#: ../src/e-util/e-import-assistant.c:1352
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -15206,25 +15626,24 @@ msgstr ""
 "ਇਸ ਸਹਾਇਕ ਨਾਲ ਤੁਸੀ ਬਾਹਰੀ ਫਾਇਲਾਂ ਈਵੇਲੂਸ਼ਨ ਤੇ ਇੰਪੋਰਟ \n"
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../src/e-util/e-import-assistant.c:1362
+#: ../src/e-util/e-import-assistant.c:1369
 msgid "Importer Type"
 msgstr "ਇੰਪੋਰਟਰ ਕਿਸਮ"
 
-#: ../src/e-util/e-import-assistant.c:1372
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Select Information to Import"
 msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਜਾਣਕਾਰੀ ਚੁਣੋ"
 
-#: ../src/e-util/e-import-assistant.c:1381
+#: ../src/e-util/e-import-assistant.c:1388
 msgid "Select a File"
 msgstr "ਫਾਇਲ ਚੁਣੋ"
 
-#: ../src/e-util/e-import-assistant.c:1398
-#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+#: ../src/e-util/e-import-assistant.c:1405
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਫਾਇਲ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ”ਲਾਗੂ ਕਰੋ” ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ।"
 
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:580
+#: ../src/mail/e-mail-config-provider-page.c:583
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
@@ -15308,44 +15727,41 @@ msgstr ""
 " ਸਮਾਂ-ਖੇਤਰ ਲਈ ਹੇਠਾਂ "
 "ਦਿੱਤਾ ਕੰਬੋਸਮਾਂ ਖੇਤਰ ਬਕਸਾ ਵਰਤ ਸਕਦੇ ਹਨ।"
 
-#: ../src/e-util/e-misc-utils.c:262
+#: ../src/e-util/e-misc-utils.c:279
 msgid "Could not open the link."
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
-#: ../src/e-util/e-misc-utils.c:346
+#: ../src/e-util/e-misc-utils.c:363
 msgid "Could not display help for Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਲਈ ਮੱਦਦ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../src/e-util/e-misc-utils.c:2547
+#: ../src/e-util/e-misc-utils.c:2562
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Opening calendar “%s”"
 msgstr "”%s” ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/e-util/e-misc-utils.c:2550
+#: ../src/e-util/e-misc-utils.c:2565
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Opening memo list “%s”"
 msgstr "”%s” ਮੀਮੋ ਖੋਲ੍ਹੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/e-util/e-misc-utils.c:2553
+#: ../src/e-util/e-misc-utils.c:2568
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Opening task list “%s”"
 msgstr "”%s” ਟਾਸਕ ਲਿਸਟ ਖੋਲ੍ਹੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/e-util/e-misc-utils.c:2556
+#: ../src/e-util/e-misc-utils.c:2571
 #, fuzzy, c-format
 #| msgid "evolution address book"
 msgid "Opening address book “%s”"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../src/e-util/e-misc-utils.c:3336
+#: ../src/e-util/e-misc-utils.c:3351
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)।"
 
-#: ../src/e-util/e-misc-utils.c:4189
+#: ../src/e-util/e-misc-utils.c:4249
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -15353,18 +15769,18 @@ msgstr ""
 "ਐਡਰੈੱਸ-ਬੁੱਕ ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਜਾਂ ਸਰਵਰ ਨਾਂ ਗਲਤ ਹੈ ਜਾਂ ਤੁਹਾਡਾ ਨੈੱਟਵਰਕ ਬੰਦ ਹੋ"
 " ਰਿਹਾ ਹੈ।"
 
-#: ../src/e-util/e-misc-utils.c:4201
+#: ../src/e-util/e-misc-utils.c:4261
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr ""
 
-#: ../src/e-util/e-misc-utils.c:4213
+#: ../src/e-util/e-misc-utils.c:4273
 #, fuzzy, c-format
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../src/e-util/e-misc-utils.c:4227
+#: ../src/e-util/e-misc-utils.c:4287
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support "
@@ -15381,7 +15797,7 @@ msgstr ""
 " ਹੈ ਜਾਂ "
 "ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../src/e-util/e-misc-utils.c:4238
+#: ../src/e-util/e-misc-utils.c:4298
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -15391,12 +15807,12 @@ msgstr ""
 " ਹੈ ਜਾਂ "
 "ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ, ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਮੱਦਦ ਲਈ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../src/e-util/e-misc-utils.c:4271
+#: ../src/e-util/e-misc-utils.c:4331
 msgid "Evolution had not been compiled with LDAP support"
 msgstr ""
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4585
+#: ../src/e-util/e-misc-utils.c:4654
 #, fuzzy, c-format
 #| msgid "Unknown"
 msgctxt "language"
@@ -15405,7 +15821,7 @@ msgstr "ਅਣਜਾਣ"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4594
+#: ../src/e-util/e-misc-utils.c:4663
 #, fuzzy, c-format
 #| msgctxt "folder-display"
 #| msgid "%s (%u%s)"
@@ -15430,11 +15846,11 @@ msgid "_Search:"
 msgstr "ਖੋਜ(_S):"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/e-util/e-name-selector-dialog.c:1325
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1702
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:785
-#: ../src/modules/calendar/e-task-shell-view-actions.c:958
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
 msgstr "ਕੋਈ ਕੈਟਾਗਰੀ"
 
@@ -15452,30 +15868,30 @@ msgid "Select Contacts from Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚੋਂ ਸੰਪਰਕ ਚੁਣੋ"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾਇਨ 'ਚ ਫੈਲਾਓ(_x)"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3268
+#: ../src/e-util/e-name-selector-entry.c:3250
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ਕਾਪੀ ਕਰੋ(_y)"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3261
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ਕੱਟੋ(_U)"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3297
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸੋਧ(_E)"
 
-#: ../src/e-util/e-name-selector-list.c:585
+#: ../src/e-util/e-name-selector-list.c:587
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ਹਟਾਓ(_D)"
@@ -15494,25 +15910,25 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਈਨ ਹੈ। 
 
 #: ../src/e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
-msgstr "ਕੀਰਿੰਗ ਕੀ ਅਣ-ਵਰਤੋਂਯੋਗ ਹੈ: ਕੋਈ ਹੋਸਟ ਜਾਂ ਯੂਜ਼ਰ ਨਹੀਂ"
+msgstr "ਕੀਰਿੰਗ ਕੀ ਅਣ-ਵਰਤੋਂਯੋਗ ਹੈ: ਕੋਈ ਹੋਸਟ ਜਾਂ ਵਰਤੋਂਕਾਰ ਨਹੀਂ"
 
 #: ../src/e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "ਤੁਹਾਡਾ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੈ।"
 
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase"
 msgstr "ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ਇਸ ਸ਼ੈਸ਼ਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password"
 msgstr "ਇਹ ਪਾਸਵਰਡ ਚੇਤੇ ਰੱਖੋ(_R)"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this password for the remainder of this session"
 msgstr "ਇਸ ਸ਼ੈਸਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 
@@ -15651,35 +16067,35 @@ msgstr "ਨਿਯਮ ਸੋਧ"
 msgid "Matches: %u"
 msgstr "ਮਿਲਦੇ: %u"
 
-#: ../src/e-util/e-search-bar.c:611
+#: ../src/e-util/e-search-bar.c:624
 msgid "Close the find bar"
 msgstr "ਇਹ ਪੱਟੀ ਬੰਦ ਕਰੋ"
 
-#: ../src/e-util/e-search-bar.c:619
+#: ../src/e-util/e-search-bar.c:632
 msgid "Fin_d:"
 msgstr "ਖੋਜ(_d):"
 
-#: ../src/e-util/e-search-bar.c:631
+#: ../src/e-util/e-search-bar.c:644
 msgid "Clear the search"
 msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
 
-#: ../src/e-util/e-search-bar.c:658
+#: ../src/e-util/e-search-bar.c:671
 msgid "Find the previous occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦੀ ਪਿਛਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../src/e-util/e-search-bar.c:670
+#: ../src/e-util/e-search-bar.c:683
 msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../src/e-util/e-search-bar.c:679
+#: ../src/e-util/e-search-bar.c:692
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦੇ ਸਭ(_c)"
 
-#: ../src/e-util/e-search-bar.c:707
+#: ../src/e-util/e-search-bar.c:720
 msgid "Reached bottom of page, continued from top"
 msgstr "ਪੇਜ਼ ਦੇ ਅੰਤ ਉੱਤੇ ਪੁੱਜੇ, ਉੱਤੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ"
 
-#: ../src/e-util/e-search-bar.c:729
+#: ../src/e-util/e-search-bar.c:742
 msgid "Reached top of page, continued from bottom"
 msgstr "ਪੇਜ਼ ਦੇ ਉੱਤੇ ਪੁੱਜੇ, ਹੇਠਾਂ ਤੋਂ ਫੇਰ ਜਾਰੀ"
 
@@ -15725,13 +16141,13 @@ msgstr "ਭੇਜਣ ਚੋਣ"
 msgid "R_eply requested"
 msgstr "ਜਵਾਬ ਲੋੜੀਦਾ(_e)"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "ਵਿੱਚ(_t)"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
@@ -15746,13 +16162,13 @@ msgstr "ਜਦੋਂ ਠੀਕ ਲੱਗੇ(_W)"
 msgid "_Delay message delivery"
 msgstr "ਦੇਰ ਸੁਨੇਹਾ ਵੰਡ(_D)"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "ਬਾਅਦ(_A)"
 
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
@@ -15762,7 +16178,7 @@ msgstr "ਦਿਨ"
 msgid "_Set expiration date"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਸੈੱਟ(_S)"
 
-#. Translators: This is part of
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
 #: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
@@ -15832,15 +16248,15 @@ msgstr "ਜਵਾਬੀ ਸੂਚਨਾ"
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ਖੋਜ(_t)"
 
-#: ../src/e-util/e-source-config.c:724 ../src/e-util/e-source-config.c:728
+#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
 msgid "Type:"
 msgstr "ਕਿਸਮ:"
 
-#: ../src/e-util/e-source-config.c:738 ../src/e-util/e-source-config.c:742
+#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
-#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1752
 #, fuzzy
 #| msgid "Label name cannot be empty."
 msgid "Name cannot be empty"
@@ -15848,56 +16264,56 @@ msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹ
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1416
+#: ../src/e-util/e-source-config.c:1417
 msgid "Refresh every"
 msgstr "ਤਾਜ਼ਾ ਕਰੋ ਹਰੇਕ"
 
-#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
+#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
 msgid "Use a secure connection"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ"
 
-#: ../src/e-util/e-source-config.c:1547
+#: ../src/e-util/e-source-config.c:1548
 #, fuzzy
 #| msgid "Unset _trust for SSL certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਲਈ ਭਰੋਸਾ ਅਣ-ਸੈੱਟ ਕਰੋ(_t)"
 
-#: ../src/e-util/e-source-config.c:1583
+#: ../src/e-util/e-source-config.c:1584
 #, fuzzy
 #| msgid "_User:"
 msgid "User:"
-msgstr "ਯੂਜ਼ਰ(_U):"
+msgstr "ਵਰਤੋਂਕਾਰ(_U):"
 
-#: ../src/e-util/e-source-selector.c:3217
+#: ../src/e-util/e-source-selector.c:3236
 #, fuzzy
 #| msgid "Show %s"
 msgid "Show"
 msgstr "%s ਵੇਖੋ"
 
-#: ../src/e-util/e-source-selector.c:3224
+#: ../src/e-util/e-source-selector.c:3242
 #, fuzzy
 #| msgid "Group Reply"
 msgid "Group name"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
+#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:714
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../src/e-util/e-source-selector.c:3379
-#: ../src/e-util/e-source-selector.c:3478
+#: ../src/e-util/e-source-selector.c:3397
+#: ../src/e-util/e-source-selector.c:3495
 #, fuzzy
 #| msgid "Show %s"
 msgid "_Show"
 msgstr "%s ਵੇਖੋ"
 
-#: ../src/e-util/e-source-selector.c:3431
+#: ../src/e-util/e-source-selector.c:3449
 #, fuzzy
 #| msgid "Manager"
 msgid "Manage Groups"
 msgstr "ਮੈਨੇਜਰ"
 
-#: ../src/e-util/e-source-selector.c:3443
+#: ../src/e-util/e-source-selector.c:3461
 #, fuzzy
 #| msgid "A_vailable Fields:"
 msgid "Available Groups:"
@@ -15917,8 +16333,8 @@ msgid "(no suggestions)"
 msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
 
 #: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
-msgstr "...ਹੋਰ"
+msgid "More…"
+msgstr ""
 
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
@@ -16081,7 +16497,6 @@ msgid ""
 msgstr ""
 
 #: ../src/e-util/e-system.error.xml.h:25
-#| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete remote collection “{0}”?"
 msgstr "ਕੀ ਤੁਸੀਂ ”{0}” ਮੀਮੋ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -16159,11 +16574,11 @@ msgstr "ਸਭ ਸਾਫ਼(_A)"
 msgid "_Show field in View"
 msgstr "ਝਲਕ ਵਿੱਚ ਖੇਤਰ ਵੇਖੋ(_S)"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ ਕਰਮ"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1780
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
 msgid "Descending"
 msgstr "ਘੱਟਦਾ ਕਰਮ"
 
@@ -16200,7 +16615,6 @@ msgid "Sort Items By"
 msgstr "ਇੰਞ ਲੜੀਬੱਧ ਆਈਟਮਾਂ"
 
 #: ../src/e-util/e-table-config.ui.h:16
-#| msgid "_Append"
 msgid "_Apply"
 msgstr "ਲਾਗੂ ਕਰੋ(_A)"
 
@@ -16255,60 +16669,67 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ਆਈਟਮ)"
 msgstr[1] "%s (%d ਆਈਟਮਾਂ)"
 
-#: ../src/e-util/e-table-header-item.c:1607
+#: ../src/e-util/e-table-header-item.c:1610
 msgid "Customize Current View"
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ"
 
-#: ../src/e-util/e-table-header-item.c:1630
+#: ../src/e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ਕ੍ਰਮ(_A)"
 
-#: ../src/e-util/e-table-header-item.c:1633
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "ਘੱਟਦਾ ਕ੍ਰਮ(_D)"
 
-#: ../src/e-util/e-table-header-item.c:1636
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "_Reset sort"
 msgstr ""
 
-#: ../src/e-util/e-table-header-item.c:1639
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "ਇਸ ਖੇਤਰ ਨਾਲ ਗਰੁੱਪ(_F)"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "ਬਕਸੇ ਨਾਲ ਗਰੁੱਪ(_B)"
 
-#: ../src/e-util/e-table-header-item.c:1646
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "ਇਹ ਕਾਲਮ ਹਟਾਓ(_C)"
 
-#: ../src/e-util/e-table-header-item.c:1649
-msgid "Add a C_olumn..."
-msgstr "ਕਾਲਮ ਸ਼ਾਮਲ(_O)..."
+#: ../src/e-util/e-table-header-item.c:1661
+#, fuzzy
+#| msgid "Add a Column"
+msgid "Add a C_olumn…"
+msgstr "ਕਾਲਮ ਸ਼ਾਮਲ"
 
-#: ../src/e-util/e-table-header-item.c:1653
+#: ../src/e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
-#: ../src/e-util/e-table-header-item.c:1656
+#: ../src/e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "ਵਧੀਆ ਫਿੱਟ(_e)"
 
-#: ../src/e-util/e-table-header-item.c:1659
-msgid "Format Column_s..."
+#: ../src/e-util/e-table-header-item.c:1671
+#, fuzzy
+#| msgid "Format Column_s..."
+msgid "Format Column_s…"
 msgstr "ਕਾਲਮ ਫਾਰਮੈਟ(_S)..."
 
-#: ../src/e-util/e-table-header-item.c:1663
-msgid "Custo_mize Current View..."
-msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ(_m)..."
+#: ../src/e-util/e-table-header-item.c:1675
+#: ../src/shell/e-shell-window-actions.c:1232
+#, fuzzy
+#| msgid "Customize Current View"
+msgid "Custo_mize Current View…"
+msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ"
 
-#: ../src/e-util/e-table-header-item.c:1730
+#: ../src/e-util/e-table-header-item.c:1742
 msgid "_Sort By"
 msgstr "ਲੜੀਬੱਧ(_S)"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1753
+#: ../src/e-util/e-table-header-item.c:1765
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
@@ -16321,9 +16742,9 @@ msgid "Input Methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
 msgid "UTC"
 msgstr "UTC"
 
@@ -16352,11 +16773,11 @@ msgstr "ਚੋਣ(_S)"
 msgid "Timezone drop-down combination box"
 msgstr "ਸਮਾਂ-ਖੇਤਰ ਲਟਕਦੀ ਕੰਬੋ ਬਾਕਸ"
 
-#: ../src/e-util/e-url-entry.c:106
+#: ../src/e-util/e-url-entry.c:102
 msgid "Click here to open the URL"
 msgstr "URL ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:104
 msgid "Enter a URL here"
 msgstr "URL ਇੱਥੇ ਦਿਓ"
 
@@ -16374,286 +16795,280 @@ msgid "Flags"
 msgstr "ਫਲੈਗ"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1230
+#: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../src/e-util/e-webdav-browser.c:447
-#| msgid "Address Book"
+#: ../src/e-util/e-webdav-browser.c:448
 msgid "Address book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
 
-#: ../src/e-util/e-webdav-browser.c:458
+#: ../src/e-util/e-webdav-browser.c:459
 msgid "Events"
 msgstr "ਈਵੈਂਟ"
 
-#: ../src/e-util/e-webdav-browser.c:514
-#| msgid "Loading"
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
+#: ../src/mail/em-folder-tree-model.c:1932
 msgid "Loading…"
 msgstr "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/e-util/e-webdav-browser.c:1383
+#: ../src/e-util/e-webdav-browser.c:1387
 #, fuzzy
 #| msgid "Searching folder content..."
 msgid "Searching collection children…"
 msgstr "ਫੋਲਡਰ ਸਮੱਗਰੀ ਖੋਜੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/e-util/e-webdav-browser.c:1385
+#: ../src/e-util/e-webdav-browser.c:1389
 msgid "Failed to search for collection children"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1419
+#: ../src/e-util/e-webdav-browser.c:1423
 #, fuzzy
 #| msgid "Searching for user's calendars..."
 msgid "Searching for user home, please wait…"
-msgstr "ਯੂਜ਼ਰ ਦਾ ਕੈਲੰਡਰ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+msgstr "ਵਰਤੋਂਕਾਰ ਦਾ ਕੈਲੰਡਰ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/e-util/e-webdav-browser.c:1421
+#: ../src/e-util/e-webdav-browser.c:1425
 #, fuzzy
 #| msgid "Unable to perform search."
 msgid "Failed to search for user home"
 msgstr "ਖੋਜ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../src/e-util/e-webdav-browser.c:1763
+#: ../src/e-util/e-webdav-browser.c:1768
 msgid "At least one component type should be set"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1781
+#: ../src/e-util/e-webdav-browser.c:1787
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to get selected collection HREF"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/e-util/e-webdav-browser.c:1812
-#, fuzzy
-#| msgid "_Save Changes"
-msgid "Saving changes…"
-msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
-
-#: ../src/e-util/e-webdav-browser.c:1813
+#: ../src/e-util/e-webdav-browser.c:1819
 #, fuzzy
 #| msgid "Failed to save messages to disk."
 msgid "Failed to save changes"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1821
 #, fuzzy
 #| msgid "Create a new address book"
 msgid "Creating new book…"
 msgstr "ਇੱਕ ਸੁਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#: ../src/e-util/e-webdav-browser.c:1816
+#: ../src/e-util/e-webdav-browser.c:1822
 #, fuzzy
 #| msgid "Failed to create pipe: %s"
 msgid "Failed to create new book"
 msgstr "ਪਾਈਪ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1824
 #, fuzzy
 #| msgid "Create a new calendar"
 msgid "Creating new calendar…"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1825
 #, fuzzy
 #| msgid "Create a new calendar"
 msgid "Failed to create new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1827
 #, fuzzy
 #| msgid "Create a new contact"
 msgid "Creating new collection…"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1828
 #, fuzzy
 #| msgid "Failed to create pipe: %s"
 msgid "Failed to create new collection"
 msgstr "ਪਾਈਪ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#: ../src/e-util/e-webdav-browser.c:1961
+#: ../src/e-util/e-webdav-browser.c:1967
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1963
+#: ../src/e-util/e-webdav-browser.c:1969
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2189
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting book…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2190
+#: ../src/e-util/e-webdav-browser.c:2199
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete book"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/e-util/e-webdav-browser.c:2193
+#: ../src/e-util/e-webdav-browser.c:2202
 #, fuzzy
 #| msgid "Opening calendar"
 msgid "Deleting calendar…"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2203
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete calendar"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/e-util/e-webdav-browser.c:2197
+#: ../src/e-util/e-webdav-browser.c:2206
 #, fuzzy
 #| msgid "Meeting Cancelation"
 msgid "Deleting collection…"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2207
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete collection"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/e-util/e-webdav-browser.c:2429
+#: ../src/e-util/e-webdav-browser.c:2438
 #, fuzzy
 #| msgid "Component"
 msgid "For Components:"
 msgstr "ਭਾਗ"
 
-#: ../src/e-util/e-webdav-browser.c:2435
-#| msgid "Events"
+#: ../src/e-util/e-webdav-browser.c:2444
 msgid "_Events"
 msgstr "ਈਵੈਂਟ(_E)"
 
-#: ../src/e-util/e-webdav-browser.c:2625
+#: ../src/e-util/e-webdav-browser.c:2634
 #, fuzzy
 #| msgid "LDAP Servers"
 msgid "WebDAV server:"
 msgstr "LDAP ਸਰਵਰ"
 
-#: ../src/e-util/e-webdav-browser.c:2660
+#: ../src/e-util/e-webdav-browser.c:2669
 #, fuzzy
 #| msgid "Target Book"
 msgid "Create _Book"
 msgstr "ਨਿਯਤ ਕਿਤਾਬ"
 
-#: ../src/e-util/e-webdav-browser.c:2667
-#| msgid "Weather Calendars"
+#: ../src/e-util/e-webdav-browser.c:2676
 msgid "Create _Calendar"
 msgstr "ਕੈਲੰਡਰ ਬਣਾਓ(_C)"
 
-#: ../src/e-util/e-webdav-browser.c:2674
+#: ../src/e-util/e-webdav-browser.c:2683
 #, fuzzy
 #| msgid "Collection"
 msgid "Create Collectio_n"
 msgstr "ਭੰਡਾਰ"
 
-#: ../src/e-util/e-web-view.c:406
+#: ../src/e-util/e-web-view.c:408
 msgid "_Copy Link Location"
 msgstr "ਲਿੰਕ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:410
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/e-util/e-web-view.c:416
+#: ../src/e-util/e-web-view.c:418
 msgid "_Open Link in Browser"
 msgstr "ਲਿੰਕ ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:420
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰਕ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../src/e-util/e-web-view.c:426
+#: ../src/e-util/e-web-view.c:428
 msgid "_Copy Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../src/e-util/e-web-view.c:433
+#: ../src/e-util/e-web-view.c:435
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_E)"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:437
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/e-util/e-web-view.c:450
+#: ../src/e-util/e-web-view.c:452
 msgid "_Copy Image"
 msgstr "ਚਿੱਤਰ ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:454
 msgid "Copy the image to the clipboard"
 msgstr "ਚਿੱਤਰ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/e-util/e-web-view.c:457
-msgid "Save _Image..."
-msgstr "ਚਿੱਤਰ ਇੰਝ ਸੰਭਾਲੋ(_I)..."
-
 #: ../src/e-util/e-web-view.c:459
+#, fuzzy
+#| msgid "Save Image"
+msgid "Save _Image…"
+msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
+
+#: ../src/e-util/e-web-view.c:461
 msgid "Save the image to a file"
 msgstr "ਚਿੱਤਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-reader.c:2787
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2819
 #, fuzzy
 #| msgid "Search _base:"
 msgid "Search _Web…"
 msgstr "ਖੋਜ ਬੇਸ(_b):"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-reader.c:2789
+#: ../src/e-util/e-web-view.c:478 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2821
 #, fuzzy
 #| msgid "Send a message to the selected contacts"
 msgid "Search the Web with the selected text"
 msgstr "ਸੁਨੇਹਾ ਚੁਣੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
+#: ../src/e-util/e-web-view.c:488 ../src/e-util/e-web-view.c:2066
 msgid "Select all text and images"
 msgstr "ਸਭ ਟੈਕਸਟ ਅਤੇ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../src/e-util/e-web-view.c:1446
+#: ../src/e-util/e-web-view.c:1673
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/e-util/e-web-view.c:1448
+#: ../src/e-util/e-web-view.c:1675
 msgid "Click to hide/unhide addresses"
 msgstr "ਐਡਰੈੱਸ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
 
-#: ../src/e-util/e-web-view.c:1459
+#: ../src/e-util/e-web-view.c:1686
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../src/e-util/e-web-view.c:1461
+#: ../src/e-util/e-web-view.c:1688
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../src/e-util/e-web-view.c:1465
+#: ../src/e-util/e-web-view.c:1692
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/e-util/e-web-view.c:4128
+#: ../src/e-util/e-web-view.c:3778
 msgid "Copying image to clipboard"
 msgstr "ਚਿੱਤਰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/e-util/e-web-view.c:4316
+#: ../src/e-util/e-web-view.c:3966
 msgid "Save Image"
 msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
 
-#: ../src/e-util/e-web-view.c:4353
+#: ../src/e-util/e-web-view.c:4003
 #, c-format
-#| msgid "Saving image to '%s'"
 msgid "Saving image to “%s”"
 msgstr "ਚਿੱਤਰ ”%s” ਉੱਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/e-util/e-web-view.c:4500
+#: ../src/e-util/e-web-view.c:4150
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -16693,17 +17108,14 @@ msgid "You must specify a filename."
 msgstr "ਤੁਹਾਨੂੰ ਫਾਇਲ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../src/e-util/filter.error.xml.h:5
-#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgid "File “{0}” does not exist or is not a regular file."
 msgstr "ਫਾਇਲ “{0}“ ਮੌਜੂਦ ਨਹੀ ਹੈ ਜਾਂ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ।"
 
 #: ../src/e-util/filter.error.xml.h:6
-#| msgid "Bad regular expression &quot;{0}&quot;."
 msgid "Bad regular expression “{0}”."
 msgstr "ਗਲਤ ਨਿਯਮਿਤ ਸਮੀਕਰਨ “{0}“ ਹੈ।"
 
 #: ../src/e-util/filter.error.xml.h:7
-#| msgid "Could not compile regular expression &quot;{1}&quot;."
 msgid "Could not compile regular expression “{1}”."
 msgstr "ਨਿਯਮਿਤ ਸਮੀਕਰਨ ”{1}“ ਨੂੰ ਕੰਪਾਇਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -16718,7 +17130,6 @@ msgid "You must name this filter."
 msgstr "ਇਸ ਫਿਲਟਰ ਲਈ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ"
 
 #: ../src/e-util/filter.error.xml.h:10
-#| msgid "Name &quot;{0}&quot; already used."
 msgid "Name “{0}” already used."
 msgstr "ਨਾਂ ”{0}” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
@@ -16757,7 +17168,6 @@ msgid "Are you sure you want to remove rule “{0}”?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਟਿਕਾਣਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/e-util/filter.error.xml.h:17
-#| msgid "_Keep Data"
 msgid "_Keep"
 msgstr "ਰੱਖੋ(_K)"
 
@@ -16804,9 +17214,6 @@ msgid "Compare against"
 msgstr "ਨਾਲ ਮੇਲ ਕਰੋ"
 
 #: ../src/e-util/filter.ui.h:15
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "the current time when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "the current time when filtering occurs."
@@ -16827,9 +17234,6 @@ msgstr ""
 "ਨਾਲ ਜਾਂਚੀ ਜਾਵੇਗੀ।"
 
 #: ../src/e-util/filter.ui.h:19
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "a time relative to when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -16846,7 +17250,6 @@ msgid "_Filter Rules"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ(_F)"
 
 #: ../src/e-util/filter.ui.h:24
-#| msgid "Rule name"
 msgid "Rule Name"
 msgstr "ਨਿਯਮ ਨਾਂ"
 
@@ -16899,7 +17302,7 @@ msgstr "ਨਵਾਂ ਝਲਕ ਬਣਾਓ(_C)"
 msgid "_Replace existing view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਤਬਦੀਲ(_R)"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:204
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:202
 msgid "Do you wish to save your changes?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -16907,7 +17310,7 @@ msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆ
 msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:206
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:204
 msgid "_Discard changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
@@ -16943,136 +17346,131 @@ msgstr "ਹਟਾਉਣ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to folder “%s”"
 msgstr "ਸੁਨੇਹਾ ”%s” ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:565
+#: ../src/libemail-engine/e-mail-folder-utils.c:567
 msgid "Forwarded messages"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:675
-#: ../src/libemail-engine/e-mail-folder-utils.c:937
+#: ../src/libemail-engine/e-mail-folder-utils.c:677
+#: ../src/libemail-engine/e-mail-folder-utils.c:939
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:777
+#: ../src/libemail-engine/e-mail-folder-utils.c:779
 msgid "Scanning messages for duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਲਈ ਚੁਣੇ ਸੁਨੇਹੇ ਜਾਂਚੋ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#: ../src/libemail-engine/e-mail-folder-utils.c:1152
 #, c-format
-#| msgid "Removing folder '%s'"
 msgid "Removing folder “%s”"
 msgstr "ਫੋਲਡਰ ”%s” ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#: ../src/libemail-engine/e-mail-folder-utils.c:1333
 #, c-format
-#| msgid "File \"%s\" has been removed."
 msgid "File “%s” has been removed."
 msgstr "ਫਾਇਲ ”%s” ਹਟਾਈ ਗਈ ਹੈ।"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1335
+#: ../src/libemail-engine/e-mail-folder-utils.c:1337
 msgid "File has been removed."
 msgstr "ਫਾਇਲ ਨੂੰ ਹਟਾਇਆ ਗਿਆ ਹੈ।"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1411
+#: ../src/libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨਅਟੈਚਮੈਂਟ hਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1583
+#: ../src/libemail-engine/e-mail-folder-utils.c:1585
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d ਸੁਨੇਹਾ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "%d ਸੁਨੇਹੇ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#: ../src/libemail-engine/e-mail-folder-utils.c:1963
 #, c-format
-#| msgid "Invalid folder URI '%s'"
 msgid "Invalid folder URI “%s”"
 msgstr "ਗਲਤ ਫੋਲਡਰ URI ”%s”"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1164
-#: ../src/mail/em-folder-tree-model.c:1237
-#: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444
+#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/importers/kmail-libs.c:138
+#: ../src/modules/mail/e-mail-shell-view-private.c:1015
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:118
-#: ../src/mail/em-folder-tree-model.c:1230
-#: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:119
-#: ../src/mail/em-folder-tree-model.c:1241
-#: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1507
+#: ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 msgid "Outbox"
 msgstr "ਬਾਹਰ-ਬਕਸਾ"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-tree-model.c:1245
-#: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1036
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1511
+#: ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/libemail-engine/e-mail-session.c:124
 #: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1038
+#: ../src/mail/em-folder-tree-model.c:1499
+#: ../src/mail/importers/kmail-libs.c:146
+#: ../src/modules/mail/e-mail-shell-view-private.c:1021
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "ਟੈਪਲੇਟ"
 
-#: ../src/libemail-engine/e-mail-session.c:1294
+#: ../src/libemail-engine/e-mail-session.c:1514
 #, c-format
 msgid "User cancelled operation"
-msgstr "ਯੂਜ਼ਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
+msgstr "ਵਰਤੋਂਕਾਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
 
-#: ../src/libemail-engine/e-mail-session.c:1351
+#: ../src/libemail-engine/e-mail-session.c:1575
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਐਡਰੈੱਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ, ਸੁਨੇਹੇ ਲਈ ਅੱਗੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ।"
 
-#: ../src/libemail-engine/e-mail-session.c:1364
+#: ../src/libemail-engine/e-mail-session.c:1588
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "ਵਰਤਣ ਲਈ ਕੋਈ ਪਛਾਣ ਨਹੀਂ ਲੱਭੀ, ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜਣ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"
 
-#: ../src/libemail-engine/e-mail-session.c:1516
+#: ../src/libemail-engine/e-mail-session.c:1789
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1636
+#: ../src/libemail-engine/e-mail-session.c:1909
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1638
+#: ../src/libemail-engine/e-mail-session.c:1911
 msgid "Looking up recipient PGP keys in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:2639
+#: ../src/libemail-engine/e-mail-session.c:2958
 #, c-format
-#| msgid "Creating folder '%s'"
 msgid "Waiting for “%s”"
 msgstr "“%s” ਲਈ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
@@ -17081,32 +17479,27 @@ msgid "No mail transport service available"
 msgstr "ਕੋਈ ਮੇਲ ਟਰਾਂਸਪੋਰਟ ਸੇਵਾ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:707
+#: ../src/libemail-engine/mail-ops.c:708
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Posting message to “%s”"
 msgstr "ਸੁਨੇਹੇ ”%s” ਵਿੱਚ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:650
-#: ../src/libemail-engine/mail-ops.c:743
+#: ../src/libemail-engine/mail-ops.c:744
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਫੇਲ੍ਹ: %s"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:683
 #: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Storing sent message to “%s”"
 msgstr "ਸੁਨੇਹੇ ”%s” ਵਿੱਚ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:707
-#: ../src/libemail-engine/mail-ops.c:795
+#: ../src/libemail-engine/mail-ops.c:796
 #, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local 'Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local “Sent” folder instead."
@@ -17115,34 +17508,31 @@ msgstr ""
 "ਇਸ ਦੀ ਬਜਾਏ ਲੋਕਲ ”ਭੇਜੇ (Sent)” ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:823
+#: ../src/libemail-engine/mail-ops.c:824
 #, c-format
-#| msgid "Failed to append to local 'Sent' folder: %s"
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "ਲੋਕਲ ”ਭੇਜੇ (Sent)” ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਫੇਲ੍ਹ: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:929
-#: ../src/libemail-engine/mail-ops.c:1019
-#: ../src/libemail-engine/mail-ops.c:1134 ../src/mail/mail-send-recv.c:665
+#: ../src/libemail-engine/e-mail-session-utils.c:930
+#: ../src/libemail-engine/mail-ops.c:1020
+#: ../src/libemail-engine/mail-ops.c:1135 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:188
 #, c-format
-#| msgid "Disconnecting from '%s'"
 msgid "Disconnecting from “%s”"
 msgstr "”%s” ਨਾਲੋਂ ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
+#: ../src/mail/e-mail-backend.c:1048
 #, c-format
-#| msgid "Reconnecting to '%s'"
 msgid "Reconnecting to “%s”"
 msgstr "”%s” ਨਾਲ ਮੁੜ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349
-#: ../src/mail/mail-send-recv.c:1089
+#: ../src/mail/mail-send-recv.c:1086
 #, c-format
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing account “%s” for offline"
 msgstr "ਆਫਲਾਈਨ ਲਈ ਅਕਾਊਂਟ ”%s” ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -17152,11 +17542,6 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਫਿਲਟਰ"
 
 #: ../src/libemail-engine/mail-ops.c:145
 #, c-format
-#| msgid ""
-#| "Failed to filter selected messages. One reason can be that folder "
-#| "location set in one or more filters is invalid. Please check your filters "
-#| "in Edit->Message Filters.\n"
-#| "Original error was: %s"
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
 "set in one or more filters is invalid. Please check your filters in "
@@ -17170,17 +17555,11 @@ msgstr ""
 
 #: ../src/libemail-engine/mail-ops.c:225
 #, c-format
-#| msgid "Fetching mail from '%s'"
 msgid "Fetching mail from “%s”"
 msgstr "”%s” ਤੋਂ ਪੱਤਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/libemail-engine/mail-ops.c:737
+#: ../src/libemail-engine/mail-ops.c:738
 #, c-format
-#| msgid ""
-#| "Failed to apply outgoing filters. One reason can be that folder location "
-#| "set in one or more filters is invalid. Please check your filters in Edit-"
-#| ">Message Filters.\n"
-#| "Original error was: %s"
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
 "in one or more filters is invalid. Please check your filters in Edit→Message "
@@ -17192,7 +17571,7 @@ msgstr ""
 "ਟਿਕਾਣੇ ਲਈ ਇੱਕ ਜਾਂ ਵੱਧ ਫਿਲਤਰ ਗਲਤ ਹੋਣ। ਸੋਧ→ਸੁਨੇਹਾ ਫਿਲਟਰ ਵਿੱਚ ਆਪਣੇ ਫਿਲਟਰ ਜਾਂਚੋ।\n"
 "ਅਸਲੀ ਗਲਤੀ ਸੀ: %s"
 
-#: ../src/libemail-engine/mail-ops.c:1030
+#: ../src/libemail-engine/mail-ops.c:1031
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
@@ -17200,91 +17579,81 @@ msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ 
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1088
+#: ../src/libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 msgstr[1] "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹੇ ਭੇਜਣ ਵਿੱਚ ਫੇਲ੍ਹ"
 
-#: ../src/libemail-engine/mail-ops.c:1094
-#| msgid "Cancelled"
+#: ../src/libemail-engine/mail-ops.c:1095
 msgid "Cancelled."
 msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../src/libemail-engine/mail-ops.c:1096
+#: ../src/libemail-engine/mail-ops.c:1097
 msgid "Complete."
 msgstr "ਸਮਾਪਤ।"
 
-#: ../src/libemail-engine/mail-ops.c:1220
+#: ../src/libemail-engine/mail-ops.c:1221
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "ਸੁਨੇਹੇ ”%s” ਵਿੱਚ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1222
 #, c-format
-#| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
 msgstr "ਸੁਨੇਹੇ ”%s” ਵਿੱਚ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/libemail-engine/mail-ops.c:1340
+#: ../src/libemail-engine/mail-ops.c:1341
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "ਫੋਲਡਰ ”%s” ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/mail-ops.c:1468
+#: ../src/libemail-engine/mail-ops.c:1469
 #, c-format
-#| msgid "Expunging and storing account '%s'"
 msgid "Expunging and storing account “%s”"
 msgstr "ਅਕਾਊਂਟ ”%s” ਸੁੰਘੜਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1470
 #, c-format
-#| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "ਅਕਾਊਂਟ ”%s” ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/mail-ops.c:1544
+#: ../src/libemail-engine/mail-ops.c:1545
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "”%s” ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/libemail-engine/mail-ops.c:1636
+#: ../src/libemail-engine/mail-ops.c:1637
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr ""
 
 #: ../src/libemail-engine/mail-tools.c:69
 #, c-format
-#| msgid "Could not create spool directory '%s': %s"
 msgid "Could not create spool directory “%s”: %s"
 msgstr "ਸਪੂਲ ਡਾਇਰੈਕਟਰੀ ”%s” ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ: %s"
 
 #: ../src/libemail-engine/mail-tools.c:109
 #, c-format
-#| msgid "Trying to movemail a non-mbox source '%s'"
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "ਇੱਕ non-mbox ਸਰੋਤ `”%s” ਤੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਜਾਰੀ"
 
 #. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
 #: ../src/libemail-engine/mail-tools.c:198
-#, c-format
-msgid "[Fwd: %s]"
+#, fuzzy, c-format
+#| msgid "[Fwd: %s]"
+msgid "Fwd: %s"
 msgstr "[ਅੱਗੇ ਭੇਜੇ: %s]"
 
 #. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
 #. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
 #: ../src/libemail-engine/mail-tools.c:208
-#| msgid "(No Subject)"
 msgid "No Subject"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ"
 
 #: ../src/libemail-engine/mail-tools.c:283
 #, c-format
-#| msgid "Forwarded message - %s"
 msgid "Forwarded message — %s"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ — %s"
 
@@ -17299,7 +17668,6 @@ msgstr "ਖੋਜ ਫੋਲਡਰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ
 
 #: ../src/libemail-engine/mail-vfolder.c:302
 #, c-format
-#| msgid "Updating Search Folders for '%s' - %s"
 msgid "Updating Search Folders for “%s : %s”"
 msgstr "” %s - %s” ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
@@ -17310,14 +17678,6 @@ msgstr "” %s - %s” ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕ
 #. * in front of its name, without quotes.
 #: ../src/libemail-engine/mail-vfolder.c:666
 #, c-format
-#| 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 modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -17334,24 +17694,24 @@ msgstr[1] ""
 "%1$s"
 
 #: ../src/mail/e-mail-account-manager.c:118
-#: ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:206
 msgid "Open _Online Accounts"
 msgstr "ਆਨਲਾਈਨ ਅਕਾਊਂਟ ਖੋਲ੍ਹੋ(_O)"
 
 #: ../src/mail/e-mail-account-manager.c:144
-#: ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:232
 msgid "This account was created through the Online Accounts service."
 msgstr "ਇਹ ਅਕਾਊਂਟ ਆਨਲਾਈਨ ਅਕਾਊਂਟ ਸੇਵਾ ਰਾਹੀਂ ਬਣਾਇਆ ਗਿਆ ਸੀ।"
 
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
 msgid "_Reset Order"
 msgstr ""
 
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
 msgid "You can drag and drop account names to reorder them."
 msgstr "ਤੁਸੀਂ ਅਕਾਊਂਟ ਨਾਂ ਨੂੰ ਅੱਗੇ-ਪਿੱਛੇ ਕਰਨ ਲਈ ਡਰੈਗ ਡਰੋਪ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
 msgid "De_fault"
 msgstr "ਮੂਲ(_f)"
 
@@ -17361,80 +17721,75 @@ msgstr "ਮੂਲ(_f)"
 msgid "Invalid URI: “%s”"
 msgstr "ਗਲਤ ਫੋਲਡਰ URI '%s'"
 
-#: ../src/mail/e-mail-autoconfig.c:753
+#: ../src/mail/e-mail-autoconfig.c:768
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:757
+#: ../src/mail/e-mail-autoconfig.c:772
 #, c-format
-#| msgid "Users"
 msgid "User: %s"
 msgstr "ਵਰਤੋਂਕਾਰ: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:761
+#: ../src/mail/e-mail-autoconfig.c:776
 #, fuzzy, c-format
 #| msgid "Security:"
 msgid "Security method: %s"
 msgstr "ਸੁਰੱਖਿਆ:"
 
-#: ../src/mail/e-mail-autoconfig.c:762
-#: ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:777
+#: ../src/mail/e-mail-config-summary-page.c:146
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:763
-#: ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:149
 msgid "STARTTLS"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:767
+#: ../src/mail/e-mail-autoconfig.c:782
 #, fuzzy, c-format
 #| msgid "_Authentication Type"
 msgid "Authentication mechanism: %s"
 msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
 
-#: ../src/mail/e-mail-autoconfig.c:926
+#: ../src/mail/e-mail-autoconfig.c:962
 msgid "No email address provided"
 msgstr "ਕੋਈ ਈਮੇਲ ਐਡਰੈਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
-#: ../src/mail/e-mail-autoconfig.c:935
+#: ../src/mail/e-mail-autoconfig.c:971
 msgid "Missing domain in email address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚ ਗੁੰਮ ਡੋਮੇਨ ਵਰਤੋਂ"
 
-#: ../src/mail/e-mail-autoconfig.c:1277
+#: ../src/mail/e-mail-autoconfig.c:1321
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
-#| msgid "IMAP Headers"
 msgid "IMAP server"
 msgstr "IMAP ਸਰਵਰ"
 
-#: ../src/mail/e-mail-autoconfig.c:1284
+#: ../src/mail/e-mail-autoconfig.c:1328
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
-#| msgid "On LDAP Servers"
 msgid "POP3 server"
 msgstr "POP3 ਸਰਵਰ"
 
-#: ../src/mail/e-mail-autoconfig.c:1291
+#: ../src/mail/e-mail-autoconfig.c:1335
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
-#| msgid "Server"
 msgid "SMTP server"
 msgstr "SMTP ਸਰਵਰ"
 
-#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:877
+#: ../src/shell/e-shell-window-actions.c:884
+#: ../src/shell/e-shell-window-actions.c:891
 msgid "Close this window"
 msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../src/mail/e-mail-browser.c:294
+#: ../src/mail/e-mail-browser.c:353
 msgid "(No Subject)"
 msgstr "(ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ)"
 
 #. GtkAssistant's back button label.
 #: ../src/mail/e-mail-config-assistant.c:48
-#| msgid "Go Back"
 msgid "Go _Back"
 msgstr "ਪਿੱਛੇ ਜਾਓ(_B)"
 
@@ -17456,7 +17811,7 @@ msgstr "ਡਿਫਾਲਟ ਮੁੜ-ਸਟੋਰ(_R)"
 #: ../src/mail/e-mail-config-auth-check.c:217
 #, fuzzy
 #| msgid "_Authentication Type"
-msgid "Querying authentication types..."
+msgid "Querying authentication types…"
 msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
 
 #: ../src/mail/e-mail-config-auth-check.c:430
@@ -17520,7 +17875,6 @@ msgid "Re_ply style:"
 msgstr "ਜਵਾਬ ਸਟਾਈਲ(_R):"
 
 #: ../src/mail/e-mail-config-composing-page.c:495
-#| msgid "Language"
 msgid "Lang_uage:"
 msgstr "ਭਾਸ਼ਾ(_u):"
 
@@ -17531,7 +17885,7 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4273 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4142 ../src/mail/mail-config.ui.h:22
 #, fuzzy
 #| msgid "Start _typing at the bottom on replying"
 msgid "Start _typing at the bottom"
@@ -17564,13 +17918,7 @@ msgstr "ਹਮੇਸ਼ਾ"
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../src/mail/e-mail-config-confirm-page.c:154
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email using Evolution.\n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
+#: ../src/mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -17584,14 +17932,14 @@ msgstr ""
 "\n"
 "ਆਪਣਾ ਸੈਟਿੰਗ ਲਾਗੂ ਕਰਨ ਲਈ ”ਲਾਗੂ ਕਰੋ” ਦਬਾਓ।"
 
-#: ../src/mail/e-mail-config-confirm-page.c:166
+#: ../src/mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
 #, fuzzy
 #| msgid "Checking Service"
-msgid "Checking server settings..."
+msgid "Checking server settings…"
 msgstr "ਸਰਵਿਸ ਜਾਂਚੀ ਜਾ ਰਹੀ ਹੈ"
 
 #: ../src/mail/e-mail-config-defaults-page.c:663
@@ -17631,53 +17979,49 @@ msgstr "ਰੱਦੀ ਫੋਲਡਰ(_T):"
 msgid "Choose a folder to archive messages to."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../src/mail/e-mail-config-defaults-page.c:799
+#: ../src/mail/e-mail-config-defaults-page.c:800
 #, fuzzy
 #| msgid "_Trash Folder:"
 msgid "_Templates Folder:"
 msgstr "ਰੱਦੀ ਫੋਲਡਰ(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:809
+#: ../src/mail/e-mail-config-defaults-page.c:810
 #, fuzzy
 #| msgid "Choose a folder for deleted messages."
 msgid "Choose a folder to use for template messages."
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../src/mail/e-mail-config-defaults-page.c:831
+#: ../src/mail/e-mail-config-defaults-page.c:832
 msgid "_Restore Defaults"
 msgstr "ਡਿਫਾਲਟ ਮੁੜ-ਸਟੋਰ(_R)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:849
 #, fuzzy
 #| msgid "Local Folders"
 msgid "_Lookup Folders"
 msgstr "ਲੋਕਲ ਫੋਲਡਰ"
 
-#: ../src/mail/e-mail-config-defaults-page.c:866
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Use a Real Folder for _Trash:"
 msgstr "ਰੱਦੀ ਲਈ ਅਸਲੀ ਫੋਲਡਰ ਨਾਂ ਵਰਤੋਂ(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:867
+#: ../src/mail/e-mail-config-defaults-page.c:868
 msgid "Choose a folder for deleted messages."
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../src/mail/e-mail-config-defaults-page.c:876
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Use a Real Folder for _Junk:"
 msgstr "ਜੰਕ ਲਈ ਅਸਲੀ ਫੋਲਡਰ ਨਾਂ ਵਰਤੋਂ(_J):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:877
+#: ../src/mail/e-mail-config-defaults-page.c:878
 msgid "Choose a folder for junk messages."
 msgstr "ਜੰਕ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ।"
 
-#: ../src/mail/e-mail-config-defaults-page.c:995
+#: ../src/mail/e-mail-config-defaults-page.c:996
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #: ../src/mail/e-mail-config-identity-page.c:513
-#| msgid ""
-#| "Please enter your name and email address below. The \"optional\" fields "
-#| "below do not need to be filled in, unless you wish to include this "
-#| "information in email you send."
 msgid ""
 "Please enter your name and email address below. The “optional” fields below "
 "do not need to be filled in, unless you wish to include this information in "
@@ -17687,8 +18031,8 @@ msgstr ""
 " ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ "
 "ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
 
-#: ../src/mail/e-mail-config-identity-page.c:579
-#: ../src/mail/e-mail-config-summary-page.c:353
+#: ../src/mail/e-mail-config-identity-page.c:580
+#: ../src/mail/e-mail-config-summary-page.c:355
 #, fuzzy
 #| msgid ""
 #| "Type the name by which you would like to refer to this account.\n"
@@ -17700,92 +18044,95 @@ msgstr ""
 "ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\"."
 
-#: ../src/mail/e-mail-config-identity-page.c:596
+#: ../src/mail/e-mail-config-identity-page.c:597
 msgid "Required Information"
 msgstr "ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ"
 
-#: ../src/mail/e-mail-config-identity-page.c:605
+#: ../src/mail/e-mail-config-identity-page.c:606
 msgid "Full Nam_e:"
 msgstr "ਪੂਰਾ ਨਾਂ(_E):"
 
-#: ../src/mail/e-mail-config-identity-page.c:634
+#: ../src/mail/e-mail-config-identity-page.c:635
 msgid "Email _Address:"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_A):"
 
-#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/mail/e-mail-config-identity-page.c:684
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ"
 
-#: ../src/mail/e-mail-config-identity-page.c:692
+#: ../src/mail/e-mail-config-identity-page.c:693
 msgid "Re_ply-To:"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
 
-#: ../src/mail/e-mail-config-identity-page.c:721
+#: ../src/mail/e-mail-config-identity-page.c:722
 msgid "Or_ganization:"
 msgstr "ਸੰਗਠਨ(_g):"
 
-#: ../src/mail/e-mail-config-identity-page.c:776
-msgid "Add Ne_w Signature..."
+#: ../src/mail/e-mail-config-identity-page.c:777
+#, fuzzy
+#| msgid "Add Ne_w Signature..."
+msgid "Add Ne_w Signature…"
 msgstr "ਨਵੇਂ ਦਸਤਖਤ ਸ਼ਾਮਿਲ ਕਰੋ(_w)..."
 
-#: ../src/mail/e-mail-config-identity-page.c:790
+#: ../src/mail/e-mail-config-identity-page.c:791
 msgid "A_liases:"
 msgstr ""
 
-#: ../src/mail/e-mail-config-identity-page.c:862
+#: ../src/mail/e-mail-config-identity-page.c:863
 msgid "Edi_t"
 msgstr ""
 
-#: ../src/mail/e-mail-config-identity-page.c:885
+#: ../src/mail/e-mail-config-identity-page.c:886
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
 #, fuzzy
 #| msgid "Label name cannot be empty."
 msgid "Full Name should not be empty"
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
 #, fuzzy
 #| msgid "Label name cannot be empty."
 msgid "Email Address cannot be empty"
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
 #, fuzzy
 #| msgid "File is not a valid .desktop file"
 msgid "Email Address is not a valid email"
 msgstr "ਫਾਇਲ ਇੱਕ ਠੀਕ .desktop ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
 #, fuzzy
 #| msgid "File is not a valid .desktop file"
 msgid "Reply To is not a valid email"
 msgstr "ਫਾਇਲ ਇੱਕ ਠੀਕ .desktop ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
-#: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:638
-#| msgid "Label name cannot be empty."
+#: ../src/mail/e-mail-config-identity-page.c:970
+#: ../src/mail/e-mail-config-summary-page.c:637
 msgid "Account Name cannot be empty"
 msgstr "ਖਾਤਾ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
 
 #: ../src/mail/e-mail-config-lookup-page.c:65
-msgid "Looking up account details..."
+#, fuzzy
+#| msgid "Looking up account details..."
+msgid "Looking up account details…"
 msgstr "...ਅਕਾਊਂਟ ਵੇਰਵਾ ਲੱਭਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/e-mail-config-provider-page.c:538
+#: ../src/mail/e-mail-config-provider-page.c:541
 msgid "Checking for New Mail"
 msgstr "ਨਵੇਂ ਮੇਲ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/e-mail-config-provider-page.c:554
+#: ../src/mail/e-mail-config-provider-page.c:557
 msgid "Check for _new messages every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
 
-#: ../src/mail/e-mail-config-provider-page.c:764
+#: ../src/mail/e-mail-config-provider-page.c:767
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
@@ -17802,11 +18149,11 @@ msgid "%s — %s"
 msgstr ""
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:771
+#: ../src/modules/mail/e-mail-shell-backend.c:802
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "ਸਧਾਰਨ"
@@ -17888,7 +18235,7 @@ msgstr "ਚੁਣੋ"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "_Clear"
 msgstr "ਸਾਫ਼(_C)"
 
@@ -17920,62 +18267,58 @@ msgstr "ਈਮੇਲ ਭੇਜਣੀ"
 msgid "Server _Type:"
 msgstr "ਸਰਵਰ ਟਾਈਪ(_T): "
 
-#: ../src/mail/e-mail-config-summary-page.c:306
+#: ../src/mail/e-mail-config-summary-page.c:308
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "ਇਹ ਸੈਟਿੰਗ ਦੀ ਸਾਰ ਸੈਟਿੰਗ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../src/mail/e-mail-config-summary-page.c:370
+#: ../src/mail/e-mail-config-summary-page.c:372
 msgid "Personal Details"
 msgstr "ਨਿੱਜੀ ਵੇਰਵਾ"
 
-#: ../src/mail/e-mail-config-summary-page.c:379
+#: ../src/mail/e-mail-config-summary-page.c:381
 msgid "Full Name:"
 msgstr "ਪੂਰਾ ਨਾਂ:"
 
-#: ../src/mail/e-mail-config-summary-page.c:393
+#: ../src/mail/e-mail-config-summary-page.c:395
 msgid "Email Address:"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ:"
 
-#: ../src/mail/e-mail-config-summary-page.c:407
+#: ../src/mail/e-mail-config-summary-page.c:409
 msgid "Receiving"
 msgstr "ਪ੍ਰਾਪਤੀ"
 
-#: ../src/mail/e-mail-config-summary-page.c:419
+#: ../src/mail/e-mail-config-summary-page.c:421
 msgid "Sending"
 msgstr "ਭੇਜਣਾ"
 
-#: ../src/mail/e-mail-config-summary-page.c:431
+#: ../src/mail/e-mail-config-summary-page.c:433
 msgid "Server Type:"
 msgstr "ਸਰਵਰ ਟਾਈਪ: "
 
-#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/mail/e-mail-config-summary-page.c:454
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
 msgid "Server:"
 msgstr "ਸਰਵਰ:"
 
-#: ../src/mail/e-mail-config-summary-page.c:473
+#: ../src/mail/e-mail-config-summary-page.c:475
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
+msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ:"
 
-#: ../src/mail/e-mail-config-summary-page.c:494
+#: ../src/mail/e-mail-config-summary-page.c:496
 msgid "Security:"
 msgstr "ਸੁਰੱਖਿਆ:"
 
-#: ../src/mail/e-mail-config-summary-page.c:651
+#: ../src/mail/e-mail-config-summary-page.c:650
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr ""
 
-#: ../src/mail/e-mail-config-summary-page.c:807
+#: ../src/mail/e-mail-config-summary-page.c:806
 msgid "Account Summary"
 msgstr "ਅਕਾਊਂਟ ਸਾਰ"
 
-#: ../src/mail/e-mail-config-welcome-page.c:161
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Continue\" to begin."
+#: ../src/mail/e-mail-config-welcome-page.c:162
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -17985,7 +18328,7 @@ msgstr ""
 "\n"
 "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ”ਅੱਗੇ” ਨੂੰ ਦਬਾਓ।"
 
-#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/mail/e-mail-config-welcome-page.c:172
 #: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "ਜੀ ਆਇਆ ਨੂੰ"
@@ -17994,59 +18337,63 @@ msgstr "ਜੀ ਆਇਆ ਨੂੰ"
 msgid "Account Editor"
 msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
 
-#: ../src/mail/e-mail-display.c:126
-msgid "_Add to Address Book..."
+#: ../src/mail/e-mail-display.c:138
+#, fuzzy
+#| msgid "_Add to Address Book..."
+msgid "_Add to Address Book…"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਲ(_A)..."
 
-#: ../src/mail/e-mail-display.c:133
+#: ../src/mail/e-mail-display.c:145
 msgid "_To This Address"
 msgstr "ਇਹ ਐਡਰੈੱਸ ਨੂੰ(_T)"
 
-#: ../src/mail/e-mail-display.c:140
+#: ../src/mail/e-mail-display.c:152
 msgid "_From This Address"
 msgstr "ਇਹ ਐਡਰੈੱਸ ਤੋਂ(_F)"
 
-#: ../src/mail/e-mail-display.c:147
-msgid "Send _Reply To..."
+#: ../src/mail/e-mail-display.c:159
+#, fuzzy
+#| msgid "Send _Reply To..."
+msgid "Send _Reply To…"
 msgstr "...ਨੂੰ ਜਵਾਬ ਭੇਜੋ(_R)"
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:161
 msgid "Send a reply message to this address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਨੂੰ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-display.c:156
+#: ../src/mail/e-mail-display.c:168
 msgid "Create Search _Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_F)"
 
-#: ../src/mail/e-mail-display.c:812
+#: ../src/mail/e-mail-display.c:721
 msgid "Hid_e All"
 msgstr "ਸਭ ਓਹਲੇ(_e)"
 
-#: ../src/mail/e-mail-display.c:819
+#: ../src/mail/e-mail-display.c:728
 msgid "_View Inline"
 msgstr "ਲਾਇਨ 'ਚ ਵੇਖੋ(_V)"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:735
 msgid "Vie_w All Inline"
 msgstr "ਸਭ ਲਾਈਨ 'ਚ ਵੇਖੋ(_w)"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:742
 msgid "_Zoom to 100%"
 msgstr ""
 
-#: ../src/mail/e-mail-display.c:835
+#: ../src/mail/e-mail-display.c:744
 #, fuzzy
 #| msgid "Reset the text to its original size"
 msgid "Zoom the image to its natural size"
 msgstr "ਟੈਕਸਟ ਨੂੰ ਅਸਲੀ ਆਕਾਰ ਮੁਤਾਬਕ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-display.c:840
+#: ../src/mail/e-mail-display.c:749
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../src/mail/e-mail-display.c:842
+#: ../src/mail/e-mail-display.c:751
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
@@ -18066,52 +18413,70 @@ msgstr "ਬਣਾਓ(_r)"
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#, fuzzy
+#| msgid "Folder owner"
+msgid "Folder Sort Order"
+msgstr "ਫੋਲਡਰ ਮਾਲਕ"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Reset c_urrent level"
+msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਬੰਦ ਕਰੋ"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+msgid "Reset sort order in the current level to the defaults"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#, fuzzy
+#| msgid "Select all headers"
+msgid "Reset _all levels"
+msgstr "ਸਭ ਹੈੱਡਰ ਚੁਣੋ"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr ""
+
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../src/mail/e-mail-free-form-exp.c:231
-#| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
 #: ../src/mail/e-mail-free-form-exp.c:232
-#| msgid "Deleted"
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "ਹਟਾਏ"
 
 #: ../src/mail/e-mail-free-form-exp.c:233
-#| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
 msgstr "ਡਰਾਫਟ"
 
 #: ../src/mail/e-mail-free-form-exp.c:234
-#| msgid "Flagged"
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ"
 
 #: ../src/mail/e-mail-free-form-exp.c:235
-#| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
 #: ../src/mail/e-mail-free-form-exp.c:236
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "ਅਟੈਚਮੈਂਟ"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
-#| msgid "now"
+#: ../src/mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "ਨਹੀਂ"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr ""
@@ -18149,13 +18514,13 @@ msgstr "ਕਰਨ ਲਈ(_T)"
 msgid "_Later"
 msgstr "ਬਾਅਦ 'ਚ(_L)"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:855
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "ਲੇਬਲ ਸ਼ਾਮਲ"
 
 #: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:882
+#: ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "ਲੇਬਲ ਸੋਧ"
 
@@ -18185,9 +18550,9 @@ msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਕਾਪੀ ਕੀ
 
 #: ../src/mail/e-mail-notes.c:863
 #, fuzzy
-#| msgid "Formatting Message..."
-msgid "Storing changes..."
-msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#| msgid "_Save Changes"
+msgid "Storing changes…"
+msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
 #: ../src/mail/e-mail-notes.c:1001
 #, fuzzy
@@ -18195,11 +18560,11 @@ msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ 
 msgid "Edit Message Note"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ(_E)"
 
-#: ../src/mail/e-mail-notes.c:1159
+#: ../src/mail/e-mail-notes.c:1157
 #, fuzzy
-#| msgid "Retrieving Message..."
-msgid "Retrieving message..."
-msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+#| msgid "Retrieving message"
+msgid "Retrieving message…"
+msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
@@ -18238,706 +18603,736 @@ msgstr "ਹੈੱਡਰ"
 msgid "Page %d of %d"
 msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸਫ਼ਾ"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "ਕਾਪੀ ਕਰੋ(_o)"
 
-#: ../src/mail/e-mail-reader.c:610
+#: ../src/mail/e-mail-reader.c:609
 #, fuzzy
 #| msgid "Generating message list"
-msgid "Deleting message note..."
+msgid "Deleting message note…"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/mail/e-mail-reader.c:1577 ../src/mail/e-mail-reader.c:1868
-#: ../src/mail/e-mail-reader.c:1908
+#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
+#: ../src/mail/e-mail-reader.c:1940
 msgid "_Do not ask me again."
 msgstr "ਮੈਨੂੰ ਫੇਰ ਨਾ ਪੁੱਛੋ(_D)।"
 
-#: ../src/mail/e-mail-reader.c:1914
+#: ../src/mail/e-mail-reader.c:1946
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਜਵਾਬ ਦਿਓ: ਹਮੇਸ਼ਾ ਅਣਡਿੱਠਾ(_A)"
 
-#: ../src/mail/e-mail-reader.c:2118
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Failed to retrieve message:"
 msgstr "ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
+#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
 #, fuzzy, c-format
 #| msgid "Retrieving message '%s'"
 msgid "Retrieving message “%s”"
 msgstr "ਸੁਨੇਹਾ '%s' ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/e-mail-reader.c:2365
+#: ../src/mail/e-mail-reader.c:2397
 msgid "A_dd Sender to Address Book"
 msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ(_d)"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2399
 msgid "Add sender to address book"
 msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2372
-msgid "_Archive..."
+#: ../src/mail/e-mail-reader.c:2404
+msgid "_Archive…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2406
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2411
 msgid "Check for _Junk"
 msgstr "ਜੰਕ ਲਈ ਜਾਂਚ(_J)"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2413
 msgid "Filter the selected messages for junk status"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਬੇਕਾਰ ਸਥਿਤੀ ਲਈ ਜਾਂਚੋ"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2418
 #, fuzzy
 #| msgid "Assign Color"
 msgid "Assign C_olor…"
 msgstr "ਰੰਗ ਦਿਓ"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2420
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Assign color for the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2393
+#: ../src/mail/e-mail-reader.c:2425
 #, fuzzy
 #| msgid "Unset Color"
 msgid "Unse_t Color"
 msgstr "ਰੰਗ ਨਾ-ਸੈੱਟ"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2427
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2400
-msgid "_Copy to Folder..."
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ(_C)..."
+#: ../src/mail/e-mail-reader.c:2432
+#, fuzzy
+#| msgid "_Copy to Folder"
+msgid "_Copy to Folder…"
+msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2434
 msgid "Copy selected messages to another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2439
 msgid "_Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2441
 msgid "Mark the selected messages for deletion"
 msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਚੁਣੋ"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2446
 #, fuzzy
 #| msgid "_Add Attachment..."
-msgid "_Add note..."
+msgid "_Add note…"
 msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2448
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Add a note for the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2453
 #, fuzzy
 #| msgid "Delete Any Items"
 msgid "Delete no_te"
 msgstr "ਕੋਈ ਵੀ ਆਈਟਮਾਂ ਹਟਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2455
 #, fuzzy
 #| msgid "Create a new event from the selected message"
 msgid "Delete the note for the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਈਵੈਂਟ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2428
-msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2460
+msgid "_Edit note…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2462
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Edit a note for the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2435
-msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2467
+#, fuzzy
+#| msgid "Create a Filter Rule for Mailing _List..."
+msgid "Create a Filter Rule for Mailing _List…"
 msgstr "...ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_L)"
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2469
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2442
-msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2474
+#, fuzzy
+#| msgid "Create a Filter Rule for _Recipients..."
+msgid "Create a Filter Rule for _Recipients…"
 msgstr "...ਸੁਨੇਹੀਆਂ ਲਈ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_R)"
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2476
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ਇਹਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2449
-msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2481
+#, fuzzy
+#| msgid "Create a Filter Rule for Se_nder..."
+msgid "Create a Filter Rule for Se_nder…"
 msgstr "...ਭੇਜਣ ਵਾਲਿਆਂ ਲਈ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_n)"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2483
 msgid "Create a rule to filter messages from this sender"
 msgstr "ਇਹਨਾਂ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2456
-msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2488
+#, fuzzy
+#| msgid "Create a Filter Rule for _Subject..."
+msgid "Create a Filter Rule for _Subject…"
 msgstr "...ਵਿਸ਼ੇ 'ਤੇ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_S)"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2490
 msgid "Create a rule to filter messages with this subject"
 msgstr "ਇਸ ਵਿਸ਼ੇ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2463
+#: ../src/mail/e-mail-reader.c:2495
 msgid "A_pply Filters"
 msgstr "ਫਿਲਟਰ ਲਗਾਓ(_p)"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Apply filter rules to the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਤੇ ਫਿਲਟਰ ਨਿਯਮ ਲਾਗੂ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2470
-msgid "_Find in Message..."
-msgstr "ਸੁਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
+#: ../src/mail/e-mail-reader.c:2502
+#, fuzzy
+#| msgid "Find in Message"
+msgid "_Find in Message…"
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2504
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../src/mail/e-mail-reader.c:2477
+#: ../src/mail/e-mail-reader.c:2509
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2511
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਤੋਂ ਧਿਆਨ-ਰੱਖੋ ਨਿਸ਼ਾਨ ਹਟਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2484
+#: ../src/mail/e-mail-reader.c:2516
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2518
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਪੂਰਾ ਹੋਣ ਲਈ ਧਿਆਨ-ਰੱਖੋ ਨਿਸ਼ਾਨ ਸੈੱਟ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2491
-msgid "Follow _Up..."
-msgstr "ਅੱਗੇ ਖੋਲ੍ਹੋ(_U)..."
+#: ../src/mail/e-mail-reader.c:2523
+#, fuzzy
+#| msgid "Follow Up"
+msgid "Follow _Up…"
+msgstr "ਪਿੱਛੇ ਜਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2525
 msgid "Flag the selected messages for follow-up"
 msgstr "ਧਿਆਨ ਰੱਖਣ ਲਈ ਚੁਣੇ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2530
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "ਅਟੈਚ(_A)"
 
-#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
+#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਅਟੈਚ ਕਰਕੇ ਕਿਸੇ ਨੂੰ ਅੱਗੇ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2537
 msgid "Forward As _Attached"
 msgstr "ਅਟੈਚ ਕਰਕੇ ਅੱਗੇ ਭੇਜੋ(_A)"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2544
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "ਲਾਈਨ ਵਿੱਚ(_I)"
 
-#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
+#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਨਵੇਂ ਸੁਨੇਹੇ ਦੇ ਵਿੱਚ ਮੁੱਖ ਭਾਗ ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:2519
+#: ../src/mail/e-mail-reader.c:2551
 msgid "Forward As _Inline"
 msgstr "ਇਨਲਾਈਨ ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_I)"
 
-#: ../src/mail/e-mail-reader.c:2526
+#: ../src/mail/e-mail-reader.c:2558
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਹਵਾਲਾ ਇੱਕ ਜਵਾਬ ਦੀ ਤਰ੍ਹਾਂ ਕਰਕੇ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:2533
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Forward As _Quoted"
 msgstr "ਹਵਾਲੇ ਵਾਂਗ ਭੇਜੋ(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2572
 msgid "_New Label"
 msgstr "ਨਵਾਂ ਲੇਬਲ(_N)"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2549
+#: ../src/mail/e-mail-reader.c:2581
 msgid "N_one"
 msgstr "ਕੋਈ ਨਹੀਂ(_o)"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2588
 msgid "_Load Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ(_L)"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2590
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ਮੇਲ ਵਿੱਚ ਸੁਨੇਹੇ ਲੋਡ ਕਰਨ ਲਈ ਮਜਬੂਰ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
 msgid "_Ignore Subthread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2597
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
 #, fuzzy
 #| msgid "Next _Thread"
 msgid "_Ignore Thread"
 msgstr "ਅੱਗੇ ਮਸਲਾ(_T)"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2604
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2609
 msgid "_Important"
 msgstr "ਖਾਸ(_I)"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2611
 msgid "Mark the selected messages as important"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2616
 msgid "_Junk"
 msgstr "ਜੰਕ(_J)"
 
-#: ../src/mail/e-mail-reader.c:2586
+#: ../src/mail/e-mail-reader.c:2618
 msgid "Mark the selected messages as junk"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਜੰਕ ਵਜੋਂ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2623
 msgid "_Not Junk"
 msgstr "ਜੰਕ ਨਹੀਂ(_N)"
 
-#: ../src/mail/e-mail-reader.c:2593
+#: ../src/mail/e-mail-reader.c:2625
 msgid "Mark the selected messages as not being junk"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਜੰਕ-ਨਹੀਂ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2598
+#: ../src/mail/e-mail-reader.c:2630
 msgid "_Read"
 msgstr "ਪੜ੍ਹੇ(_R)"
 
-#: ../src/mail/e-mail-reader.c:2600
+#: ../src/mail/e-mail-reader.c:2632
 msgid "Mark the selected messages as having been read"
 msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2639
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
+#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2614
+#: ../src/mail/e-mail-reader.c:2646
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2651
 msgid "Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ(_m)"
 
-#: ../src/mail/e-mail-reader.c:2621
+#: ../src/mail/e-mail-reader.c:2653
 msgid "Mark the selected messages as unimportant"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਨਾ-ਜ਼ਰੂਰੀ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2626
+#: ../src/mail/e-mail-reader.c:2658
 msgid "_Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ(_U)"
 
-#: ../src/mail/e-mail-reader.c:2628
+#: ../src/mail/e-mail-reader.c:2660
 msgid "Mark the selected messages as not having been read"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਾ-ਪੜ੍ਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2633
+#: ../src/mail/e-mail-reader.c:2665
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-msgid "_Edit as New Message..."
+#, fuzzy
+#| msgid "_Edit as New Message..."
+msgid "_Edit as New Message…"
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2667
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਸੋਧ ਲਈ ਰਚੇਤਾ (ਕੰਪੋਜ਼ਰ) ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../src/mail/e-mail-reader.c:2640
+#: ../src/mail/e-mail-reader.c:2672
 msgid "Compose _New Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਲਿਖੋ(_N)"
 
-#: ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2674
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖਣ ਲਈ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2679
 msgid "_Open in New Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ 'ਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2681
 msgid "Open the selected messages in a new window"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਵੀਂ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../src/mail/e-mail-reader.c:2654
-msgid "_Move to Folder..."
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
+#: ../src/mail/e-mail-reader.c:2686
+#, fuzzy
+#| msgid "_Move to Folder"
+msgid "_Move to Folder…"
+msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
 
-#: ../src/mail/e-mail-reader.c:2656
+#: ../src/mail/e-mail-reader.c:2688
 msgid "Move selected messages to another folder"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/mail/e-mail-reader.c:2661
+#: ../src/mail/e-mail-reader.c:2693
 msgid "_Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(_N)"
 
-#: ../src/mail/e-mail-reader.c:2663
+#: ../src/mail/e-mail-reader.c:2695
 msgid "Display the next message"
 msgstr "ਅਗਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2668
+#: ../src/mail/e-mail-reader.c:2700
 msgid "Next _Important Message"
 msgstr "ਨਵਾਂ ਖਾਸ ਸੁਨੇਹਾ(_I)"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:2702
 msgid "Display the next important message"
 msgstr "ਅਗਲਾ ਜਰੂਰੀ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2675
+#: ../src/mail/e-mail-reader.c:2707
 msgid "Next _Thread"
 msgstr "ਅੱਗੇ ਮਸਲਾ(_T)"
 
-#: ../src/mail/e-mail-reader.c:2677
+#: ../src/mail/e-mail-reader.c:2709
 msgid "Display the next thread"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਮਸਲਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2682
+#: ../src/mail/e-mail-reader.c:2714
 msgid "Next _Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../src/mail/e-mail-reader.c:2684
+#: ../src/mail/e-mail-reader.c:2716
 msgid "Display the next unread message"
 msgstr "ਅਗਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2689
+#: ../src/mail/e-mail-reader.c:2721
 msgid "_Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(_P)"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2723
 msgid "Display the previous message"
 msgstr "ਪਿਛਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2696
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Pr_evious Important Message"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਵੇਖਾਓ(_e)"
 
-#: ../src/mail/e-mail-reader.c:2698
+#: ../src/mail/e-mail-reader.c:2730
 msgid "Display the previous important message"
 msgstr "ਪਿਛਲਾ ਜਰੂਰੀ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2703
+#: ../src/mail/e-mail-reader.c:2735
 msgid "Previous T_hread"
 msgstr "ਪਿਛਲਾ ਮਾਮਲਾ(_h)"
 
-#: ../src/mail/e-mail-reader.c:2705
+#: ../src/mail/e-mail-reader.c:2737
 msgid "Display the previous thread"
 msgstr "ਪਿਛਲਾ ਮਾਮਲਾ ਵੇਖਾਉਪਿਛਲਾ ਮਾਪਿਛਲਾ ਥਰਿੱਡ ਵ"
 
-#: ../src/mail/e-mail-reader.c:2710
+#: ../src/mail/e-mail-reader.c:2742
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱਛੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(_r)"
 
-#: ../src/mail/e-mail-reader.c:2712
+#: ../src/mail/e-mail-reader.c:2744
 msgid "Display the previous unread message"
 msgstr "ਪਿਛਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2719
+#: ../src/mail/e-mail-reader.c:2751
 msgid "Print this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2726
+#: ../src/mail/e-mail-reader.c:2758
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਦੀ ਝਲਕ"
 
-#: ../src/mail/e-mail-reader.c:2731
+#: ../src/mail/e-mail-reader.c:2763
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../src/mail/e-mail-reader.c:2733
+#: ../src/mail/e-mail-reader.c:2765
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਰੀ-ਡਿਰੈਕਟ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2738
+#: ../src/mail/e-mail-reader.c:2770
 msgid "Remo_ve Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਓ(_v)ਅਟੈਚਮੈਂਟ ਹਟਾਓ(_ve Attachment"
 
-#: ../src/mail/e-mail-reader.c:2740
+#: ../src/mail/e-mail-reader.c:2772
 msgid "Remove attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਓਅਟ"
 
-#: ../src/mail/e-mail-reader.c:2745
+#: ../src/mail/e-mail-reader.c:2777
 msgid "Remove Du_plicate Messages"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਹਟਾਓ(_p)"
 
-#: ../src/mail/e-mail-reader.c:2747
+#: ../src/mail/e-mail-reader.c:2779
 msgid "Checks selected messages for duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਲਈ ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਚੈੱਕ ਕਰੋ"
 
-#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4096
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
-#: ../src/mail/e-mail-reader.c:2754
+#: ../src/mail/e-mail-reader.c:2786
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਲਈ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../src/mail/e-mail-reader.c:2759
+#: ../src/mail/e-mail-reader.c:2791
 msgid "Al_ternative Reply…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2761
+#: ../src/mail/e-mail-reader.c:2793
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Choose reply options for the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਭੇਜਣ ਵਾਲੇ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
+#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4091
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ(_L)"
 
-#: ../src/mail/e-mail-reader.c:2768
+#: ../src/mail/e-mail-reader.c:2800
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../src/mail/e-mail-reader.c:2773
+#: ../src/mail/e-mail-reader.c:2805
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../src/mail/e-mail-reader.c:2775
+#: ../src/mail/e-mail-reader.c:2807
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਭੇਜਣ ਵਾਲੇ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../src/mail/e-mail-reader.c:2780
-msgid "_Save as mbox..."
+#: ../src/mail/e-mail-reader.c:2812
+#, fuzzy
+#| msgid "_Save as mbox..."
+msgid "_Save as mbox…"
 msgstr "mbox ਵਾਂਗ ਸੰਭਾਲੋ(_S)..."
 
-#: ../src/mail/e-mail-reader.c:2782
+#: ../src/mail/e-mail-reader.c:2814
 msgid "Save selected messages as an mbox file"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ mbox ਫਾਇਲ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../src/mail/e-mail-reader.c:2794
+#: ../src/mail/e-mail-reader.c:2826
 msgid "_Message Source"
 msgstr "ਸੁਨੇਹਾ ਸਰੋਤ(_M)"
 
-#: ../src/mail/e-mail-reader.c:2796
+#: ../src/mail/e-mail-reader.c:2828
 msgid "Show the raw email source of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਅਣ-ਸੋਧੇ ਈ-ਮੇਲ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2808
+#: ../src/mail/e-mail-reader.c:2840
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹਟਾਇਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../src/mail/e-mail-reader.c:2810
+#: ../src/mail/e-mail-reader.c:2842
 msgid "Undelete the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2815
+#: ../src/mail/e-mail-reader.c:2847
 msgid "_Normal Size"
 msgstr "ਆਮ ਅਕਾਰ(_N)"
 
-#: ../src/mail/e-mail-reader.c:2817
+#: ../src/mail/e-mail-reader.c:2849
 msgid "Reset the text to its original size"
 msgstr "ਟੈਕਸਟ ਨੂੰ ਅਸਲੀ ਆਕਾਰ ਮੁਤਾਬਕ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2822
+#: ../src/mail/e-mail-reader.c:2854
 msgid "_Zoom In"
 msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2824
+#: ../src/mail/e-mail-reader.c:2856
 msgid "Increase the text size"
 msgstr "ਟੈਕਸਟ ਆਕਾਰ ਵਧਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2831
+#: ../src/mail/e-mail-reader.c:2863
 msgid "Decrease the text size"
 msgstr "ਟੈਕਸਟ ਆਕਾਰ ਘਟਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2838
+#: ../src/mail/e-mail-reader.c:2870
 msgid "Cre_ate"
 msgstr "ਬਣਾਓ(_a)"
 
-#: ../src/mail/e-mail-reader.c:2845
+#: ../src/mail/e-mail-reader.c:2877
 msgid "Ch_aracter Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
 
-#: ../src/mail/e-mail-reader.c:2852
+#: ../src/mail/e-mail-reader.c:2884
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਇਸ ਵਾਂਗ(_O)"
 
-#: ../src/mail/e-mail-reader.c:2859
+#: ../src/mail/e-mail-reader.c:2891
 msgid "_Label"
 msgstr "ਲੇਬਲ(_L)"
 
-#: ../src/mail/e-mail-reader.c:2866
+#: ../src/mail/e-mail-reader.c:2898
 msgid "_Group Reply"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ(_G)"
 
-#: ../src/mail/e-mail-reader.c:2873
+#: ../src/mail/e-mail-reader.c:2905
 msgid "_Go To"
 msgstr "ਜਾਓ(_G)"
 
-#: ../src/mail/e-mail-reader.c:2880
+#: ../src/mail/e-mail-reader.c:2912
 msgid "Mar_k As"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../src/mail/e-mail-reader.c:2887
+#: ../src/mail/e-mail-reader.c:2919
 msgid "_Message"
 msgstr "ਸੁਨੇਹਾ(_M)"
 
-#: ../src/mail/e-mail-reader.c:2894
+#: ../src/mail/e-mail-reader.c:2926
 msgid "_Zoom"
 msgstr "ਜ਼ੂਮ(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2904
-msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2936
+#, fuzzy
+#| msgid "Create a Search Folder from Mailing _List..."
+msgid "Create a Search Folder from Mailing _List…"
 msgstr "...ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_L)"
 
-#: ../src/mail/e-mail-reader.c:2906
+#: ../src/mail/e-mail-reader.c:2938
 msgid "Create a search folder for this mailing list"
 msgstr "ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2911
-msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2943
+#, fuzzy
+#| msgid "Create a Search Folder from Recipien_ts..."
+msgid "Create a Search Folder from Recipien_ts…"
 msgstr "....ਸੁਨੇਹੀਆਂ ਲਈ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_t)"
 
-#: ../src/mail/e-mail-reader.c:2913
+#: ../src/mail/e-mail-reader.c:2945
 msgid "Create a search folder for these recipients"
 msgstr "ਇਹਨਾਂ ਸੁਨੇਹੀਆਂ ਤੋਂ ਇੱਕ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2918
-msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2950
+#, fuzzy
+#| msgid "Create a Search Folder from Sen_der..."
+msgid "Create a Search Folder from Sen_der…"
 msgstr "...ਭੇਜਣ ਵਾਲੇ ਲਈ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_d)"
 
-#: ../src/mail/e-mail-reader.c:2920
+#: ../src/mail/e-mail-reader.c:2952
 msgid "Create a search folder for this sender"
 msgstr "ਇਸ ਭੇਜਣ ਵਾਲੇ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2925
-msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2957
+#, fuzzy
+#| msgid "Create a Search Folder from S_ubject..."
+msgid "Create a Search Folder from S_ubject…"
 msgstr "...ਵਿਸ਼ੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_u)"
 
-#: ../src/mail/e-mail-reader.c:2927
+#: ../src/mail/e-mail-reader.c:2959
 msgid "Create a search folder for this subject"
 msgstr "ਇਸ ਵਿਸ਼ੇ ਲਈ ਇੱਕ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../src/mail/e-mail-reader.c:2974
-msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3006
+#, fuzzy
+#| msgid "Mark for Follo_w Up..."
+msgid "Mark for Follo_w Up…"
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:3022
 msgid "Mark as _Important"
 msgstr "ਖਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_I)"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3026
 msgid "Mark as _Junk"
 msgstr "ਰੱਦੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_J)"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3030
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3034
 msgid "Mar_k as Read"
 msgstr "ਪੜ੍ਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_k)"
 
-#: ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:3046
 msgid "Mark as Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾਓ(_m)"
 
-#: ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:3050
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
 
-#: ../src/mail/e-mail-reader.c:3066
+#: ../src/mail/e-mail-reader.c:3098
 msgid "_Caret Mode"
 msgstr "ਗੁਪਤ-ਲੇਖਣ ਢੰਗ(_C)"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3100
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਕਰਸਰ ਝਪਕਦੀ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:3074
+#: ../src/mail/e-mail-reader.c:3106
 msgid "All Message _Headers"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਹੈੱਡਰ(_H)"
 
-#: ../src/mail/e-mail-reader.c:3076
+#: ../src/mail/e-mail-reader.c:3108
 msgid "Show messages with all email headers"
 msgstr "ਸੁਨੇਹੇ ਸਭ ਈ-ਮੇਲ ਹੈੱਡਰਾਂ ਨਾਲ ਵੇਖਾਓ"
 
-#: ../src/mail/e-mail-reader.c:3647
+#: ../src/mail/e-mail-reader.c:3692
 msgid "Retrieving message"
 msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/e-mail-reader.c:4951
+#: ../src/mail/e-mail-reader.c:5062
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../src/mail/e-mail-reader.c:4952
+#: ../src/mail/e-mail-reader.c:5063
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਅੱਗੇ ਭੇਜੋ"
@@ -18946,58 +19341,32 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਅੱਗੇ ਭੇਜੋ"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4971
+#: ../src/mail/e-mail-reader.c:5082
 msgid "Group Reply"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ"
 
-#: ../src/mail/e-mail-reader.c:4972
+#: ../src/mail/e-mail-reader.c:5083
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਜਵਾਬ ਜਾਂ ਸਭ ਪ੍ਰਾਪਤ-ਕਰਤਾਵਾਂ ਨੂੰ"
 
-#: ../src/mail/e-mail-reader.c:5038 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: ../src/mail/e-mail-reader.c:5050
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/mail/e-mail-reader.c:5161
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
-#: ../src/mail/e-mail-reader.c:5054
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/mail/e-mail-reader.c:5165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
-#: ../src/mail/e-mail-reader.c:5063 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../src/mail/e-mail-reader.c:6218
-#, c-format
-msgid "Allow remote content for anyone from %s"
-msgstr ""
-
-#: ../src/mail/e-mail-reader.c:6220
-#, c-format
-msgid "Allow remote content for %s"
-msgstr ""
-
-#: ../src/mail/e-mail-reader.c:6237
-#, c-format
-msgid "Allow remote content from %s"
-msgstr ""
-
-#: ../src/mail/e-mail-reader.c:6254
-#| msgid "_Do not show this message again"
-msgid "Do not show this message again"
-msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ"
-
-#: ../src/mail/e-mail-reader.c:6306
-#, fuzzy
-#| msgid "Header content"
-msgid "Load remote content"
-msgstr "ਹੈੱਡਰ ਸਮੱਗਰੀ"
-
 #: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "ਮੈਨੂੰ ਚੇਤਾਵਨੀ ਨਾ ਵੇਖਾਓ"
@@ -19010,7 +19379,6 @@ msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭ
 
 #: ../src/mail/e-mail-reader-utils.c:727
 #, c-format
-#| msgid "Refreshing folder '%s'"
 msgid "Refreshing folder “%s”"
 msgstr "”%s” ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -19032,20 +19400,14 @@ msgstr ""
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1601
+#: ../src/mail/e-mail-reader-utils.c:1602
 msgid "Printing"
 msgstr "ਪਰਿੰਟ ਕਰੋ"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1838
+#: ../src/mail/e-mail-reader-utils.c:1839
 #, c-format
-#| msgid ""
-#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
-#| "delete it?"
-#| msgid_plural ""
-#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
-#| "delete them?"
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
@@ -19057,7 +19419,7 @@ msgstr[0] ""
 msgstr[1] ""
 "ਫੋਲਡਰ ”%s” ਵਿੱਚ %u ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਉਨ੍ਹਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/mail/e-mail-reader-utils.c:2924
+#: ../src/mail/e-mail-reader-utils.c:3023
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ਸੁਨੇਹਾ ਸੰਭਾਲੋ"
@@ -19068,17 +19430,48 @@ msgstr[1] "ਸੁਨੇਹੇ ਸੰਭਾਲੋ"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:2945
+#: ../src/mail/e-mail-reader-utils.c:3044
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ਸੁਨੇਹਾ"
 msgstr[1] "ਸੁਨੇਹੇ"
 
-#: ../src/mail/e-mail-reader-utils.c:3359
+#: ../src/mail/e-mail-reader-utils.c:3458
 msgid "Parsing message"
 msgstr "ਸੁਨੇਹਾ ਪਾਰਸ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/e-mail-request.c:276
+#: ../src/mail/e-mail-remote-content-popover.c:232
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-remote-content-popover.c:234
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../src/mail/e-mail-remote-content-popover.c:251
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-remote-content-popover.c:268
+msgid "Do not show this message again"
+msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ"
+
+#: ../src/mail/e-mail-remote-content-popover.c:320
+#, fuzzy
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "ਹੈੱਡਰ ਸਮੱਗਰੀ"
+
+#: ../src/mail/e-mail-remote-content-popover.c:395
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
+#: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੋਈ ਟੈਕਸਟ ਸਮੱਗਰੀ ਨਹੀਂ ਹੈ।"
 
@@ -19103,7 +19496,6 @@ msgstr "%s ਪ੍ਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"
 
 #: ../src/mail/e-mail-ui-session.c:870
 #, c-format
-#| msgid "No data source found for UID '%s'"
 msgid "No data source found for UID “%s”"
 msgstr "UID ”%s” ਲਈ ਕੋਈ ਡਾਟਾ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ।"
 
@@ -19142,14 +19534,14 @@ msgstr[1] ""
 #: ../src/mail/em-composer-utils.c:829
 #, fuzzy
 #| msgid "Imports ICS attachments to calendar."
-msgid "Waiting for attachments to load..."
+msgid "Waiting for attachments to load…"
 msgstr "ICS ਨੱਥੀ ਕੈਲੰਡਰ ਲਈ ਆਯਾਤ ਕਰੋ।"
 
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2176
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -19157,102 +19549,94 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ਵਜੇ "
 "${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
 
-#: ../src/mail/em-composer-utils.c:2182
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ --------"
 
-#: ../src/mail/em-composer-utils.c:2187
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "--------ਅਸਲੀ ਸੁਨੇਹਾ--------"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2919
+#: ../src/mail/em-composer-utils.c:2799
 #, c-format
-#| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "ਜਵਾਬ: %s"
 
-#: ../src/mail/em-composer-utils.c:3529
+#: ../src/mail/em-composer-utils.c:3417
 msgid "an unknown sender"
 msgstr "ਅਣਜਾਣ ਭੇਜਣ ਵਾਲਾ"
 
-#: ../src/mail/em-composer-utils.c:4173
+#: ../src/mail/em-composer-utils.c:4042
 #, fuzzy
 #| msgid "Accept Tentatively"
 msgid "Alternative Reply"
 msgstr "ਅਜ਼ਮਾਇਸੀ ਆਰਜ਼ੀ"
 
-#: ../src/mail/em-composer-utils.c:4176
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/mail/em-composer-utils.c:4045
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Reply"
 msgstr "ਜਵਾਬ(_R)"
 
-#: ../src/mail/em-composer-utils.c:4189
-#| msgid "Recipients"
+#: ../src/mail/em-composer-utils.c:4058
 msgid "Recipients:"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ:"
 
-#: ../src/mail/em-composer-utils.c:4217
-#| msgid "_Reply to Sender"
+#: ../src/mail/em-composer-utils.c:4086
 msgid "Reply to _Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_S)"
 
-#: ../src/mail/em-composer-utils.c:4239
-#| msgid "_Reply style:"
+#: ../src/mail/em-composer-utils.c:4108
 msgid "Reply style:"
 msgstr "ਜਵਾਬ ਸਟਾਈਲ:"
 
 #  default charset used in mail view
-#: ../src/mail/em-composer-utils.c:4247
-#| msgid "Default"
+#: ../src/mail/em-composer-utils.c:4116
 msgid "_Default"
 msgstr "ਡਿਫਾਲਟ(_D)"
 
-#: ../src/mail/em-composer-utils.c:4251
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
+#: ../src/mail/em-composer-utils.c:4120
 msgid "Attach_ment"
 msgstr "ਅਟੈਚਮੈਂਟ(_m)"
 
-#: ../src/mail/em-composer-utils.c:4255
+#: ../src/mail/em-composer-utils.c:4124
 #, fuzzy
 #| msgctxt "ReplyForward"
 #| msgid "Inline (Outlook style)"
 msgid "Inline (_Outlook style)"
 msgstr "ਇਨਲਾਈਨ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)"
 
-#: ../src/mail/em-composer-utils.c:4259
-#| msgid "_Quoted"
+#: ../src/mail/em-composer-utils.c:4128
 msgid "_Quote"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../src/mail/em-composer-utils.c:4263
+#: ../src/mail/em-composer-utils.c:4132
 #, fuzzy
 #| msgctxt "ReplyForward"
 #| msgid "Do Not Quote"
 msgid "Do _Not Quote"
 msgstr "ਕੋਟ ਨਾ ਕਰੋ"
 
-#: ../src/mail/em-composer-utils.c:4270
+#: ../src/mail/em-composer-utils.c:4139
 #, fuzzy
 #| msgid "For_mat messages in HTML"
 msgid "_Format message in HTML"
 msgstr "HT_ML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 
-#: ../src/mail/em-composer-utils.c:4280
+#: ../src/mail/em-composer-utils.c:4149
 #, fuzzy
 #| msgid "A_pply Filters"
 msgid "Apply t_emplate"
 msgstr "ਫਿਲਟਰ ਲਗਾਓ(_p)"
 
-#: ../src/mail/em-composer-utils.c:4292
+#: ../src/mail/em-composer-utils.c:4161
 #, fuzzy
 #| msgid "Original message"
 msgid "Preserve original message S_ubject"
 msgstr "ਅਸਲੀ ਸੁਨੇਹਾ"
 
-#: ../src/mail/em-composer-utils.c:4358
+#: ../src/mail/em-composer-utils.c:4227
 #, fuzzy, c-format
 #| msgid "Sender or Recipients"
 msgid "one recipient"
@@ -19261,11 +19645,11 @@ msgstr[0] "ਭੇਜਣ ਵਾਲਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 msgstr[1] "ਭੇਜਣ ਵਾਲਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4776
+#: ../src/mail/em-composer-utils.c:4636
 msgid "Posting destination"
 msgstr "ਭੇਜਣ ਟਿਕਾਣਾ"
 
-#: ../src/mail/em-composer-utils.c:4781
+#: ../src/mail/em-composer-utils.c:4641
 msgid "Choose folders to post the message to."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
@@ -19285,12 +19669,10 @@ msgid "%s (%s, for account %s)"
 msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#| msgid "Enabled"
 msgid "enabled"
 msgstr "ਸਮਰੱਥ ਹੈ"
 
 #: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
-#| msgid "_Disable"
 msgid "disabled"
 msgstr "ਅਸਮਰੱਥ ਹੈ"
 
@@ -19314,7 +19696,7 @@ msgid "If any of the following conditions are met"
 msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਸ਼ਰਤਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਮਿਲਦੀ"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1068
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
 msgid "Then"
 msgstr "ਤਦ"
 
@@ -19329,61 +19711,79 @@ msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
 #. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
-#: ../src/mail/em-filter-rule.c:941
+#: ../src/mail/em-filter-rule.c:940
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr ""
 
-#: ../src/mail/em-filter-rule.c:1038
+#: ../src/mail/em-filter-rule.c:1037
 #, fuzzy
 #| msgid "File _type:"
 msgid "Rul_e type:"
 msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
-#: ../src/mail/em-filter-rule.c:1056
+#: ../src/mail/em-filter-rule.c:1055
 #, fuzzy
 #| msgid "_Account:"
 msgid "_For Account:"
 msgstr "ਅਕਾਊਂਟ(_A):"
 
-#: ../src/mail/em-filter-rule.c:1141
+#: ../src/mail/em-filter-rule.c:1140
 msgid "Add Ac_tion"
 msgstr "ਐਕਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../src/mail/em-folder-properties.c:241
+#: ../src/mail/em-folder-properties.c:170
+#, fuzzy
+#| msgid "Selected Column"
+msgid "Select Custom Icon"
+msgstr "ਚੁਣੇ ਕਾਲਮ"
+
+#: ../src/mail/em-folder-properties.c:219
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "_Use custom icon"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
+
+#: ../src/mail/em-folder-properties.c:312
+#, fuzzy
+#| msgid "Unset Color"
+msgid "Use te_xt color"
+msgstr "ਰੰਗ ਨਾ-ਸੈੱਟ"
+
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ਨਾ ਪੜ੍ਹੇ ਸੁਨੇਹੇ:"
 msgstr[1] "ਨਾ ਪੜ੍ਹੇ ਸੁਨੇਹੇ:"
 
-#: ../src/mail/em-folder-properties.c:252
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ਕੁੱਲ ਸੁਨੇਹੇ:"
 msgstr[1] "ਕੁੱਲ ਸੁਨੇਹੇ:"
 
-#: ../src/mail/em-folder-properties.c:273
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ਕੋਟਾ (%s) ਵਰਤੇ ਕੇ:"
 
-#: ../src/mail/em-folder-properties.c:275
+#: ../src/mail/em-folder-properties.c:528
 #, c-format
 msgid "Quota usage"
 msgstr "ਕੋਟਾ ਵਰਤੋਂ"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:419
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr ""
 
-#: ../src/mail/em-folder-properties.c:626
+#: ../src/mail/em-folder-properties.c:912
 msgid "Archive this folder using these settings:"
 msgstr ""
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:638
+#: ../src/mail/em-folder-properties.c:924
 #, fuzzy
 #| msgid "Purge events older than"
 msgctxt "autoarchive"
@@ -19391,96 +19791,95 @@ msgid "Auto-_cleanup messages older than"
 msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:651
-#| msgid "days"
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "ਦਿਨ"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:653
-#| msgid "weeks"
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "ਹਫਤੇ"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:655
-#| msgid "months"
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "ਮਹੀਨੇ"
 
-#: ../src/mail/em-folder-properties.c:661
+#: ../src/mail/em-folder-properties.c:947
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move messages to the default archive _folder"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/mail/em-folder-properties.c:668
+#: ../src/mail/em-folder-properties.c:954
 #, fuzzy
 #| msgid "Moving messages to '%s'"
 msgid "_Move messages to:"
 msgstr "ਸੁਨੇਹੇ '%s' ਵਿੱਚ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 #, fuzzy
 #| msgid "Create folder"
 msgid "Archive folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:958
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for Archive"
 msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../src/mail/em-folder-properties.c:676
-#| msgid "_Delete Message"
+#: ../src/mail/em-folder-properties.c:962
 msgid "_Delete messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਓ(_D)"
 
-#: ../src/mail/em-folder-properties.c:1031
-#| msgid "Server"
+#: ../src/mail/em-folder-properties.c:1317
 msgid "Server Tag"
 msgstr "ਸਰਵਰ ਟੈਗ"
 
-#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "ਲੇਬਲ"
 
+#: ../src/mail/em-folder-properties.c:1370
+#, fuzzy
+#| msgid "_Switcher Appearance"
+msgid "Appearance"
+msgstr "ਸਵਿੱਚਰ ਦਿੱਖ(_S)"
+
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1087
+#: ../src/mail/em-folder-properties.c:1374
 msgid "Archive"
 msgstr ""
 
-#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "ਲੇਬਲ"
 
-#: ../src/mail/em-folder-properties.c:1169
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../src/mail/em-folder-properties.c:1408
+#: ../src/mail/em-folder-properties.c:1694
 #, fuzzy
 #| msgid "Category Properties"
 msgid "Gathering folder properties"
 msgstr "ਕੈਟਾਗਰੀ ਗੁਣ"
 
-#: ../src/mail/em-folder-selection-button.c:77
+#: ../src/mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../src/mail/em-folder-selector.c:399
-#| msgid "Create a new mail folder"
+#: ../src/mail/em-folder-selector.c:422
 msgid "Create a new folder"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../src/mail/em-folder-tree.c:682
-#| msgid "Folder names cannot contain '/'"
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ ”/” ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
 
@@ -19502,68 +19901,60 @@ msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ ”/” ਨਹੀਂ ਰੱਖ 
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:876
+#: ../src/mail/em-folder-tree.c:879
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%Iu%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1741
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../src/mail/em-folder-tree.c:2280
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/em-folder-tree.c:2283
+#: ../src/mail/em-folder-tree.c:2293
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/mail/em-folder-tree.c:2313
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸੁਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460
+#: ../src/mail/em-folder-tree-model.c:462
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1703
-msgid "Loading..."
-msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
-
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
-#| msgid "Moving folder %s"
 msgid "Moving folder “%s”"
 msgstr "ਫੋਲਡਰ ”%s” ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/mail/em-folder-utils.c:113
 #, c-format
-#| msgid "Copying folder %s"
 msgid "Copying folder “%s”"
 msgstr "ਫੋਲਡਰ ”%s” ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/mail/em-folder-utils.c:252
 #, c-format
-#| msgid "Moving folder %s"
 msgid "Moving folder “%s” (%d/%d)"
 msgstr "ਫੋਲਡਰ “%s” (%d/%d) ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -19594,8 +19985,8 @@ msgid "Subscribe To _All"
 msgstr "ਸਭ ਲਈ ਮੈਂਬਰ ਬਣੋ(_A)"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
@@ -19607,82 +19998,81 @@ msgstr "ਲੁਕਵੇਂ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_b)"
 msgid "Unsubscribe From _All"
 msgstr "ਸਭ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_A)"
 
-#: ../src/mail/em-subscription-editor.c:1313
-#: ../src/modules/mail/e-mail-shell-view-private.c:933
-#: ../src/modules/mail/e-mail-shell-view-private.c:965
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:916
+#: ../src/modules/mail/e-mail-shell-view-private.c:948
+#: ../src/modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ਨਾ-ਪੜ੍ਹੇ, "
 msgstr[1] "%d ਨਾ-ਪੜ੍ਹੇ, "
 
-#: ../src/mail/em-subscription-editor.c:1317
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/mail/em-subscription-editor.c:1319
+#: ../src/modules/mail/e-mail-shell-view-private.c:1002
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ਕੁੱਲ"
 msgstr[1] "%d ਕੁੱਲ"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1731
 msgid "Folder Subscriptions"
 msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1766
 msgid "_Account:"
 msgstr "ਅਕਾਊਂਟ(_A):"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1779
 msgid "Clear Search"
 msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1796
 msgid "Sho_w items that contain:"
 msgstr "ਆਈਟਮਾਂ ਰੱਖਣ ਵਾਲੇ ਵੇਖੋ(_w):"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1843
 msgid "Subscribe to the selected folder"
 msgstr ""
 "ਚੁਣੇ ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਬਣੋਚੁਣੇ ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਬਣਾਚੁਣੇ ਫੋਲਡਰ ਚੁਣੇ ਫੋਲਡਰ ਤੋਂ"
 " ਮੈਂਬਰੀ "
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Su_bscribe"
 msgstr "ਮੈਂਬਰ ਬਣੋ(_b)"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰ ਹਟਾਓ"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1929
 msgid "Collapse all folders"
 msgstr "ਸਭ ਫੋਲਡਰ ਸਮੇਟੋ"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "C_ollapse All"
 msgstr "ਸਭ ਸਮੇਟੋ(_o)"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1940
 msgid "Expand all folders"
 msgstr "ਸਭ ਫੋਲਡਰ ਫੈਲਾਉ"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "E_xpand All"
 msgstr "ਸਭ ਫੈਲਾਉ(_x)"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1951
 msgid "Refresh the folder list"
 msgstr "ਫੋਲਡਰ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋਘ"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1963
 msgid "Stop the current operation"
 msgstr "ਮੌਜੂਦਾ ਕਾਰਵਾਈ ਰੋਕੋਮੌਜੂਦਾ ਕਾਰਵ"
 
-#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/mail/em-subscription-editor.c:1964
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
-#| msgid "Stop"
 msgid "_Stop"
 msgstr "ਰੋਕੋ(_S)"
 
@@ -19708,7 +20098,6 @@ msgstr "%s ਤੋਂ ਸੁਨੇਹੇ"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
 #: ../src/mail/em-utils.c:1575
-#| msgid "Role"
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "ਜਵਾਬ"
@@ -19940,13 +20329,11 @@ msgstr "ਨਾ-ਨਿਸ਼ਾਨ ਹੋਵੇ"
 
 #: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
 #: ../src/mail/vfoldertypes.xml.in.h:48
-#| msgid "% Completed"
 msgid "is Completed"
 msgstr "ਮੁਕੰਮਲ ਨਹੀਂ ਹੈ"
 
 #: ../src/mail/filtertypes.xml.in.h:46 ../src/mail/searchtypes.xml.in.h:48
 #: ../src/mail/vfoldertypes.xml.in.h:49
-#| msgid "% Completed"
 msgid "is not Completed"
 msgstr "ਮੁਕੰਮਲ ਨਹੀਂ ਹੈ"
 
@@ -20137,8 +20524,8 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਈਲਮ ਇੰਪੋਰਟਰ"
 msgid "Import mail and contacts from KMail."
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਇੰਪੋਰਟ ਹੈ।"
 
-#: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1040
+#: ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1023
 msgid "Trash"
 msgstr "ਰੱਦੀ"
 
@@ -20153,16 +20540,15 @@ msgid "Importing mail and contacts from KMail"
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਇੰਪੋਰਟ ਹੈ।"
 
 #. Destination folder, was set in our widget
-#: ../src/mail/importers/mail-importer.c:187
-#: ../src/mail/importers/mail-importer.c:312
+#: ../src/mail/importers/mail-importer.c:190
+#: ../src/mail/importers/mail-importer.c:315
 #: ../src/plugins/dbx-import/dbx-importer.c:612
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-#| msgid "Importing '%s'"
 msgid "Importing “%s”"
 msgstr "”%s” ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/mail/importers/mail-importer.c:556
+#: ../src/mail/importers/mail-importer.c:559
 #, c-format
 msgid "Scanning %s"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ %s"
@@ -20210,14 +20596,6 @@ msgstr "ਫਿਲਟਰ ਨਿਯਮ ਜੋੜੋ"
 #. * of its name, without quotes.
 #: ../src/mail/mail-autofilter.c:552
 #, c-format
-#| 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 modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -20315,7 +20693,6 @@ msgid "_Forward style:"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਈਲ(_F):"
 
 #: ../src/mail/mail-config.ui.h:20
-#| msgid "_Languages"
 msgid "_Language:"
 msgstr "ਭਾਸ਼ਾ(_L):"
 
@@ -20427,7 +20804,7 @@ msgstr ""
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸੁਨੇਹਾ ਭੇਜਣ(_e)"
 
-#. Translators:
+#. Translators: 'changes' is a verb. This is whether to show a warning or not in that situation
 #: ../src/mail/mail-config.ui.h:61
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr ""
@@ -20452,7 +20829,6 @@ msgstr "ਭੇਜਣ ਵਾਲਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
 #: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
-#| msgid "_Account:"
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
@@ -20473,7 +20849,6 @@ msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
 #: ../src/mail/mail-config.ui.h:77
-#| msgid "Source Account"
 msgid "Send Account"
 msgstr "ਭੇਜਣ ਖਾਤਾ"
 
@@ -20530,7 +20905,7 @@ msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ(_q)"
 
 #: ../src/mail/mail-config.ui.h:97
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
@@ -20628,12 +21003,10 @@ msgid "Notify about _missing remote content in the message preview"
 msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
 
 #: ../src/mail/mail-config.ui.h:118
-#| msgid "_Add"
 msgid "Add"
 msgstr "ਜੋੜੋ"
 
 #: ../src/mail/mail-config.ui.h:119
-#| msgid "_Remove"
 msgid "Remove"
 msgstr "ਹਟਾਓ"
 
@@ -20696,7 +21069,6 @@ msgid "_Delete junk messages"
 msgstr "ਜੰਕ ਸੁਨੇਹੇ ਹਟਾਓ(_D)"
 
 #: ../src/mail/mail-config.ui.h:135
-#| msgid "Junk Settings"
 msgid "Junk Test Options"
 msgstr "ਜੰਕ ਟੈਸਟ ਸੈਟਿੰਗਾਂ"
 
@@ -20759,9 +21131,6 @@ msgid "Review"
 msgstr "ਮੁੜ-ਜਾਂਚ"
 
 #: ../src/mail/mail-dialogs.ui.h:12
-#| msgid ""
-#| "The messages you have selected for follow up are listed below.\n"
-#| "Please select a follow up action from the \"Flag\" menu."
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the “Flag” menu."
@@ -20798,18 +21167,6 @@ msgstr "ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ(_A)"
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾਈਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਚੁਣੋ(_T)"
 
-#: ../src/mail/mail-dialogs.ui.h:22
-msgid "Security Information"
-msgstr "ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"
-
-#: ../src/mail/mail-dialogs.ui.h:24
-msgid "Digital Signature"
-msgstr "ਡਿਜ਼ਟਲ ਦਸਤਖਤ"
-
-#: ../src/mail/mail-dialogs.ui.h:25
-msgid "Encryption"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ"
-
 #: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਗਲਤ"
@@ -20823,7 +21180,6 @@ msgstr ""
 " ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:3
-#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgid "Your login to your server “{0}” as “{0}” failed."
 msgstr "ਤੁਹਾਡਾ ਸਰਵਰ ”{0}” ਉੱਤੇ ”{0}” ਵਜੋਂ ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੈ।"
 
@@ -21001,9 +21357,6 @@ msgid "Use _Default"
 msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
 
 #: ../src/mail/mail.error.xml.h:38
-#| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "folder \"{0}\"?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder “{0}”?"
@@ -21031,7 +21384,7 @@ msgstr ""
 " ਹੋ?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(_E)"
 
@@ -21078,17 +21431,14 @@ msgid "Error loading filter definitions."
 msgstr "ਫਿਲਟਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ।"
 
 #: ../src/mail/mail.error.xml.h:54
-#| msgid "Cannot save to directory \"{0}\"."
 msgid "Cannot save to directory “{0}”."
 msgstr "ਡਾਇਰੈਕਟਰੀ ”{0}” ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:55
-#| msgid "Cannot save to file \"{0}\"."
 msgid "Cannot save to file “{0}”."
 msgstr "ਫਾਇਲ ”{0}” ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:56
-#| msgid "Cannot create the save directory, because \"{1}\""
 msgid "Cannot create the save directory, because “{1}”"
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ ”{1}”"
 
@@ -21106,12 +21456,10 @@ msgid "File exists but is not a regular file."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਹ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
 #: ../src/mail/mail.error.xml.h:60
-#| msgid "Cannot delete folder \"{0}\"."
 msgid "Cannot delete folder “{0}”."
 msgstr "”{0}” ਫੋਲਡਰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:61
-#| msgid "Cannot delete system folder \"{0}\"."
 msgid "Cannot delete system folder “{0}”."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ ”{0}” ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -21125,29 +21473,22 @@ msgstr ""
 "ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:63
-#| msgid "Failed to expunge folder &quot;{0}&quot;."
 msgid "Failed to expunge folder “{0}”."
 msgstr "ਫੋਲਡਰ ”{0}” ਖਾਲੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:65
-#| msgid "Failed to refresh folder &quot;{0}&quot;."
 msgid "Failed to refresh folder “{0}”."
 msgstr "ਫੋਲਡਰ ”{0}” ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:66
-#| msgid "Cannot rename or move system folder \"{0}\"."
 msgid "Cannot rename or move system folder “{0}”."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ ”{0}”; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:67
-#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgid "Really delete folder “{0}” and all of its subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ ”{0}” ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
 #: ../src/mail/mail.error.xml.h:68
-#| 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 and its subfolders’ contents "
 "will be deleted permanently."
@@ -21175,7 +21516,6 @@ msgid "Do _Not Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
 #: ../src/mail/mail.error.xml.h:74
-#| msgid "Really delete folder \"{0}\"?"
 msgid "Really delete folder “{0}”?"
 msgstr "”{0}” ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
@@ -21202,19 +21542,16 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/mail/mail.error.xml.h:78
-#| msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgid "Cannot rename “{0}” to “{1}”."
 msgstr "”{0}” ਦਾ ਨਾਂ ”{1}” ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../src/mail/mail.error.xml.h:79
-#| msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgid "A folder named “{1}” already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ ”{1}” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਇੱਕ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ ਜੀ।"
 
 #: ../src/mail/mail.error.xml.h:80
-#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgid "Cannot move folder “{0}” to “{1}”."
 msgstr "ਫੋਲਡਰ ”{0}” ਨੂੰ ”{1}” ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -21227,12 +21564,10 @@ msgid "Cannot open target folder. Error: {2}"
 msgstr "ਟਿਕਾਣਾ ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਗਲਤੀ: {2}"
 
 #: ../src/mail/mail.error.xml.h:83
-#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgid "Cannot copy folder “{0}” to “{1}”."
 msgstr "”{0}” ਫੋਲਡਰ ਨੂੰ ”{1}” ਵਿੱਚ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:84
-#| msgid "Cannot create folder \"{0}\"."
 msgid "Cannot create folder “{0}”."
 msgstr "ਫੋਲਡਰ “{0}” ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
@@ -21254,7 +21589,6 @@ msgid "You may not create two accounts with the same name."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਮੇਂ ਦੋ ਅਕਾਊਂਟ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"
 
 #: ../src/mail/mail.error.xml.h:89
-#| msgid "Are you sure you want to delete this account?"
 msgid "Are you sure you want to delete account “{0}”?"
 msgstr "ਕੀ ਤੁਸੀਂ “{0}”ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
@@ -21295,7 +21629,6 @@ msgid "_Disable"
 msgstr "ਆਯੋਗ(_D)"
 
 #: ../src/mail/mail.error.xml.h:98
-#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgid "Cannot edit Search Folder “{0}” as it does not exist."
 msgstr ""
 "ਖੋਜ ਫੋਲਡਰ ”{0}” ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
@@ -21309,14 +21642,12 @@ msgstr ""
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
 #: ../src/mail/mail.error.xml.h:101
-#| msgid "Cannot add Search Folder \"{0}\"."
 msgid "Cannot add Search Folder “{0}”."
 msgstr "ਖੋਜ ਫੋਲਡਰ ”{0}” ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../src/mail/mail.error.xml.h:102
-#| msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgid "A folder named “{0}” already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ ”{0}” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਦਿਓ ਜੀ।"
 
@@ -21355,17 +21686,11 @@ msgstr ""
 " ਚੁਣ ਕੇ।"
 
 #: ../src/mail/mail.error.xml.h:112
-#| msgid "Problem migrating old mail folder \"{0}\"."
 msgid "Problem migrating old mail folder “{0}”."
 msgstr "ਪੁਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ ”{0}” ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
 #  mail:ask-migrate-existing secondary
 #: ../src/mail/mail.error.xml.h:113
-#| msgid ""
-#| "A non-empty folder at \"{1}\" already exists.\n"
-#| "\n"
-#| "You can choose to ignore this folder, overwrite or append its contents, "
-#| "or quit."
 msgid ""
 "A non-empty folder at “{1}” already exists.\n"
 "\n"
@@ -21387,19 +21712,10 @@ msgid "_Append"
 msgstr "ਨਾਲ ਜੋੜ੍ਹੋ(_A)"
 
 #: ../src/mail/mail.error.xml.h:119
-#| msgid "Evolution's local mail format has changed."
 msgid "Evolution’s local mail format has changed."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਦਾ ਲੋਕਲ ਮੇਲ ਫਾਰਮੈਟ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:120
-#| msgid ""
-#| "Evolution's local mail format has changed from mbox to Maildir. Your "
-#| "local mail must be migrated to the new format before Evolution can "
-#| "proceed. Do you want to migrate now?\n"
-#| "\n"
-#| "An mbox account will be created to preserve the old mbox folders. You can "
-#| "delete the account after ensuring the data is safely migrated. Please "
-#| "make sure there is enough disk space if you choose to migrate now."
 msgid ""
 "Evolution’s local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -21434,9 +21750,6 @@ msgid "Unable to read license file."
 msgstr "ਲਾਈਸੈਂਸ ਫਾਇਲ ਪੜ੍ਹਨ ਵਿੱਚ ਆਯੋਗ ਹੈ।"
 
 #: ../src/mail/mail.error.xml.h:126
-#| msgid ""
-#| "Cannot read the license file \"{0}\", due to an installation problem. You "
-#| "will not be able to use this provider until you can accept its license."
 msgid ""
 "Cannot read the license file “{0}”, due to an installation problem. You will "
 "not be able to use this provider until you can accept its license."
@@ -21537,22 +21850,18 @@ msgid "Copy folder in folder tree."
 msgstr "ਫੋਲਡਰ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਕਾਪੀ ਕਰੋ।"
 
 #: ../src/mail/mail.error.xml.h:146
-#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr "ਕੀ ਤੁਸੀਂ ”{0}” ਫੋਲਡਰ ਨੂੰ ”{1}” ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../src/mail/mail.error.xml.h:148
-#| msgid "Do _not Send"
 msgid "Do _not copy"
 msgstr "ਕਾਪੀ ਨਾ ਕਰੋ(_n)"
 
 #: ../src/mail/mail.error.xml.h:149
-#| msgid "_Always"
 msgid "_Always copy"
 msgstr "ਹਮੇਸ਼ਾ ਕਾਪੀ ਕਰੋ(_A)"
 
 #: ../src/mail/mail.error.xml.h:150
-#| msgid "N_ever"
 msgid "N_ever copy"
 msgstr "ਕਦੇ ਕਾਪੀ ਨਾ ਕਰੋ(_e)"
 
@@ -21561,7 +21870,6 @@ msgid "Move folder in folder tree."
 msgstr "ਫੋਲਡਰ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਭੇਜੋ।"
 
 #: ../src/mail/mail.error.xml.h:152
-#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "ਕੀ ਤੁਸੀਂ ”{0}” ਫੋਲਡਰ ਨੂੰ ”{1}” ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -21618,12 +21926,10 @@ msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
 #: ../src/mail/mail.error.xml.h:163
-#| msgid "\"Check Junk\" Failed"
 msgid "“Check Junk” Failed"
 msgstr "”ਜੰਕ ਚੈੱਕ ਕਰੋ” ਫੇਲ੍ਹ ਹੈ"
 
 #: ../src/mail/mail.error.xml.h:164
-#| msgid "\"Report Junk\" Failed"
 msgid "“Report Junk” Failed"
 msgstr "”ਜੰਕ ਰਿਪੋਰਟ ਕਰੋ” ਫੇਲ੍ਹ ਹੈ"
 
@@ -21783,80 +22089,68 @@ msgstr ""
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:196
-#, fuzzy
-#| msgid "Request a _read receipt for this message"
-msgid "Remote content download had been blocked for this message."
-msgstr "ਇਹ ਸੁਨੇਹੇ ਲਈ ਇੱਕ ਪੜ੍ਹਨ ਰਸੀਦ ਦੀ ਮੰਗ ਹੈ(_r)"
-
-#: ../src/mail/mail.error.xml.h:197
-msgid ""
-"You can download remote content manually, or set to remember to download "
-"remote content for this sender or used sites."
-msgstr ""
-
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:199
+#: ../src/mail/mail.error.xml.h:197
 #, fuzzy
 #| msgid "Completed on"
 msgid "{0}, Completed on {1}"
 msgstr "ਸਮਾਪਤ "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:201
+#: ../src/mail/mail.error.xml.h:199
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:203
+#: ../src/mail/mail.error.xml.h:201
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:203
 #, fuzzy
 #| msgid "This signature has been changed, but has not been saved."
 msgid "This message note has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:208
+#: ../src/mail/mail.error.xml.h:206
 #, fuzzy
 #| msgid "Failed to stream mail message content to Bogofilter: "
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "ਬੋਗੋਫਿਲਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇਹੇ ਸਟਰੀਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:208
 #, fuzzy
 #| msgid "Failed to stream mail message content to Bogofilter: "
 msgid "Failed to store message note in folder “{0}”"
 msgstr "ਬੋਗੋਫਿਲਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇਹੇ ਸਟਰੀਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:209
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Something has gone wrong when displaying the message"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:210
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:213
+#: ../src/mail/mail.error.xml.h:211
 msgid "Something has gone wrong when displaying the signature"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:212
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
 "a bug report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:215
+#: ../src/mail/mail.error.xml.h:213
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to permanently remove all the deleted messages in "
@@ -21866,30 +22160,31 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ"
 " ਹੋ?"
 
-#: ../src/mail/mail.error.xml.h:216
+#: ../src/mail/mail.error.xml.h:214
 msgid ""
 "These messages will be shown in the Trash folder, where they can be "
 "permanently deleted later."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:217
+#: ../src/mail/mail.error.xml.h:215
 #, fuzzy
 #| msgid "_Not Junk"
 msgid "_Empty Junk"
 msgstr "ਜੰਕ ਨਹੀਂ(_N)"
 
-#: ../src/mail/mail.error.xml.h:218
+#: ../src/mail/mail.error.xml.h:216
 #, fuzzy
 #| msgid "Failed to open folder."
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
 #: ../src/mail/mail-send-recv.c:193
-msgid "Canceling..."
+#, fuzzy
+#| msgid "Canceling..."
+msgid "Canceling…"
 msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../src/mail/mail-send-recv.c:610
-#| msgid "_Edit Message"
 msgid "Edit Message"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ"
 
@@ -21907,33 +22202,35 @@ msgstr "ਪੱਤਰ ਭੇਜਣੇ ਅਤੇ ਲੈਣੇ"
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ ਕਰੋ(_A)"
 
-#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
-msgid "Updating..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1467
+#, fuzzy
+#| msgid "Updating..."
+msgid "Updating…"
 msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
-msgid "Waiting..."
+#, fuzzy
+#| msgid "Waiting..."
+msgid "Waiting…"
 msgstr "ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/mail/mail-send-recv.c:1436
+#: ../src/mail/mail-send-recv.c:1433
 #, c-format
-#| msgid "Checking for new mail at '%s'"
 msgid "Checking for new mail at “%s”"
 msgstr "”%s” ਉੱਤੇ ਨਵੇਂ ਮੇਲ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/mail/mail-send-recv.c:1663
+#: ../src/mail/mail-send-recv.c:1660
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1665
+#: ../src/mail/mail-send-recv.c:1662
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1667
+#: ../src/mail/mail-send-recv.c:1664
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at “%s”"
 msgstr "”%s” ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -21949,54 +22246,54 @@ msgstr "ਖੋਜ ਫੋਲਡਰ ਸੋਧ"
 msgid "New Search Folder"
 msgstr "ਨਵਾਂ ਖੋਜ ਫੋਲਡਰ"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:312
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:313
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:314
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:315
 msgid "Forwarded"
 msgstr "ਅੱਗੇ ਭੇਜੇ"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:316
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹੁ ਨਾ-ਵੇਖੇ ਸੁਨੇਹੇ"
 
-#: ../src/mail/message-list.c:311
+#: ../src/mail/message-list.c:317
 msgid "Multiple Messages"
 msgstr "ਬਹੁ-ਸੁਨੇਹੇ"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:330
 msgid "Lowest"
 msgstr "ਸਭ ਤੋਂ ਘੱਟ"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:331
 msgid "Lower"
 msgstr "ਘੱਟ"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:335
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:336
 msgid "Highest"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:485
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
 #: ../src/mail/message-list.c:2154
-#: ../src/modules/itip-formatter/itip-view.c:269
+#: ../src/modules/itip-formatter/itip-view.c:270
 msgid "Today %l:%M %p"
 msgstr "ਅੱਜ %l:%M %p"
 
@@ -22016,25 +22313,20 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3265
+#: ../src/mail/message-list.c:3311
 msgid "Select all visible messages"
 msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਚੁਣੋ"
 
-#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4076 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "ਸੁਨੇਹੇ"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5559
+#: ../src/mail/message-list.c:5645
 msgid "Follow-up"
 msgstr "ਧਿਆਨ ਰੱਖੋ"
 
-#: ../src/mail/message-list.c:6629
-#| msgid ""
-#| "No message satisfies your search criteria. Change search criteria by "
-#| "selecting a new Show message filter from the drop down list above or by "
-#| "running a new search either by clearing it with Search->Clear menu item "
-#| "or by changing the query above."
+#: ../src/mail/message-list.c:6708
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -22046,10 +22338,16 @@ msgstr ""
 "ਫਿਲਟਰ ਚਣਨ ਕੇ ਖੋਜ ਸ਼ਰਤ ਦਿਉ ਜਾਂ ਇਸ ਨੂੰ ਖੋਜ→ਮੇਨੂ ਆਈਟਮ ਸਾਫ਼ ਕਰੋ ਜਾਂ ਉੱਤੇ ਕਿਊਰੀ ਨੂੰ"
 " ਬਦਲੋ।"
 
-#: ../src/mail/message-list.c:6637
+#: ../src/mail/message-list.c:6716
 msgid "There are no messages in this folder."
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
 
+#: ../src/mail/message-list.c:6792
+#, fuzzy
+#| msgid "Generating message list"
+msgid "Generating message list…"
+msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
+
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ"
@@ -22075,12 +22373,11 @@ msgid "Messages To"
 msgstr "ਨੂੰ ਸੁਨੇਹੇ"
 
 #: ../src/mail/message-list.etspec.h:20
-#| msgid "Subject - Trimmed"
 msgid "Subject — Trimmed"
 msgstr "ਵਿਸ਼ਾ — ਛੋਟਾ ਕੀਤਾ"
 
 #: ../src/mail/message-list.etspec.h:21
-#: ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
@@ -22105,32 +22402,32 @@ msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "ਸੁਨੇਹੀਆਂ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "ਸੁਨੇਹੇ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "ਵਿਸ਼ੇ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "ਪੱਤਰ 'ਚ ਹੈ"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -22152,7 +22449,6 @@ msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:327
-#| msgid "C_alendar:"
 msgid "C_alendar"
 msgstr "ਕੈਲੰਡਰ(_a)"
 
@@ -22163,7 +22459,7 @@ msgid "New Address Book"
 msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:326
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
@@ -22191,7 +22487,6 @@ msgstr "ਕੰਮ ਲਿਸਟ ਗੁਣ"
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:229
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:174
-#| msgid "_Backup"
 msgid "_Back"
 msgstr "ਪਿੱਛੇ(_B)"
 
@@ -22207,7 +22502,7 @@ msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../src/modules/addressbook/autocompletion-config.c:124
-#: ../src/modules/mail/em-mailer-prefs.c:1696
+#: ../src/modules/mail/em-mailer-prefs.c:1697
 msgid "_Table column:"
 msgstr "ਟੇਬਲ ਕਾਲਮ(_ T):"
 
@@ -22217,7 +22512,6 @@ msgstr "ਐਡਰੈਸ ਨੂੰ ਇਸ ਦੇ ਟਿਕਾਣਾ ਦੇਸ਼
 
 #. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
 #: ../src/modules/addressbook/autocompletion-config.c:143
-#| msgid "Open map"
 msgctxt "OpenMap"
 msgid "Open _maps with"
 msgstr "ਇਸ ਨਾਲ ਨਕਸ਼ਾ ਖੋਲ੍ਹੋ(_m)"
@@ -22230,7 +22524,6 @@ msgstr ""
 
 #. Translators: This is part of "Open maps with Google"
 #: ../src/modules/addressbook/autocompletion-config.c:153
-#| msgid "Google"
 msgctxt "OpenMap"
 msgid "Google"
 msgstr "ਗੂਗਲ"
@@ -22300,7 +22593,9 @@ msgid "Save as vCard"
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
-msgid "Co_py All Contacts To..."
+#, fuzzy
+#| msgid "Co_py All Contacts To..."
+msgid "Co_py All Contacts To…"
 msgstr "ਸਭ ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਕਾਪੀ (_p)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
@@ -22318,16 +22613,18 @@ msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਹਟਾਓ"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
 #, fuzzy
 #| msgid "Mo_ve to Address Book..."
-msgid "_Manage Address Book groups..."
+msgid "_Manage Address Book groups…"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
-#: ../src/modules/calendar/e-task-shell-view-actions.c:735
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
 msgid "Manage task list groups order and visibility"
 msgstr ""
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
-msgid "Mo_ve All Contacts To..."
+#, fuzzy
+#| msgid "Mo_ve All Contacts To..."
+msgid "Mo_ve All Contacts To…"
 msgstr "ਸਭ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜੋ(_v)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
@@ -22347,9 +22644,9 @@ msgid "Show properties of the selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
-#: ../src/modules/calendar/e-task-shell-view-actions.c:754
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
 
@@ -22372,12 +22669,14 @@ msgid "Show map with all contacts from selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈਸ ਬੁੱਕ ਤੋਂ ਸਭ ਸੰਪਰਕ ਨਾਲ ਨਕਸ਼ਾ ਵੇਖਾਓ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
-msgid "_Rename..."
-msgstr "ਨਾਂ ਬਦਲੋ(_R)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#, fuzzy
+#| msgid "_Rename"
+msgid "_Rename…"
+msgstr "ਨਾਂ ਬਦਲੋ(_R)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Rename the selected address book"
@@ -22388,7 +22687,9 @@ msgid "Stop loading"
 msgstr "ਲੋਡ ਕਰਨਾ ਰੋਕੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
-msgid "_Copy Contact To..."
+#, fuzzy
+#| msgid "_Copy Contact To..."
+msgid "_Copy Contact To…"
 msgstr "ਸੰਪਰਕਾਂ ਇੱਥੇ ਕਾਪੀ ਕਰੋ(_C)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
@@ -22400,7 +22701,9 @@ msgid "_Delete Contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ(_D)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
-msgid "_Find in Contact..."
+#, fuzzy
+#| msgid "_Find in Contact..."
+msgid "_Find in Contact…"
 msgstr "ਸੰਪਰਕ ਵਿੱਚ ਖੋਜ(_F)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
@@ -22408,15 +22711,19 @@ msgid "Search for text in the displayed contact"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੰਪਰਕ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
-msgid "_Forward Contact..."
-msgstr "ਸੰਪਰਕ ਨੂੰ ਅੱਗੇ ਭੇਜੋ(_F)..."
+#, fuzzy
+#| msgid "_Forward Contact"
+msgid "_Forward Contact…"
+msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Send selected contacts to another person"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਭੇਜੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
-msgid "_Move Contact To..."
+#, fuzzy
+#| msgid "_Move Contact To..."
+msgid "_Move Contact To…"
 msgstr "ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)..."
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
@@ -22424,12 +22731,16 @@ msgid "Move selected contacts to another address book"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਹੋਰ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਭੇਜੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
-msgid "_New Contact..."
-msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
+#, fuzzy
+#| msgid "New Contact"
+msgid "_New Contact…"
+msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
-msgid "New Contact _List..."
-msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ(_L)..."
+#, fuzzy
+#| msgid "New Contact List"
+msgid "New Contact _List…"
+msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "_Open Contact"
@@ -22440,33 +22751,35 @@ msgid "View the current contact"
 msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ ਵੇਖੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
-msgid "_Send Message to Contact..."
-msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
+#, fuzzy
+#| msgid "_Send Message to Contact"
+msgid "_Send Message to Contact…"
+msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Send a message to the selected contacts"
 msgstr "ਸੁਨੇਹਾ ਚੁਣੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਭੇਜੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
-#: ../src/modules/calendar/e-task-shell-view-actions.c:833
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "ਕਾਰਵਾਈ(_A)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:686
-#: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "ਝਲਕ(_P)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:703
-#: ../src/modules/calendar/e-task-shell-view-actions.c:857
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-task-shell-view-actions.c:855
 #, fuzzy
 #| msgid "_Manager:"
-msgid "_Manage groups..."
+msgid "_Manage groups…"
 msgstr "ਪ੍ਰਬੰਧਕ(_M):"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
@@ -22490,9 +22803,9 @@ msgid "Show maps in contact preview window"
 msgstr "ਸੰਪਰਕ ਝਲਕ ਵਿੰਡੋ ਵਿੱਚ ਨਕਸ਼ੇ ਵੇਖਾਓ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
-#: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "ਟਕਸਾਲੀ ਝਲਕ(_C)"
 
@@ -22501,9 +22814,9 @@ msgid "Show contact preview below the contact list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਸੰਪਰਕ ਝਲਕ ਵੇਖੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "ਲੰਬਕਾਰੀ ਝਲਕ(_V)"
 
@@ -22512,17 +22825,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਦੇ ਨਾਲ ਸੰਪਰਕ ਝਲਕ ਵੇਖੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:792
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1000
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:802
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "ਤਕਨੀਕੀ ਖੋਜ"
@@ -22550,34 +22863,36 @@ msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੇ ਸੰਪਰਕਾ
 #. Translators: This is an action label
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1358
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
-msgid "_Save as vCard..."
-msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)...."
+#, fuzzy
+#| msgid "Save as vCard"
+msgid "_Save as vCard…"
+msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
 msgid "Save selected contacts as a vCard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ VCard ਵਜੋਂ ਸੰਭਾਲੋ"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:351
+#: ../src/modules/addressbook/e-book-shell-view.c:355
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:353
+#: ../src/modules/addressbook/e-book-shell-view.c:357
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:384
+#: ../src/modules/addressbook/e-book-shell-view.c:388
 msgid "_Send Message to Contacts"
 msgstr "ਸੰਪਰਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:386
+#: ../src/modules/addressbook/e-book-shell-view.c:390
 msgid "_Send Message to List"
 msgstr "ਲਿਸਟ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:388
+#: ../src/modules/addressbook/e-book-shell-view.c:392
 msgid "_Send Message to Contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:169
+#: ../src/modules/alarm-notify/alarm-notify.c:171
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr ""
@@ -22592,17 +22907,17 @@ msgstr ""
 "\n"
 "ਇਹ ਤੁਹਾਡੀ ਨਿੱਜੀ ਡਾਟਾ, ਸੈਟਿੰਗ, ਮੇਲ ਫਿਲਟਰ ਆਦਿ ਰੀਸਟੋਰ ਕਰੇਗੀ।"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ(_R):"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਬੈਕਅੱਪ ਫਾਇਲ ਚੁਣੋ"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "ਬੈਕ-ਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
@@ -22616,7 +22931,6 @@ msgid "_Restart Evolution after backup"
 msgstr "ਬੈਕ ਅੱਪ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ(_R)"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:386
-#| msgid "_Restart Evolution after restore"
 msgid "Re_start Evolution after restore"
 msgstr "ਰੀ-ਸਟੋਰ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ ਚਾਲੂ(_s)"
 
@@ -22626,11 +22940,13 @@ msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੇਲੂਸ਼ਨ ਬੈਕ
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
-msgid "Checking content of backup file “%s”, please wait..."
+msgid "Checking content of backup file “%s”, please wait…"
 msgstr ""
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:458
-msgid "_Back up Evolution Data..."
+#, fuzzy
+#| msgid "_Back up Evolution Data..."
+msgid "_Back up Evolution Data…"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕਰੋ(_B)..."
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:460
@@ -22638,7 +22954,9 @@ msgid "Back up Evolution data and settings to an archive file"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਅਕਾਇਵ ਫਾਇਲ ਵਿੱਚ ਬੈਕਅੱਪ ਕਰੋ"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:465
-msgid "R_estore Evolution Data..."
+#, fuzzy
+#| msgid "R_estore Evolution Data..."
+msgid "R_estore Evolution Data…"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰੋ(_e)..."
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:467
@@ -22663,7 +22981,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:81
 msgid "With Graphical User Interface"
-msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
+msgstr "ਗਰਾਫਿਕਲ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਨਾਲ"
 
 #. FIXME Will the versioned setting always work?
 #: ../src/modules/backup-restore/evolution-backup-tool.c:294
@@ -22714,7 +23032,6 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕ-ਅੱਪ"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:904
 #, c-format
-#| msgid "Backing up to the folder %s"
 msgid "Backing up to the file %s"
 msgstr "ਫਾਇਲ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -22724,7 +23041,6 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:909
 #, c-format
-#| msgid "Restoring from the folder %s"
 msgid "Restoring from the file %s"
 msgstr "ਫਾਇਲ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -22849,26 +23165,26 @@ msgstr "ਜੰਕ ਫਿਲਟਰਿੰਗ ਸਾਫਟਵੇਅਰ:"
 msgid "Choose an Address Book"
 msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:274
-#| msgid "Add Address Book"
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
 msgid "Find Address Books"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲੱਭੋ"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:285
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "ifMatch ਅਣਡਿੱਠਾ (Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr ""
 
@@ -22878,7 +23194,6 @@ msgstr ""
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
-#| msgid "Label name cannot be empty."
 msgid "User name cannot be empty"
 msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
 
@@ -22892,7 +23207,6 @@ msgstr "ਸਟੈਂਡਰਡ LDAP ਪੋਰਟ"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
-#| msgid "LDAP over SSL (deprecated)"
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "SSL/TLS ਉੱਤੇ LDAP (ਬਰਤਰਫ਼ ਕੀਤਾ)"
 
@@ -22901,7 +23215,6 @@ msgid "Microsoft Global Catalog"
 msgstr "ਮਾਈਕਰੋਸਾਫਟ ਗਲੋਬਲ ਕੈਟਾਲਾਗ"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
-#| msgid "Microsoft Global Catalog over SSL"
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "SSL/TLS ਉੱਤੇ ਮਾਈਕਰੋਸਾਫਟ ਗਲੋਬਲ ਕੈਟਾਲਾਗ"
 
@@ -22943,7 +23256,6 @@ msgid "Anonymous"
 msgstr "ਅਣਜਾਣ"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
-#| msgid "Label name cannot be empty."
 msgid "Username can be left empty"
 msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
 
@@ -23003,11 +23315,6 @@ msgid "Search Scope:"
 msgstr "ਖੋਜ ਹੱਦ:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
-#| msgid ""
-#| "The search scope defines how deep you would like the search to extend "
-#| "down the directory tree.  A search scope of \"Subtree\" will include all "
-#| "entries below your search base.  A search scope of \"One Level\" will "
-#| "only include the entries one level beneath your search base."
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of “Subtree” will include all entries "
@@ -23016,8 +23323,9 @@ msgid ""
 msgstr ""
 "ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ"
 " ਜਾਵੇ। "
-"”Subtree” ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ ”One "
-"Level” ਨਾਲ ਤੁਹਾਡੇ ਖੋਜ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
+"”Subtree” ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ ”One"
+" Level” "
+"ਨਾਲ ਤੁਹਾਡੇ ਖੋਜ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
 msgid "Search Filter:"
@@ -23047,38 +23355,38 @@ msgstr "ਹੱਦ ਅੱਪੜਨ ਤੱਕ ਝਲਕ ਵੇਖੋ"
 msgid "Server address cannot be empty"
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
 msgid "Find Calendars"
 msgstr "ਕੈਲੰਡਰ ਲੱਭੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
 msgid "Find Memo Lists"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਲੱਭੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 msgid "Find Task Lists"
 msgstr "ਕੰਮ ਲਿਸਟ ਲੱਭੋ"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
 msgid "Email:"
 msgstr "ਈਮੇਲ:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
 msgid "Server handles meeting invitations"
 msgstr "ਸਰਵਰ ਮੀਟਿੰਗ ਸੱਦੇ ਹੈਂਡਲ ਕਰਦਾ ਹੈ"
 
@@ -23096,7 +23404,7 @@ msgstr ""
 
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
-msgstr "ਮੂਲ ਯੂਜ਼ਰ ਕੈਲੰਡਰ"
+msgstr "ਮੂਲ ਵਰਤੋਂਕਾਰ ਕੈਲੰਡਰ"
 
 #: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
@@ -23126,7 +23434,6 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਫਾਇਲ ਅੱਪਡੇਟ ਕਰ
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
-#| msgid "Default"
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
@@ -23149,7 +23456,6 @@ msgid "Kelvin (K)"
 msgstr ""
 
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
-#| msgid "_Units:"
 msgid "Units:"
 msgstr "ਇਕਾਈਆਂ:"
 
@@ -23159,144 +23465,146 @@ msgstr "ਇਕਾਈਆਂ:"
 msgid "Location cannot be empty"
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "ਇੰਪੋਰਟ(_m)"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
 #, fuzzy
 #| msgid "Importing data."
 msgid "Importing an event"
 msgstr "ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
 #, fuzzy
 #| msgid "Importing mailbox"
 msgid "Importing a memo"
 msgstr "ਪੱਤਰ-ਬਕਸਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
 #, fuzzy
 #| msgid "Importing data."
 msgid "Importing a task"
 msgstr "ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
 msgid "Select a Calendar"
 msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
 #, fuzzy
 #| msgid "D_elete Memo List"
 msgid "Select a Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
 msgid "Select a Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
 msgid "I_mport to Calendar"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ(_m)"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "ਕੰਮ ਇੰਪੋਰਟ(_m)"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
 #, fuzzy
 #| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "ਕੰਮ ਇੰਪੋਰਟ(_m)"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar “%s”"
 msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar “%s”"
 msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ '{0}'  ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
 #, fuzzy, c-format
 #| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying a memo into the memo list “%s”"
 msgstr "ਮੀਮੋ ਨੂੰ '{0}' ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
 #, fuzzy, c-format
 #| msgid "Moving a memo into the memo list '{0}'"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "ਮੀਮੋ ਨੂੰ ”{0}” ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
 #, fuzzy, c-format
 #| msgid "Copying a task into the task list '{0}'"
 msgid "Copying a task into the task list “%s”"
 msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, fuzzy, c-format
 #| msgid "Moving a task into the task list '{0}'"
 msgid "Moving a task into the task list “%s”"
 msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Calendar Selector"
 msgstr "ਕੈਲੰਡਰ ਚੋਣਕਾਰ "
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
 msgid "Memo List Selector"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਚੋਣਕਾਰ"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Task List Selector"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਚੋਣਕਾਰ"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:521
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "ਰੀਮਾਈਂਡਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr ""
-
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:528
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:612
 msgid "Meeting Invitations"
 msgstr "ਮੀਟਿੰਗ ਸੱਦਾ"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:638
 msgid "_Delete message after acting"
 msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "_Preserve existing reminder by default"
+msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Conflict Search"
 msgstr "ਅਪਵਾਦ ਖੋਜ"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:674
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1129
+#: ../src/modules/calendar/e-calendar-preferences.c:1116
 msgid "Ti_me and date:"
 msgstr "ਸਮਾਂ ਤੇ ਮਿਤੀ(_m):"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1130
+#: ../src/modules/calendar/e-calendar-preferences.c:1117
 msgid "_Date only:"
 msgstr "ਕੇਵਲ ਮਿਤੀ(_D):"
 
@@ -23361,7 +23669,7 @@ msgid "_24 hour"
 msgstr "_੨੪ ਘੰਟੇ"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "ਕੰਮ ਹਫਤਾ"
 
@@ -23487,107 +23795,115 @@ msgid "Sc_roll Month View by a week"
 msgstr "ਮਹੀਨੇ ਨੂੰ ਹਫ਼ਤੇ ਨਾਲ ਹਿਲਾਉ(_r)"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+#, fuzzy
+#| msgid "Scroll Month View by a week"
+msgid "Start Month View with the c_urrent week"
+msgstr "ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਅੱਗੇ ਪਿੱਛੇ ਕਰੋ"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Order days in Week View from _left to right"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Allo_w direct edit of event Summary"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 #, fuzzy
 #| msgid "User cancelled operation"
 msgid "Hi_de cancelled events"
-msgstr "ਯੂਜ਼ਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
+msgstr "ਵਰਤੋਂਕਾਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Alerts"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Ask for confirmation when deleting items"
 msgstr "ਆਈਟਮਾਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Highlight t_asks due today"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਨੂੰ ਉਭਾਰੋ(_a)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Highlight _overdue tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਉਭਾਰੋ(_o)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪੂਰਨ ਕੰਮ ਇਸ ਬਾਅਦ ਓਹਲੇ ਕਰੋ(_H)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Hid_e cancelled tasks"
 msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
 
 #  forest green
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 #, fuzzy
 #| msgid "To Do"
 msgid "To Do bar"
 msgstr "ਕਰਨ-ਲਈ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Show Tasks without _Due date"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
-msgid "Display reminders in _notification area only"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Display Reminders window with _notifications"
 msgstr "ਕੇਵਲ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਰੀਮਾਈਂਡਰ ਵੇਖੋ(_n)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Keep reminder notification _window always on top"
 msgstr "ਕੇਵਲ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਰੀਮਾਈਂਡਰ ਵੇਖੋ(_n)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 #, fuzzy
 #| msgid "Delete completed tasks"
 msgid "Display reminders for completed _tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Display reminders for _past events"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਰੀਮਾਈਂਡਰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰੋ"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 #, fuzzy
 #| msgid "Default reminder value"
 msgid "Set _default reminder"
 msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਂਡਰ ਮੁੱਲ"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 #, fuzzy
 #| msgid "before every appointment"
 msgid "before every new appointment"
 msgstr "ਹਰ ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_r)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "before every anniversary/birthday"
 msgstr "ਹਰੇਕ ਵਰ੍ਹੇ-ਗੰਢ/ਜਨਮਦਿਨ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Select the sources for reminder notification:"
@@ -23601,7 +23917,7 @@ msgstr "ਡਿਫਾਲਟ ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ"
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
-"%u ਅਤੇ %d ਨੂੰ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚੋਂ ਯੂਜ਼ਰ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।"
+"%u ਅਤੇ %d ਨੂੰ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚੋਂ ਵਰਤੋਂਕਾਰ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid ""
@@ -23613,45 +23929,45 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "ਪਬਲਿਸ਼ਿੰਗ ਜਾਣਕਾਰੀ"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮੁਲਾਕਾਤ(_A)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:117
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Create a new appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_p)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:124
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੀਂ ਸਾਰਾ-ਦਿਨ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:131
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:141
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:258
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
@@ -23675,7 +23991,7 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:940
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -23683,383 +23999,399 @@ msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
 msgid "event"
 msgstr "ਈਵੈਂਟ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1142
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:512
-#: ../src/modules/calendar/e-task-shell-view-actions.c:631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "Save as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
-msgid "_Copy..."
-msgstr "ਕਾਪੀ ਕਰੋ(_C)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+#, fuzzy
+#| msgid "_Copy"
+msgid "_Copy…"
+msgstr "ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "D_elete Calendar"
 msgstr "ਕੈਲੰਡਰ ਹਟਾਓ(_e)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "Delete the selected calendar"
 msgstr "ਚੁਣਿਆ ਕੈਲੰਡਰ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
 msgid "Go Back"
 msgstr "ਪਿੱਛੇ ਜਾਉ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Forward"
 msgstr "ਅੱਗੇ ਜਾਉ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select today"
 msgstr "ਅੱਜ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select a specific date"
 msgstr "ਖਾਸ ਮਿਤੀ ਚੁਣੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
 #, fuzzy
 #| msgid "_New Calendar..."
-msgid "_Manage Calendar groups..."
+msgid "_Manage Calendar groups…"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Manage Calendar groups order and visibility"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
-#: ../src/modules/calendar/e-task-shell-view-actions.c:824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "ਨਿਚੋੜ(_e)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "ਪੁਰਾਣੀ ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗਾਂ ਵਿੱਚ ਸੋਧ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Refresh the selected calendar"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 #, fuzzy
 #| msgid "Refresh the selected calendar"
 msgid "Re_fresh list of account calendars"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Rename the selected calendar"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
-#| msgid "Find _next"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Find _Next"
 msgstr "ਅੱਗੇ ਖੋਜੋ(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Find next occurrence of the current search string"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਵਾਕ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
-#| msgid "Find _previous"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Find _Previous"
 msgstr "ਪਿੱਛੇ ਖੋਜੋ(_P)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Find previous occurrence of the current search string"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਵਾਕ ਦੀ ਪਿਛਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
-#| msgid "Stop _running search"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Stop _Running Search"
 msgstr "ਚੱਲ ਰਹੀ ਖੋਜ ਰੋਕੋ(_R)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Stop currently running search"
 msgstr "ਇਸ ਸਮੇਂ ਚੱਲ ਰਹੀ ਖੋਜ ਬੰਦ  ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 #, fuzzy
 #| msgid "Local Calendars"
 msgid "Sho_w All Calendars"
 msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Show _Only This Calendar"
 msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖੋ(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "Cop_y to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#, fuzzy
+#| msgid "Cop_y to Calendar..."
+msgid "Cop_y to Calendar…"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
-msgid "_Delegate Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#, fuzzy
+#| msgid "_Delegate Meeting..."
+msgid "_Delegate Meeting…"
 msgstr "ਡੈਲੀਗੇਟ ਮੀਟਿੰਗ(_D)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "_Delete Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਹਟਾਓ(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete selected appointments"
 msgstr "ਚੁਣੀ ਮੁਲਾਕਾਤ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Delete This _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Delete this occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete All Occ_urrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_u)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete all occurrences"
 msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
 #, fuzzy
 #| msgid "_Edit as New Message..."
-msgid "Edit as Ne_w..."
+msgid "Edit as Ne_w…"
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
 #, fuzzy
 #| msgid "View the current appointment"
 msgid "Edit the current appointment as new"
 msgstr "ਮੌਜੂਦਾ ਮੁਲਾਕਾਤ ਦੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
-msgid "New All Day _Event..."
-msgstr "ਨਵਾਂ ਸਾਰੇ ਦਿਨ ਦਾ ਈਵੈਂਟ(_E)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#, fuzzy
+#| msgid "New All Day Event"
+msgid "New All Day _Event…"
+msgstr "ਨਵੀਆਂ ਸਾਰਾ ਦਿਨ ਘਟਨਾਵਾਂ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new all day event"
 msgstr "ਨਵਾਂ ਸਾਰੇ ਦਿਨ ਦਾ ਈਵੈਂਟ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
-msgid "_Forward as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+#, fuzzy
+#| msgid "_Forward as iCalendar..."
+msgid "_Forward as iCalendar…"
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Create a new meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
-msgid "Mo_ve to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#, fuzzy
+#| msgid "Mo_ve to Calendar..."
+msgid "Mo_ve to Calendar…"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Open Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "View the current appointment"
 msgstr "ਮੌਜੂਦਾ ਮੁਲਾਕਾਤ ਦੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
-msgid "_Schedule Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#, fuzzy
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule Meeting…"
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Converts an appointment to a meeting"
 msgstr "ਮੁਲਾਕਾਤ ਨੂੰ ਮੀਟਿੰਗ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1514
-msgid "Conv_ert to Appointment..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#, fuzzy
+#| msgid "Conv_ert to Appointment..."
+msgid "Conv_ert to Appointment…"
 msgstr "ਮੁਲਾਕਤ 'ਚ ਬਦਲੋ(_e)..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Converts a meeting to an appointment"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਮੁਲਾਕਾਤ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "ਦਿਨ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "ਇੱਕ ਦਿਨ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "ਲਿਸਟ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "ਲਿਸਟ ਦੀ ਤਰਾਂ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "ਇੱਕ ਮਹੀਨਾ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "ਇੱਕ ਹਫ਼ਤਾ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "ਇੱਕ ਕੰਮ ਹਫ਼ਤਾ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "ਐਕਟਿਵ ਮੁਲਾਕਾਤ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
 #, fuzzy
 #| msgid "Next 7 Days' Appointments"
 msgid "Next 7 Days’ Appointments"
 msgstr "ਅਗਲੇ ੭ ਦਿਨ ਦੀਆਂ ਮੁਲਾਕਾਤਾਂ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Occurs Less Than 5 Times"
 msgstr "5 ਵਾਰ ਤੋਂ ਘੱਟ ਵਾਰ ਵਾਪਰਨਾ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:816
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1024
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Description contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:823
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Summary contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
-#| msgid "_Print..."
-msgid "Print..."
-msgstr "ਪਰਿੰਟ ਕਰੋ..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#, fuzzy
+#| msgid "Print"
+msgid "Print…"
+msgstr "ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "ਇਹ ਕੈਲੰਡਰ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "ਪਰਿੰਟ ਹੋਣ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਝਲਕ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:864
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1072
-msgid "_Save as iCalendar..."
-msgstr "iCalendar ਵਜੋਂ ਸੰਭਾਲੋ(_S)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#, fuzzy
+#| msgid "Save as iCalendar"
+msgid "_Save as iCalendar…"
+msgstr "iCalendar ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Go To"
 msgstr "ਜਾਓ"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "ਮੀਮੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
 msgid "New _Memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
 msgid "_Open Memo"
 msgstr "ਮੀਮੋ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:672
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 msgid "View the selected memo"
 msgstr "ਚੁਣਿਆ ਮੀਮੋ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:677
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫ਼ਾ ਖੋਲ੍ਹੋ(_W)"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:849
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
 msgid "Print the selected memo"
 msgstr "ਚੁਣਿਆ ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:885
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
 msgid "Searching next matching event"
 msgstr "ਅਗਲੇ ਮਿਲਦੇ ਈਵੈਂਟ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:886
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
 msgid "Searching previous matching event"
 msgstr "ਪਿਛਲਾ ਮਿਲਦਾ ਈਵੈਂਟ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:907
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "ਅਗਲੇ ਸਾਲ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 msgstr[1] "ਅਗਲੇ %d ਸਾਲਾਂ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:911
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "ਪਿਛਲੇ ਸਾਲ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 msgstr[1] "ਪਿਛਲੇ %d ਸਾਲਾਂ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:934
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
 msgid "Cannot search with no active calendar"
 msgstr "ਐਕਟਿਵ ਕੈਲੰਡਰ ਨਾਲ ਖੋਜ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"
 
@@ -24067,58 +24399,58 @@ msgstr "ਐਕਟਿਵ ਕੈਲੰਡਰ ਨਾਲ ਖੋਜ ਨਹੀਂ ਕ
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:629
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
 msgid "task"
 msgstr "ਟਾਸਕ"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:791
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨੂੰ ਲਿਖੋ ਕਿ ਸਮਾਪਤ"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪੂਰਾ ਬਣਾਓ(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:798
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mark selected tasks as incomplete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨੂੰ ਲਿਖੋ ਕਿ ਸਮਾਪਤ"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:805
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Open Task"
 msgstr "ਕੰਮ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:812
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "View the selected task"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the selected task"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
@@ -24142,7 +24474,7 @@ msgid "Memo Li_st"
 msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
 
 #: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Create a new memo list"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 
@@ -24151,83 +24483,87 @@ msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
-msgid "_Find in Memo..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#, fuzzy
+#| msgid "_Find in Memo..."
+msgid "_Find in Memo…"
 msgstr "ਮੀਮੋ 'ਚ ਖੋਜ(_F)..."
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:581
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "ਦਿੱਸ ਰਹੇ ਮੀਮੋ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:602
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
-msgid "_Manage Memo List groups..."
-msgstr ""
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+#| msgid "_Manager:"
+msgid "_Manage Memo List groups…"
+msgstr "ਪ੍ਰਬੰਧਕ(_M):"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:609
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Manage Memo List groups order and visibility"
 msgstr ""
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 msgid "_New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ(_N)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:630
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Refresh the selected memo list"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:635
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
 #, fuzzy
 #| msgid "Refresh the selected memo list"
 msgid "Re_fresh list of account memo lists"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "ਕੇਵਲ ਇਹ ਮੀਮੋ ਲਿਸਟ ਵੇਖੋ(_O)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:656
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
 #, fuzzy
 #| msgid "Show _Only This Memo List"
 msgid "Sho_w All Memo Lists"
 msgstr "ਕੇਵਲ ਇਹ ਮੀਮੋ ਲਿਸਟ ਵੇਖੋ(_O)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Memo _Preview"
 msgstr "ਮੀਮੋ ਝਲਕ(_P)"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:749
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Show memo preview pane"
 msgstr "ਮੀਮੋ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:770
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Show memo preview below the memo list"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਮੀਮੋ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:777
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 msgid "Show memo preview alongside the memo list"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਮੀਮੋ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:835
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
 msgid "Print the list of memos"
 msgstr "ਮੀਮੋ ਦੀ ਸੂਚੀ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:842
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 msgid "Preview the list of memos to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਮੀਮੋ ਦੀ ਸੂਚੀ ਦੀ ਝਲਕ"
 
@@ -24272,7 +24608,7 @@ msgid "Tas_k List"
 msgstr "ਟਾਸਕ ਲਿਸਟ(_k)"
 
 #: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:742
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task list"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਉ"
 
@@ -24281,7 +24617,7 @@ msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਉ"
 msgid "Print Tasks"
 msgstr "ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:573
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -24294,126 +24630,129 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਟਾਸਕਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:580
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
 msgid "Do not ask me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:698
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Delete Task"
 msgstr "ਟਾਸਕ ਹਟਾਓ(_D)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:705
-msgid "_Find in Task..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+#, fuzzy
+#| msgid "_Find in Task..."
+msgid "_Find in Task…"
 msgstr "ਟਾਸਕ 'ਚ ਖੋਜ(_F)..."
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:707
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
 msgid "Search for text in the displayed task"
 msgstr "ਦਿੱਸ ਰਹੀ ਟਾਸਕ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "D_elete Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:728
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Delete the selected task list"
 msgstr "ਚੁਣੀ ਕੰਮ ਲਿਸਟ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:733
-msgid "_Manage Task List groups..."
-msgstr ""
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#, fuzzy
+#| msgid "_Manager:"
+msgid "_Manage Task List groups…"
+msgstr "ਪ੍ਰਬੰਧਕ(_M):"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "_New Task List"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:756
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Refresh the selected task list"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 #, fuzzy
 #| msgid "Refresh the selected task list"
 msgid "Re_fresh list of account task lists"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:770
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 #, fuzzy
 #| msgid "Show _Only This Task List"
 msgid "Sho_w All Task Lists"
 msgstr "ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖੋ(_O)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "Show _Only This Task List"
 msgstr "ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖੋ(_O)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Mar_k as Incomplete"
 msgstr "ਅਧੂਰੇ ਵਜੋਂ ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:826
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Delete completed tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:913
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
 msgid "Task _Preview"
 msgstr "ਟਾਸਕ ਝਲਕ(_P)"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:915
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview pane"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:936
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview below the task list"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਟਾਸਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:943
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
 msgid "Show task preview alongside the task list"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਨਾਲ ਟਾਸਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:951
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
 msgid "Active Tasks"
 msgstr "ਐਕਟਿਵ ਟਾਸਕ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:965
-#| msgid "Cancelled"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
 msgid "Cancelled Tasks"
 msgstr "ਰੱਦ ਕੀਤੇ ਕੰਮ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:972
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:979
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
 #, fuzzy
 #| msgid "Next 7 Days' Tasks"
 msgid "Next 7 Days’ Tasks"
 msgstr "ਅੱਗੇ ੭ ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Overdue Tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:993
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Tasks with Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਨਾਲ ਟਾਸਕ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
 msgid "Print the list of tasks"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Preview the list of tasks to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਟਾਸਕ ਲਿਸਟ ਦੀ ਝਲਕ"
 
-#: ../src/modules/calendar/e-task-shell-view.c:345
+#: ../src/modules/calendar/e-task-shell-view.c:346
 msgid "Delete Tasks"
 msgstr "ਟਾਸਕ ਹਟਾਓ"
 
-#: ../src/modules/calendar/e-task-shell-view.c:347
+#: ../src/modules/calendar/e-task-shell-view.c:348
 msgid "Delete Task"
 msgstr "ਟਾਸਕ ਹਟਾਓ"
 
@@ -24424,25 +24763,25 @@ msgid_plural "%d tasks"
 msgstr[0] "%d ਟਾਸਕ"
 msgstr[1] "%d ਟਾਸਕ"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:331
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 #, fuzzy
 #| msgid "Con_vert to Meeting"
 msgid "Convert to M_eeting"
 msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:333
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
 #, fuzzy
 #| msgid "%s has replied to a meeting request."
 msgid "Convert the message to a meeting request"
 msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
 #, fuzzy
 #| msgid "Con_vert to Meeting"
 msgid "Convert to M_essage"
 msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
 #, fuzzy
 #| msgid "Compose a new mail message"
 msgid "Convert to the mail message"
@@ -24471,7 +24810,6 @@ msgstr ""
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:87
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
-#| msgid "LDAP Servers"
 msgid "CalDAV server"
 msgstr "CalDAV ਸਰਵਰ"
 
@@ -24483,7 +24821,6 @@ msgstr ""
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:89
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
-#| msgid "LDAP Servers"
 msgid "CardDAV server"
 msgstr "CardDAV ਸਰਵਰ"
 
@@ -24494,7 +24831,6 @@ msgstr ""
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:91
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:92
-#| msgid "LDAP Servers"
 msgid "LDAP server"
 msgstr "LDAP ਸਰਵਰ"
 
@@ -24505,19 +24841,17 @@ msgstr "LDAP ਸਰਵਰ"
 msgid "Looking up LDAP server…"
 msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:240
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
 msgid "Look up in SRV records"
 msgstr ""
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
 #, c-format
-#| msgid "CalDAV"
 msgid "CalDAV: %s"
 msgstr "CalDAV: %s"
 
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
 #, c-format
-#| msgid "vCard for %s"
 msgid "CardDAV: %s"
 msgstr "CardDAV: %s"
 
@@ -24527,7 +24861,7 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV ਕੈਲੰਡਰ ਸਰੋਤ"
 
-#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr ""
 
@@ -24541,490 +24875,500 @@ msgstr "ਭਾਗ ਨੂੰ ਸੱਦੇ ਵਜੋਂ ਵੇਖਾਓ"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:261
 msgid "Today %H:%M"
 msgstr "ਅੱਜ %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:264
+#: ../src/modules/itip-formatter/itip-view.c:265
 msgid "Today %H:%M:%S"
 msgstr "ਅੱਜ %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:273
+#: ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M:%S %p"
 msgstr "ਅੱਜ %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:289
 msgid "Tomorrow %H:%M"
 msgstr "ਭਲਕ %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:292
+#: ../src/modules/itip-formatter/itip-view.c:293
 msgid "Tomorrow %H:%M:%S"
 msgstr "ਭਲਕ %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:297
+#: ../src/modules/itip-formatter/itip-view.c:298
 msgid "Tomorrow %l:%M %p"
 msgstr "ਭਲਕ %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:301
+#: ../src/modules/itip-formatter/itip-view.c:302
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ਭਲਕ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:320
+#: ../src/modules/itip-formatter/itip-view.c:321
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:325
+#: ../src/modules/itip-formatter/itip-view.c:326
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:329
+#: ../src/modules/itip-formatter/itip-view.c:330
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:334
+#: ../src/modules/itip-formatter/itip-view.c:335
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:338
+#: ../src/modules/itip-formatter/itip-view.c:339
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:347
+#: ../src/modules/itip-formatter/itip-view.c:348
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:353
+#: ../src/modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:357
+#: ../src/modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:362
+#: ../src/modules/itip-formatter/itip-view.c:363
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:366
+#: ../src/modules/itip-formatter/itip-view.c:367
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:372
+#: ../src/modules/itip-formatter/itip-view.c:373
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:377
+#: ../src/modules/itip-formatter/itip-view.c:378
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:381
+#: ../src/modules/itip-formatter/itip-view.c:382
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:386
+#: ../src/modules/itip-formatter/itip-view.c:387
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:390
+#: ../src/modules/itip-formatter/itip-view.c:391
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../src/modules/itip-formatter/itip-view.c:428
 #: ../src/modules/itip-formatter/itip-view.c:429
-#: ../src/modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:430
 #: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:608
+#: ../src/modules/itip-formatter/itip-view.c:520
+#: ../src/modules/itip-formatter/itip-view.c:609
 msgid "An unknown person"
 msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਜਵਾਬ ਭੇਜੋ ਜੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:435
-#: ../src/modules/itip-formatter/itip-view.c:525
-#: ../src/modules/itip-formatter/itip-view.c:614
+#: ../src/modules/itip-formatter/itip-view.c:436
+#: ../src/modules/itip-formatter/itip-view.c:526
+#: ../src/modules/itip-formatter/itip-view.c:615
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਲਿਆ"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:442
+#: ../src/modules/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:447
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:460
+#: ../src/modules/itip-formatter/itip-view.c:461
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s ਰਾਹੀਂ %s ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:467
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s ਤਾਜ਼ੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤਾ ਮੀਟਿੰਗ ਜਾਵਾਬ ਵਾਪਸ ਭੇਜਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:473
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:478
+#: ../src/modules/itip-formatter/itip-view.c:479
 #, fuzzy, c-format
 #| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੇ ਮੀਟਿੰਗ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ।"
 
-#: ../src/modules/itip-formatter/itip-view.c:484
+#: ../src/modules/itip-formatter/itip-view.c:485
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:490
+#: ../src/modules/itip-formatter/itip-view.c:491
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਅੱਗੇ ਦਿੱਤੀ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:532
+#: ../src/modules/itip-formatter/itip-view.c:533
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:537
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:550
+#: ../src/modules/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:557
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਕੰਮ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:563
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, fuzzy, c-format
 #| msgid "%s through %s has canceled the following assigned task:"
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:568
+#: ../src/modules/itip-formatter/itip-view.c:569
 #, fuzzy, c-format
 #| msgid "%s has canceled the following assigned task:"
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:574
+#: ../src/modules/itip-formatter/itip-view.c:575
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਭੇਜੇ ਹਨ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:581
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:621
+#: ../src/modules/itip-formatter/itip-view.c:622
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s ਨੇ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:628
+#: ../src/modules/itip-formatter/itip-view.c:629
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, c-format
-#| msgid "%s through %s has canceled the following shared memo:"
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:634
+#: ../src/modules/itip-formatter/itip-view.c:635
 #, c-format
-#| msgid "%s has canceled the following shared memo:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:859
+#: ../src/modules/itip-formatter/itip-view.c:798
 msgid "All day:"
 msgstr "ਸਾਰਾ ਦਿਨ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:804
 msgid "Start day:"
 msgstr "ਦਿਨ ਸ਼ੁਰੂ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:865
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:804
+#: ../src/modules/itip-formatter/itip-view.c:1636
 msgid "Start time:"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:813
 msgid "End day:"
 msgstr "ਦਿਨ ਅੰਤ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:874
-#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:813
+#: ../src/modules/itip-formatter/itip-view.c:1637
 msgid "End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1214
+#: ../src/modules/itip-formatter/itip-view.c:1183
 msgid "Ope_n Calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ(_n)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1217
+#: ../src/modules/itip-formatter/itip-view.c:1186
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1220
+#: ../src/modules/itip-formatter/itip-view.c:1189
 msgid "_Decline"
 msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1223
+#: ../src/modules/itip-formatter/itip-view.c:1192
 msgid "_Tentative all"
 msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1226
+#: ../src/modules/itip-formatter/itip-view.c:1195
 msgid "_Tentative"
 msgstr "ਆਰਜ਼ੀ(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1229
+#: ../src/modules/itip-formatter/itip-view.c:1198
 msgid "Acce_pt all"
 msgstr "ਸਭ ਮਨਜ਼ੂਰ(_p)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1232
+#: ../src/modules/itip-formatter/itip-view.c:1201
 msgid "Acce_pt"
 msgstr "ਮਨਜ਼ੂਰ(_p)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1235
+#: ../src/modules/itip-formatter/itip-view.c:1204
 msgid "Send _Information"
 msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1238
+#: ../src/modules/itip-formatter/itip-view.c:1207
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1241
+#: ../src/modules/itip-formatter/itip-view.c:1210
 #: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "ਅੱਪਡੇਟ(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1686
-#: ../src/modules/itip-formatter/itip-view.c:1734
-#: ../src/modules/itip-formatter/itip-view.c:1805
+#: ../src/modules/itip-formatter/itip-view.c:1639
+#: ../src/modules/itip-formatter/itip-view.c:1687
+#: ../src/modules/itip-formatter/itip-view.c:1758
 msgid "Comment:"
 msgstr "ਟਿੱਪਣੀ:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1722
+#: ../src/modules/itip-formatter/itip-view.c:1675
 msgid "Send reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ ਭੇਜੋ"
 
 #  FIXME: domain/code
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1690
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1693
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_A)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1694
 msgid "Show time as _free"
 msgstr "ਟਾਈਮ ਫਰੀ ਵਾਂਗ ਵੇਖੋ(_f)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1695
 msgid "_Preserve my reminder"
 msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1743
+#: ../src/modules/itip-formatter/itip-view.c:1696
 msgid "_Inherit reminder"
 msgstr "ਇੰਹੈਰਿਟ ਰੀਮਾਇਡਰ(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:2052
+#: ../src/modules/itip-formatter/itip-view.c:1910
 msgid "_Tasks:"
 msgstr "ਕੰਮ(_T):"
 
-#: ../src/modules/itip-formatter/itip-view.c:2055
+#: ../src/modules/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "ਮੀਮੋ(_M):"
 
-#: ../src/modules/itip-formatter/itip-view.c:3112
+#: ../src/modules/itip-formatter/itip-view.c:2909
 msgid "Sa_ve"
 msgstr "ਸੰਭਾਲੋ(_v)"
 
-#: ../src/modules/itip-formatter/itip-view.c:3634
-#: ../src/modules/itip-formatter/itip-view.c:5200
+#: ../src/modules/itip-formatter/itip-view.c:3470
+#: ../src/modules/itip-formatter/itip-view.c:5222
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:3849
+#: ../src/modules/itip-formatter/itip-view.c:3680
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:3855
+#: ../src/modules/itip-formatter/itip-view.c:3687
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3694
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3705
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid ""
@@ -25034,156 +25378,267 @@ msgid_plural ""
 msgstr[0] "ਕੈਲੰਡਰ ”%s” ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 msgstr[1] "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:3888
+#: ../src/modules/itip-formatter/itip-view.c:3714
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural ""
+"The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] "ਕੈਲੰਡਰ ”%s” ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+msgstr[1] "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3723
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural ""
+"The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] "ਕੈਲੰਡਰ ”%s” ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+msgstr[1] "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3761
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Found the appointment in the calendar “%s”"
 msgstr "”%s” ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:3897
+#: ../src/modules/itip-formatter/itip-view.c:3766
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Found the task in the task list “%s”"
+msgstr "ਕੰਮ ਨੂੰ '{0}' ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3771
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Found the memo in the memo list “%s”"
+msgstr "ਮੀਮੋ ਨੂੰ ”{0}” ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:3782
 #, fuzzy
 #| msgid "The meeting is invalid and cannot be updated"
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "ਮੀਟਿੰਗ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 #  FIXME: domain/code
-#: ../src/modules/itip-formatter/itip-view.c:4039
+#: ../src/modules/itip-formatter/itip-view.c:3924
 msgid "Unable to find any calendars"
 msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4047
+#: ../src/modules/itip-formatter/itip-view.c:3932
 msgid "Unable to find this meeting in any calendar"
 msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4052
+#: ../src/modules/itip-formatter/itip-view.c:3937
 msgid "Unable to find this task in any task list"
 msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4057
+#: ../src/modules/itip-formatter/itip-view.c:3942
 msgid "Unable to find this memo in any memo list"
 msgstr "ਕਿਸੇ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4398
-msgid "Opening the calendar. Please wait..."
-msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ..."
-
-#: ../src/modules/itip-formatter/itip-view.c:4403
+#: ../src/modules/itip-formatter/itip-view.c:4236
 msgid "Searching for an existing version of this appointment"
 msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4811
-#, c-format
-#| msgid "Unable to send item to calendar '%s'.  %s"
-msgid "Unable to send item to calendar “%s”.  %s"
+#: ../src/modules/itip-formatter/itip-view.c:4240
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this task"
+msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4244
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this memo"
+msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4302
+#, fuzzy
+#| msgid "Opening the calendar. Please wait..."
+msgid "Opening the calendar. Please wait…"
+msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4718
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to calendar “%s”. %s"
 msgstr "”%s” ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4826
+#: ../src/modules/itip-formatter/itip-view.c:4726
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "”%s” ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4734
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar “%s”.  %s"
+msgid "Unable to send item to memo list “%s”. %s"
+msgstr "”%s” ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4754
 #, c-format
-#| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:4831
+#: ../src/modules/itip-formatter/itip-view.c:4759
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to task list “%s” as accepted"
+msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:4764
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as accepted"
+msgid "Sent to memo list “%s” as accepted"
+msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:4774
 #, c-format
-#| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ ”%s” ਭੇਜੋ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4837
+#: ../src/modules/itip-formatter/itip-view.c:4779
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to task list “%s” as tentative"
+msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ ”%s” ਭੇਜੋ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4784
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as tentative"
+msgid "Sent to memo list “%s” as tentative"
+msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ ”%s” ਭੇਜੋ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4794
 #, c-format
-#| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
 
-#: ../src/modules/itip-formatter/itip-view.c:4843
+#: ../src/modules/itip-formatter/itip-view.c:4799
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to task list “%s” as declined"
+msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:4804
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as declined"
+msgid "Sent to memo list “%s” as declined"
+msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ ”%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:4814
 #, c-format
-#| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "ਕੈਲੰਡਰ ”%s” ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
 
-#: ../src/modules/itip-formatter/itip-view.c:4878
-#: ../src/modules/itip-formatter/itip-view.c:5337
-#: ../src/modules/itip-formatter/itip-view.c:5440
-msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4819
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to task list “%s” as cancelled"
+msgstr "ਕੈਲੰਡਰ ”%s” ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4824
+#, fuzzy, c-format
+#| msgid "Sent to calendar “%s” as cancelled"
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "ਕੈਲੰਡਰ ”%s” ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
+
+#: ../src/modules/itip-formatter/itip-view.c:4842
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the calendar. Please wait…"
 msgstr "ਕੈਲੰਡਰ ਲਈ ਬਦਲਾਅ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ। ਉਡੀਕੋ ਜੀ..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4932
+#: ../src/modules/itip-formatter/itip-view.c:4845
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the task list. Please wait…"
+msgstr "ਕੈਲੰਡਰ ਲਈ ਬਦਲਾਅ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4848
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the memo list. Please wait…"
+msgstr "ਕੈਲੰਡਰ ਲਈ ਬਦਲਾਅ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4939
 msgid "Unable to parse item"
 msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5124
+#: ../src/modules/itip-formatter/itip-view.c:5147
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
 
-#: ../src/modules/itip-formatter/itip-view.c:5141
+#: ../src/modules/itip-formatter/itip-view.c:5164
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5145
+#: ../src/modules/itip-formatter/itip-view.c:5168
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
 
 #  FIXME: domain/code
-#: ../src/modules/itip-formatter/itip-view.c:5192
+#: ../src/modules/itip-formatter/itip-view.c:5214
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:5247
 msgid "The meeting is invalid and cannot be updated"
 msgstr "ਮੀਟਿੰਗ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5302
+#: ../src/modules/itip-formatter/itip-view.c:5332
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5373
-#: ../src/modules/itip-formatter/itip-view.c:5411
+#: ../src/modules/itip-formatter/itip-view.c:5407
+#: ../src/modules/itip-formatter/itip-view.c:5445
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5506
 msgid "Meeting information sent"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5477
+#: ../src/modules/itip-formatter/itip-view.c:5511
 msgid "Task information sent"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5482
+#: ../src/modules/itip-formatter/itip-view.c:5516
 msgid "Memo information sent"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5527
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5498
+#: ../src/modules/itip-formatter/itip-view.c:5532
 msgid "Unable to send task information, the task does not exist"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਕੰਮ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5503
+#: ../src/modules/itip-formatter/itip-view.c:5537
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5568
+#: ../src/modules/itip-formatter/itip-view.c:5582
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5573
+#: ../src/modules/itip-formatter/itip-view.c:5587
 msgid "Save Calendar"
 msgstr "ਕੈਲੰਡਰ ਸੰਭਾਲੋ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5622
 #: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5648
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5623
 #: ../src/modules/itip-formatter/itip-view.c:5636
+#: ../src/modules/itip-formatter/itip-view.c:5649
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -25191,15 +25646,15 @@ msgstr ""
 "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar)"
 " ਨਹੀਂ ਹੈ।"
 
-#: ../src/modules/itip-formatter/itip-view.c:5698
-#: ../src/modules/itip-formatter/itip-view.c:5779
-#: ../src/modules/itip-formatter/itip-view.c:5875
+#: ../src/modules/itip-formatter/itip-view.c:5731
+#: ../src/modules/itip-formatter/itip-view.c:5815
+#: ../src/modules/itip-formatter/itip-view.c:5919
 msgid "The item in the calendar is not valid"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਆਈਟਮ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5699
-#: ../src/modules/itip-formatter/itip-view.c:5780
-#: ../src/modules/itip-formatter/itip-view.c:5876
+#: ../src/modules/itip-formatter/itip-view.c:5732
+#: ../src/modules/itip-formatter/itip-view.c:5816
+#: ../src/modules/itip-formatter/itip-view.c:5920
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -25207,11 +25662,11 @@ msgstr ""
 "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾ, ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ"
 " ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5789
+#: ../src/modules/itip-formatter/itip-view.c:5825
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
 
-#: ../src/modules/itip-formatter/itip-view.c:5790
+#: ../src/modules/itip-formatter/itip-view.c:5826
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -25219,12 +25674,12 @@ msgstr ""
 "ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਇੰਪੋਰਟ"
 " ਕਰਨਾ ਪਵੇਗਾ"
 
-#: ../src/modules/itip-formatter/itip-view.c:6357
+#: ../src/modules/itip-formatter/itip-view.c:6413
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/modules/itip-formatter/itip-view.c:6373
+#: ../src/modules/itip-formatter/itip-view.c:6431
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
@@ -25239,8 +25694,6 @@ msgid "This meeting has been delegated"
 msgstr "ਇਹ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#| msgid ""
-#| "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr ""
 "”{0}” ਮੀਟਿੰਗ ਲਈ ਡੈਲੀਗੇਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੈਲੀਗੇਟ ”{1}” ਨੂੰ ਜੋੜਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
@@ -25260,7 +25713,6 @@ msgstr "ਇਹ ਅਕਾਊਂਟ ਲਈ ਗੂਗਲ ਸੰਪਰਕ ਸ਼ਾਮ
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
 #: ../src/modules/mail-config/e-mail-config-google-summary.c:330
-#| msgid "IMAP Headers"
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "IMAP ਪਹੁੰਚ"
@@ -25367,11 +25819,10 @@ msgstr "ਪੋਰਟ(_P):"
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:252
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:314
 msgid "User_name:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
+msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ(_n):"
 
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:266
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:328
-#| msgid "_Forget Passwords"
 msgid "_Forget password"
 msgstr "ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ(_F)"
 
@@ -25393,7 +25844,6 @@ msgid "TLS on a dedicated port"
 msgstr "ਖਾਸ ਪੋਰਟ ਉੱਤੇ SSL"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
-#| msgid "_Use custom binary, instead of 'sendmail'"
 msgid "_Use custom binary, instead of “sendmail”"
 msgstr "”sendmail” ਦੀ ਬਜਾਏ ਕਸਟਮ ਬਾਈਨਰੀ ਵਰਤੋਂ(_U)"
 
@@ -25410,10 +25860,6 @@ msgid "Cus_tom arguments:"
 msgstr "ਕਸਟਮ ਆਰਗੂਮੈਂਟ(_t):"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
-#| msgid ""
-#| "Default arguments are '-i -f %F -- %R', where\n"
-#| "   %F - stands for the From address\n"
-#| "   %R - stands for the recipient addresses"
 msgid ""
 "Default arguments are “-i -f %F -- %R”, where\n"
 "   %F — stands for the From address\n"
@@ -25486,315 +25932,342 @@ msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:751
+#: ../src/modules/mail/e-mail-shell-backend.c:782
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:785
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:788
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-backend.c:787
+#: ../src/modules/mail/e-mail-shell-backend.c:818
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr ""
 
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:829
+#, fuzzy, c-format
+#| msgid "Defaults"
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "ਮੂਲ"
+
 #  default charset used in mail view
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:796
-#| msgid "Default"
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "ਮੂਲ"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:810
-#| msgid "Allow newlines"
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "ਹਮੇਸ਼ਾ ਆਨਲਾਈਨ"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:919
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:888
+#: ../src/modules/mail/e-mail-shell-backend.c:928
 msgid "Composer Preferences"
 msgstr "ਕੰਪੋਜ਼ਰ ਪਸੰਦ"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:897
+#: ../src/modules/mail/e-mail-shell-backend.c:937
 msgid "Network Preferences"
 msgstr "ਨੈੱਟਵਰਕ ਪਸੰਦ"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1258
+#: ../src/modules/mail/e-mail-shell-backend.c:1298
 msgctxt "label"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:821
-msgid "Marking messages as read..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
+#, fuzzy
+#| msgid "Marking messages as read..."
+msgid "Marking messages as read…"
 msgstr "...ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
-#| msgid "Copy to Folder"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
-#| msgid "Select"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "ਚੁਣੋ(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "ਅਕਾਊਂਟ ਅਯੋਗ(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਅਯੋਗ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਤੋਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 #, fuzzy
 #| msgid "Not Junk"
 msgid "Empty _Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 #, fuzzy
 #| msgid "Permanently remove all the deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਤੋਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "ਇਸ ਅਕਾਊਂਟ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਬਦਲੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Refresh list of folders of this account"
 msgstr "ਇਹ ਖਾਤੇ ਲਈ ਫੋਲਡਰਾਂ ਦੀ ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "ਆਫਲਾਈਨ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਮਾਰਕ ਕੀਤੇ ਅਕਾਊਂਟ ਅਤੇ ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr "ਆਉਟਬਾਕਸ ਫਲੱਸ਼(_u)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
-msgid "_Copy Folder To..."
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_C)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#, fuzzy
+#| msgid "Copy Folder To"
+msgid "_Copy Folder To…"
+msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "ਇਹ ਫੋਲਡਰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#, fuzzy
+#| msgid "Move folder in folder tree."
+msgid "Change sort order of the folders in the folder tree"
+msgstr "ਫੋਲਡਰ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਭੇਜੋ।"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "ਮਿਟਾਓ(_x)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਇਸ ਫੋਲਡਰ ਵਿੱਚੋਂ ਹਟਾ ਦਿਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Mar_k All Messages as Read"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਓ(_K)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Mark all messages in the folder as read"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਮਾਰਕ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
-msgid "_Move Folder To..."
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#, fuzzy
+#| msgid "Move Folder To"
+msgid "_Move Folder To…"
+msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Move the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
-msgid "_New..."
-msgstr "ਨਵਾਂ(_N)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#, fuzzy
+#| msgid "_New"
+msgid "_New…"
+msgstr "ਨਵਾਂ(_N)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Create a new folder for storing mail"
 msgstr "ਸੰਭਾਲੇ ਪੱਤਰਾਂ ਤੋਂ ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਬਦਲੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "ਸੁਨੇਹਾ ਥਰਿੱਡ ਵੇਖੋ(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ਇੱਕੋ ਮਸਲੇ ਦੇ ਸਾਰੇ ਸੁਨੇਹੇ ਚੁਣੇ ਸੁਨੇਹੇ ਬਣਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "ਸੁਨੇਹਾ ਸਬ-ਥਰਿੱਡ ਚੁਣੋ(_u)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Select all replies to the currently selected message"
 msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਲਈ ਸਭ ਜਵਾਬ ਚੁਣੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਤੋਂ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
-#| msgid "Copy to Folder"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ(_F)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 #, fuzzy
 #| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "ਮੈਂਬਰੀ ਪਰਬੰਧ(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣੋ ਜਾਂ ਹਟਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "ਭੇਜੋ / ਲਵੋ(_R)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Send queued items and retrieve new items"
 msgstr "ਕਤਾਰਬੱਧ ਆਈਟਮਾਂ ਭੇਜੋ ਅਤੇ ਨਵੀਂ ਆਈਟਮਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "ਸਭ ਲਵੋ(_e)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਤੋਂ ਨਵੀਆਂ ਆਈਟਮਾਂ ਲਵੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "ਸਭ ਭੇਜੋ(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 msgid "Send queued items in all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਵਿੱਚ ਕਤਾਰਬੱਧ ਆਈਟਮਾਂ ਭੇਜੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "ਮੌਜੂਦਾ ਮੇਲ ਕਾਰਵਾਈ ਰੱਦ ਕਰੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਸਮੇਟੋ(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "ਸਭ ਸੁਨੇਹਾ ਥਰਿੱਡ ਸਮੇਟੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਫੈਲਾਓ(_x)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "ਸਭ ਸੁਨੇਹਾ ਥਰਿੱਡ ਫੈਲਾਓ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 msgid "Create or edit rules for filtering new mail"
 msgstr "ਨਵੀਂ ਮੇਲ ਨੂੰ ਫਿਲਟਰ ਕਰਨ ਲਈ ਨਿਯਮ ਬਣਾਓ ਜਾਂ ਸੋਧੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
-msgid "_Subscriptions..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#, fuzzy
+#| msgid "_Subscriptions..."
+msgid "_Subscriptions…"
 msgstr "ਮੈਂਬਰੀ(_S)..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "ਫੋਲਡਰ(_o)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
-msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#, fuzzy
+#| msgid "C_reate Search Folder From Search..."
+msgid "C_reate Search Folder From Search…"
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "ਫੋਲਡਰ ਖੋਜ(_o)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨੂੰ ਬਣਾਓ ਜਾਂ ਸੋਧੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
-msgid "_New Folder..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#, fuzzy
+#| msgid "_New Folder..."
+msgid "_New Folder…"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ(_P)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵਿੰਡੋ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਵੇਖੋ(_A)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid ""
@@ -25802,187 +26275,187 @@ msgid ""
 "attachments"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹੇ ਵੇਖੋ(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show deleted messages with a line through them"
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਉਨ੍ਹਾਂ 'ਚ ਲਾਈਨ ਲਾ ਕੇ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 #, fuzzy
 #| msgid "Show Hidde_n Messages"
 msgid "Show _Junk Messages"
 msgstr "ਲੁਕਵੇਂ ਸੁਨੇਹੇ ਵੇਖੋ(_N)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 #, fuzzy
 #| msgid "Show deleted messages with a line through them"
 msgid "Show junk messages with a red line through them"
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਉਨ੍ਹਾਂ 'ਚ ਲਾਈਨ ਲਾ ਕੇ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ ਗਰੁੱਪ(_G)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸੁਨੇਹਾ ਲਿਸਟ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 #, fuzzy
 #| msgid "Show _Tool Bar"
 msgid "Show To _Do Bar"
 msgstr "ਟੂਲਬਾਰ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr "ਨਾ-ਮਿਲਦੇ ਫੋਲਡਰ ਯੋਗ(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "ਕੀ ਬੇਮੇਲ ਖੋਜ ਫੋਲਡਰ ਨੂੰ ਯੋਗ ਕਰਨਾ ਹੈ, ਇਸ ਨਾਲ ਬਦਲੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview below the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 msgid "Show message preview alongside the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਨਾਲ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "ਖਾਸ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 #, fuzzy
 #| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "ਆਖਰੀ ੫ ਦਿਨਾਂ ਦੇ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "ਨਾ-ਜੰਕ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਸਮੇਤ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "ਅਟੈਚਮੈਂਟ ਸਮੇਤ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "ਬਿਨ-ਲੇਬਲ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 #, fuzzy
 #| msgid "Message Header"
 msgid "Message Thread"
 msgstr "ਸੁਨੇਹਾ ਹੈੱਡਰ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 msgid "Current Account"
 msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 #, fuzzy
 #| msgid "In Current Folder and _Subfolders"
 msgid "Current Folder and Subfolders"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view.c:893
+#: ../src/modules/mail/e-mail-shell-view.c:995
 #, fuzzy
 #| msgid "In Current Folder and _Subfolders"
 msgid "Current Folder and Subfolders Search"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1013
+#: ../src/modules/mail/e-mail-shell-view.c:1117
 msgid "All Account Search"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1121
+#: ../src/modules/mail/e-mail-shell-view.c:1227
 msgid "Account Search"
 msgstr "ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:926
+#: ../src/modules/mail/e-mail-shell-view-private.c:909
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ਚੁਣਿਆ, "
 msgstr[1] " %d ਚੁਣੇ, "
 
+#: ../src/modules/mail/e-mail-shell-view-private.c:924
 #: ../src/modules/mail/e-mail-shell-view-private.c:941
-#: ../src/modules/mail/e-mail-shell-view-private.c:958
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹਟਾਇਆ"
 msgstr[1] "%d ਹਟਾਏ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:972
-#: ../src/modules/mail/e-mail-shell-view-private.c:978
+#: ../src/modules/mail/e-mail-shell-view-private.c:955
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ਜੰਕ"
 msgstr[1] "%d ਜੰਕ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫਟ"
 msgstr[1] "%d ਡਰਾਫਟ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:974
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭੇਜਿਆ"
 msgstr[1] "%d ਨਾ-ਭੇਜੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:980
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭੇਜਿਆ"
 msgstr[1] "%d ਭੇਜੇ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1014
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
 #, fuzzy, c-format
 #| msgid "%d unread, "
 #| msgid_plural "%d unread, "
@@ -25991,12 +26464,11 @@ msgid_plural "%d unread"
 msgstr[0] "%d ਨਾ-ਪੜ੍ਹੇ, "
 msgstr[1] "%d ਨਾ-ਪੜ੍ਹੇ, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1532
+#: ../src/modules/mail/e-mail-shell-view-private.c:1515
 msgid "Send / Receive"
 msgstr "ਭੇਜੋ / ਲਵੋ"
 
 #: ../src/modules/mail/em-composer-prefs.c:420
-#| msgid "Select Folder"
 msgid "Select Folder to Add"
 msgstr "ਜੋੜਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
@@ -26005,7 +26477,6 @@ msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
 #: ../src/modules/mail/em-composer-prefs.c:932
-#| msgid "Recipients"
 msgid "Recipient"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
@@ -26016,12 +26487,10 @@ msgid "Keep in Outbox"
 msgstr "ਆਉਟਬਾਕਸ 'ਚ ਸੰਭਾਲੋ(_S)"
 
 #: ../src/modules/mail/em-composer-prefs.c:1224
-#| msgid "Send private reply?"
 msgid "Send immediately"
 msgstr "ਤੁਰੰਤ ਭੇਜੋ"
 
 #: ../src/modules/mail/em-composer-prefs.c:1225
-#| msgid "15 minutes"
 msgid "Send after 5 minutes"
 msgstr "੫ ਮਿੰਟ ਬਾਅਦ ਭੇਜੋ"
 
@@ -26033,24 +26502,21 @@ msgstr "ਭਾਸ਼ਾ"
 #, fuzzy
 #| msgid "Saving user interface state"
 msgid "Same as user interface"
-msgstr "ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਹਾਲਤ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਹਾਲਤ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
 
 #: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ, ਹਰ ਸਮੇਂ"
 
 #: ../src/modules/mail/em-mailer-prefs.c:78
-#| msgid "On exit, once per day"
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱਚ ਇਕਵਾਰ"
 
 #: ../src/modules/mail/em-mailer-prefs.c:79
-#| msgid "On exit, once per week"
 msgid "Once per week"
 msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 
 #: ../src/modules/mail/em-mailer-prefs.c:80
-#| msgid "On exit, once per month"
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
@@ -26067,16 +26533,15 @@ msgid "Contains Value"
 msgstr "ਮੁੱਲ ਰੱਖਦਾ ਹੈ"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1698
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "_Date header:"
 msgstr "ਮਿਤੀ ਹੈੱਡਰ(_D):"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1699
+#: ../src/modules/mail/em-mailer-prefs.c:1700
 msgid "Show _original header value"
 msgstr "ਅਸਲੀ ਹੈੱਡਰ ਮੁੱਲ ਵੇਖੋ(_o)"
 
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
-#| msgid "Could not change password."
 msgid "Do _not change settings"
 msgstr "ਸੈਟਿੰਗਾਂ ਨਾ ਬਦਲੋ(_n)"
 
@@ -26093,27 +26558,31 @@ msgstr "ਕੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣਾ 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
 #: ../src/modules/mdn/evolution-mdn.c:308
-#, c-format
-#| msgid "Your message to %s about \"%s\" on %s has been read."
-msgid "Your message to %s about “%s” on %s has been read."
+#, fuzzy, c-format
+#| msgid "Your message to %s about “%s” on %s has been read."
+msgid ""
+"Your message to %s about “%s” on %s has been displayed. This is no guarantee "
+"that the message has been read or understood."
 msgstr ""
 "ਤੁਹਾਡਾ %s ਵੱਲ ਸੁਨੇਹਾ ”%s” ਬਾਰੇ, ਜੋ %s ਨੂੰ ਭੇਜਿਆ ਸੀ, ਪੜ੍ਹਿਆ ਜਾ ਚੁੱਕਿਆ ਹੈ।"
 
-#. Translators: %s is the subject of the email message.
-#: ../src/modules/mdn/evolution-mdn.c:374
-#, c-format
-#| msgid "Delivery Notification for \"%s\""
-msgid "Delivery Notification for “%s”"
-msgstr "”%s” ਲਈ ਪਹੁੰਚ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਿਸ਼ੇਸ਼ਤਾ"
+#. Translators: %s is the subject of the email message This text is used as
+#. a subject of a delivery notification email (basically a notification, that
+#. the user did read (or better displayed) the message).
+#: ../src/modules/mdn/evolution-mdn.c:376
+#, fuzzy, c-format
+#| msgctxt "reply-attribution"
+#| msgid "Re: %s"
+msgid "Read: %s"
+msgstr "ਜਵਾਬ: %s"
 
-#: ../src/modules/mdn/evolution-mdn.c:540
+#: ../src/modules/mdn/evolution-mdn.c:542
 #, c-format
-#| msgid "Send a read receipt to '%s'"
 msgid "Send a read receipt to “%s”"
 msgstr "”%s” ਨੂੰ ਪੜ੍ਹਨ ਰਸੀਦ ਭੇਜੋ"
 
 #. name doesn't matter
-#: ../src/modules/mdn/evolution-mdn.c:545
+#: ../src/modules/mdn/evolution-mdn.c:547
 msgid "_Notify Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ/ਵਾਲੇ ਨੂੰ ਸੂਚਨਾ(_N)"
 
@@ -26176,19 +26645,19 @@ msgstr "ਪਲੱਗ-ਇਨ(_P)"
 msgid "Enable and disable plugins"
 msgstr "ਪਲੱਗ-ਇਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
 msgid "Display plain text version"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਵਰਜਨ ਵੇਖਾਓ"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version of multipart/alternative message"
 msgstr "ਮਲਟੀਪਾਰਟ/ਬਦਲਵੇਂ ਸੁਨੇਹੇ ਦਾ ਪਲੇਨ ਟੈਕਸਟ ਵਰਜਨ ਵੇਖਾਉ"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:146
 msgid "Display HTML version"
 msgstr "HTML ਵਰਜਨ ਵੇਖਾਓ"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version of multipart/alternative message"
 msgstr "ਮਲਟੀਪਾਰਟ/ਬਦਲਵੇਂ ਸੁਨੇਹੇ ਦਾ HTML ਵਰਜਨ ਵੇਖਾਉ"
 
@@ -26279,7 +26748,6 @@ msgstr "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇ
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
-#| msgid "Failed to write '%s' to SpamAssassin: "
 msgid "Failed to write “%s” to SpamAssassin: "
 msgstr "”%s” ਨੂੰ SpamAssassin ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ: "
 
@@ -26352,7 +26820,6 @@ msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)।"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
 #: ../src/modules/startup-wizard/e-startup-assistant.c:206
-#| msgid "Create a new mail account"
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਅਕਾਊਂਟ ਬਣਾਓ"
@@ -26365,22 +26832,26 @@ msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
 msgstr ""
 
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
-msgid "Loading accounts..."
+#, fuzzy
+#| msgid "Loading accounts..."
+msgid "Loading accounts…"
 msgstr "ਅਕਾਊਂਟ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#, fuzzy
+#| msgid "_Format as..."
+msgid "_Format as…"
 msgstr "... ਵਜੋਂ ਫਾਰਮੈਟ(_F)"
 
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "ਹੋਰ ਭਾਸ਼ਾ(_O)"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:498
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
 msgid "Text Highlight"
 msgstr "ਟੈਕਸਟ ਉਚਾਈ"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:499
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
 msgid "Syntax highlighting of mail parts"
 msgstr "ਮੇਲ ਭਾਗ ਵਿੱਚ ਸੰਟੈਕਸ ਉਭਾਰਨ"
 
@@ -26592,37 +27063,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:153
 msgid "Show F_ull vCard"
 msgstr "ਪੂਰਾ vCard ਵੇਖੋ(_u)"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:183
 msgid "Show Com_pact vCard"
 msgstr "ਸੰਖੇਪ vCard ਵੇਖੋ(_p)"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:205
 msgid "Save _To Addressbook"
 msgstr "ਐਡਰੈਸ ਬੁੱਕ ਵਿੱਚ ਸੰਭਾਲੋ(_T)"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:228
 msgid "There is one other contact."
 msgstr "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
 
 #. Translators: This will always be two or more.
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "%d ਹੋਰ ਸੰਪਰਕ ਹੈ।"
 msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:259
 msgid "Addressbook Contact"
 msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ ਸੰਪਰਕ"
 
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:260
 msgid "Display the part as an addressbook contact"
 msgstr "ਐਡਰੈਸ ਬੁੱਕ ਸੰਪਰਕ ਵਜੋਂ ਭਾਗ ਵੇਖਾਓ"
 
@@ -26666,40 +27135,40 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਯਾਦ ਕਰਵਾਉਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਮੇਲ ਸੁਨੇਹੇ ਵਿੱਚ ਕੁਝ ਅਟੈਚਮੈਂਟ ਕਰਨੀ ਭੁੱਲ ਤਾਂ"
 " ਨਹੀਂ ਗਏ।"
 
-#: ../src/plugins/bbdb/bbdb.c:756 ../src/plugins/bbdb/bbdb.c:879
+#: ../src/plugins/bbdb/bbdb.c:715 ../src/plugins/bbdb/bbdb.c:838
 #: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕ"
 
 #. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:771
+#: ../src/plugins/bbdb/bbdb.c:730
 msgid "Create _address book entries when sending mails"
 msgstr "ਪੱਤਰ ਭੇਜਣ ਸਮੇਂ ਖੁਦ ਹੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
 
 #. File Under setting
-#: ../src/plugins/bbdb/bbdb.c:782
+#: ../src/plugins/bbdb/bbdb.c:741
 msgid "Set File _under as “First Last”, instead of “Last, First”"
 msgstr ""
 
-#: ../src/plugins/bbdb/bbdb.c:793
+#: ../src/plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
-#: ../src/plugins/bbdb/bbdb.c:813
+#: ../src/plugins/bbdb/bbdb.c:772
 msgid "Instant Messaging Contacts"
 msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:828
+#: ../src/plugins/bbdb/bbdb.c:787
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਤੋਂ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਤੇ ਚਿੱਤਰ ਸੈਕਰੋਨਾਈਜ਼ ਕਰੋ(_S)"
 
-#: ../src/plugins/bbdb/bbdb.c:838
+#: ../src/plugins/bbdb/bbdb.c:797
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:854
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Synchronize with _buddy list now"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
 
@@ -26798,11 +27267,11 @@ msgstr ""
 "ਇੱਕ ਕਸਟਮ ਹੈੱਡਰ ਕੁੰਜੀ ਲਈ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ ਦਿਓ:\n"
 "ਕਸਟਮ ਹੈੱਡਰ ਕੁੰਜੀ ਮੁੱਲਾਂ ਲਈ ਨਾਂ \";\" ਨਾਲ ਵੱਖ ਕਰਕੇ ਦਿਓ।"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:861
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "ਕੀ"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
 #: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "ਮੁੱਲ"
@@ -26840,8 +27309,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "ਜਦੋਂ  ਵੀ ਨਵੀਂ ਮੇਲ ਲਿਖਣੀ ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਚਲਾਓ(_A)"
 
-#: ../src/plugins/external-editor/external-editor.c:453
 #: ../src/plugins/external-editor/external-editor.c:455
+#: ../src/plugins/external-editor/external-editor.c:457
 msgid "Compose in External Editor"
 msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖੋ"
 
@@ -26895,10 +27364,6 @@ msgstr ""
 msgid "Select a Face Picture"
 msgstr "ਮੁੱਖ ਤਸਵੀਰ ਚੁਣੋ"
 
-#: ../src/plugins/face/face.c:301
-msgid "Image files"
-msgstr "ਤਸਵੀਰ ਫਾਇਲਾਂ"
-
 #: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "ਚਿਹਰਾ ਤਸਵੀਰ ਮੂਲ ਰੂਪ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ(_I)"
@@ -27061,12 +27526,6 @@ msgid "Send e-mail message to mailing list?"
 msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#| msgid ""
-#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
-#| "the message automatically, or see and change it first.\n"
-#| "\n"
-#| "You should receive an answer from the mailing list shortly after the "
-#| "message has been sent."
 msgid ""
 "An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
@@ -27075,8 +27534,8 @@ msgid ""
 "has been sent."
 msgstr ""
 "URL ”{0}” ਨੂੰ ਈ-ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾਵੇਗਾ, ਤੁਸੀਂ ਆਟੋਮੈਟਿਕ ਸੁਨੇਹਾ ਭੇਜ ਸਕਦੇ ਹੋ,"
-" ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ "
-"ਵੇਖ ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
+" ਜਾਂ ਇਸ ਨੂੰ ਪਹਿਲਾਂ ਵੇਖ "
+"ਅਤੇ ਤਬਦੀਲ ਕਰ ਸਕਦੇ ਹੋ।\n"
 "\n"
 "ਤੁਸੀਂ ਮੇਲਿੰਗ ਸੂਚੀ ਤੇ ਭੇਜਣ ਬਾਅਦ ਤੁਰੰਤ ਜਵਾਬ ਪ੍ਰਾਪਤ ਕਰ ਲਵੋਗੇ।"
 
@@ -27201,7 +27660,6 @@ msgid "Show _notification when a new message arrives"
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਉ(_n)"
 
 #: ../src/plugins/mail-notification/mail-notification.c:1224
-#| msgid "_Account:"
 msgid "Accounts"
 msgstr "ਅਕਾਊਂਟ"
 
@@ -27210,37 +27668,31 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ਜਦੋਂ ਵੀ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਦੇਵੇ।"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:200
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ਵਲੋਂ ਮੇਲ ਰਾਹੀਂ ਬਣਾਇਆ"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:605
-#| msgid "Cancel"
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "ਰੱਦ ਕਰੋ(_C)"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:607
-#| msgid "_Edit"
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:609
-#| msgid "_New"
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "ਨਵਾਂ(_N)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:627
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
 #, c-format
-#| msgid ""
-#| "Selected calendar contains event '%s' already. Would you like to edit the "
-#| "old event?"
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
@@ -27248,11 +27700,8 @@ msgstr ""
 "ਚੁਣਿਆ ਕੈਲੰਡਰ ਵਿੱਚ ਈਵੈਂਟ ”%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੇ ਈਵੈਂਟ ਨੂੰ"
 " ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:630
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
 #, c-format
-#| msgid ""
-#| "Selected task list contains task '%s' already. Would you like to edit the "
-#| "old task?"
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
@@ -27260,11 +27709,8 @@ msgstr ""
 "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਟਾਸਕ ”%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੀ ਟਾਸਕ ਨੂੰ"
 " ਸੋਧਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:633
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
 #, c-format
-#| msgid ""
-#| "Selected memo list contains memo '%s' already. Would you like to edit the "
-#| "old memo?"
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
@@ -27274,7 +27720,7 @@ msgstr ""
 "ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:653
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -27290,7 +27736,7 @@ msgstr[1] ""
 " ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:660
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -27306,7 +27752,7 @@ msgstr[1] ""
 " ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:667
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -27321,29 +27767,29 @@ msgstr[1] ""
 "ਤੁਸੀਂ ਚੁਣੀਆਂ %d ਮੇਲਾਂ ਨੂੰ ਮੀਮੋ ਵਿੱਚ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਉਹਨਾਂ ਸਭ ਨੂੰ"
 " ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:688
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "ਕੀ ਤੁਸੀਂ ਬਾਕੀ ਮੇਲਾਂ ਨੂੰ ਬਦਲਣਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:764
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
 msgid "[No Summary]"
 msgstr "[ਸੰਖੇਪ ਨਹੀਂ]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:777
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
 msgid "Invalid object returned from a server"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਆਬਜੈਕਟ ਵਾਪਸ ਮਿਲਿਆ"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:831
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ਪਰੋਸੈਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:869
+#: ../src/plugins/mail-to-task/mail-to-task.c:877
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:873
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -27351,7 +27797,7 @@ msgstr ""
 "ਚੁਣਿਆ ਕੈਲੰਡਰ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਈਵੈਂਟ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਕੈਲੰਡਰ ਚੁਣੋ"
 " ਜੀ।"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:876
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -27359,7 +27805,7 @@ msgstr ""
 "ਚੁਣੀ ਕੰਮ ਸੂਚੀ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਕੰਮ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਕੰਮ-ਸੂਚੀ"
 " ਚੁਣੋ ਜੀ।"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:879
+#: ../src/plugins/mail-to-task/mail-to-task.c:887
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -27367,35 +27813,35 @@ msgstr ""
 "ਚੁਣੀ ਮੀਮੋ ਸੂਚੀ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਮੀਮੋ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਮੀਮੋ ਸੂਚੀ"
 " ਚੁਣੋ ਜੀ।"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1328
 msgid "Create an _Appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ(_A)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1303
+#: ../src/plugins/mail-to-task/mail-to-task.c:1330
 msgid "Create a new event from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਈਵੈਂਟ ਬਣਾਓ"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1335
 msgid "Create a Mem_o"
 msgstr "ਮੀਮੋ ਬਣਾਓ(_o)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1310
+#: ../src/plugins/mail-to-task/mail-to-task.c:1337
 msgid "Create a new memo from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1342
 msgid "Create a _Task"
 msgstr "ਟਾਸਕ ਬਣਾਓ(_T)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1317
+#: ../src/plugins/mail-to-task/mail-to-task.c:1344
 msgid "Create a new task from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਟਾਸਕ ਬਣਾਓ"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1352
 msgid "Create a _Meeting"
 msgstr "ਮੀਟਿੰਗ ਬਣਾਓ(_M)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1327
+#: ../src/plugins/mail-to-task/mail-to-task.c:1354
 msgid "Create a new meeting from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
 
@@ -27496,7 +27942,6 @@ msgid "iCal"
 msgstr "iCal"
 
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
-#| msgid "Free/Busy Reply"
 msgid "Free/Busy with Details"
 msgstr "ਵੇਰਵਿਆਂ ਨਾਲ ਵੇਹਲਾ/ਰੁਝਵਾਂ"
 
@@ -27568,10 +28013,6 @@ msgstr "ਫਾਇਲ(_F):"
 msgid "P_ort:"
 msgstr "ਪੋਰਟ(_o):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
-
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "ਪਰਕਾਸ਼ਣ ਟਿਕਾਣਾ"
@@ -27579,7 +28020,6 @@ msgstr "ਪਰਕਾਸ਼ਣ ਟਿਕਾਣਾ"
 #: ../src/plugins/publish-calendar/publish-format-fb.c:83
 #: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
-#| msgid "Invalid source UID '%s'"
 msgid "Invalid source UID “%s”"
 msgstr "ਗਲਤ ਸਰੋਤ UID ”%s”"
 
@@ -27594,75 +28034,75 @@ msgstr "ਟਿਕਾਣਾ ਸੋਧ"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "ਵੇਰਵਾ ਲਿਸਟ"
 
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ"
 
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "ਟਿੱਪਣੀ ਲਿਸਟ"
 
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
 
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "ਦਰਸ਼ਕ ਲਿਸਟ"
 
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "ਸੋਧਿਆ"
 
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ(_d)"
 
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
 msgid "Prepend a _header"
 msgstr "ਹੈੱਡਰ ਅੱਗੇ ਜੋੜੋ(_h)"
 
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
 msgid "_Value delimiter:"
 msgstr "ਮੁੱਲ ਸੀਮਾ(_V):"
 
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
 msgid "_Record delimiter:"
 msgstr "ਰਿਕਾਰਡ ਸੀਮਾ(_R):"
 
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
 msgid "_Encapsulate values with:"
 msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ(_E):"
 
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
 msgid "Comma separated values (.csv)"
 msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੇ ਮੁੱਲ(.csv)"
 
@@ -27688,7 +28128,7 @@ msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਜਾਂ ਟਾਸਕ ਲਿਸਟ ਨ
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -27701,7 +28141,6 @@ msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚੁਣੋ"
 
 #: ../src/plugins/save-calendar/save-calendar.c:186
-#| msgid "_Save As..."
 msgid "_Save As"
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(_S)"
 
@@ -27735,7 +28174,6 @@ msgstr ""
 "ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../src/plugins/templates/templates.c:878
-#| msgid "Saving message to Outbox."
 msgid "Saving message template"
 msgstr ""
 
@@ -27748,11 +28186,15 @@ msgid "Save as Template"
 msgstr "ਟੈਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
+#, fuzzy
+#| msgid "Preparing to go offline..."
+msgid "Preparing to go offline…"
 msgstr "ਆਫਲਾਈਨ ਜਾਣ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../src/shell/e-shell.c:408
-msgid "Preparing to go online..."
+#, fuzzy
+#| msgid "Preparing to go online..."
+msgid "Preparing to go online…"
 msgstr "ਆਨਲਾਈਨ ਜਾਣ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../src/shell/e-shell.c:519
@@ -27760,31 +28202,19 @@ msgid "Preparing to quit"
 msgstr "ਬੰਦ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
-msgstr "ਬੰਦ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#, fuzzy
+#| msgid "Preparing to quit"
+msgid "Preparing to quit…"
+msgstr "ਬੰਦ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/shell/e-shell.c:1074
-#| msgid "Junk Settings"
+#: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
 msgstr "ਸੈਟਿੰਗਾਂ ਖੋਲ੍ਹੋ(_S)"
 
-#: ../src/shell/e-shell.c:1281
+#: ../src/shell/e-shell.c:1297
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
-#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:873
-msgid "New _Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
-
-#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:803
-msgid "_About"
-msgstr "ਇਸ ਬਾਰੇ(_A)"
-
-#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:901
-#| msgid "Quit"
-msgid "_Quit"
-msgstr "ਬੰਦ ਕਰੋ(_Q)"
-
 #: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
 msgid "Searches"
 msgstr "ਖੋਜ"
@@ -27803,13 +28233,13 @@ msgstr "ਵੇਖੋ(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:950
+#: ../src/shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "ਖੋਜ(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1018
+#: ../src/shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr " ਅੰਦਰ(_n)"
 
@@ -27832,334 +28262,352 @@ msgstr ""
 "http://www.satluj.org/";
 
 #: ../src/shell/e-shell-utils.c:354
-msgid "Evolution Website"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
+msgid "Website"
+msgstr ""
 
 #: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
-msgstr "ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਹਾਲਤ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਹਾਲਤ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/shell/e-shell-window-actions.c:293
+#: ../src/shell/e-shell-window-actions.c:351
 msgid "Categories Editor"
 msgstr "ਕੈਟਾਗਰੀ ਐਡੀਟਰ"
 
-#: ../src/shell/e-shell-window-actions.c:596
+#: ../src/shell/e-shell-window-actions.c:654
 msgid "Bug Buddy is not installed."
 msgstr "ਬੱਗ ਬੱਡੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../src/shell/e-shell-window-actions.c:597
+#: ../src/shell/e-shell-window-actions.c:655
 msgid "Bug Buddy could not be run."
 msgstr "ਬੱਗ ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../src/shell/e-shell-window-actions.c:793
+#: ../src/shell/e-shell-window-actions.c:851
 #, fuzzy
 #| msgid "Collection"
 msgid "Collect_ion Account"
 msgstr "ਭੰਡਾਰ"
 
-#: ../src/shell/e-shell-window-actions.c:795
+#: ../src/shell/e-shell-window-actions.c:853
 #, fuzzy
 #| msgid "Create a new mail account"
 msgid "Create a new collection account"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਅਕਾਊਂਟ ਬਣਾਓ"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:861
+msgid "_About"
+msgstr "ਇਸ ਬਾਰੇ(_A)"
+
+#: ../src/shell/e-shell-window-actions.c:863
 msgid "Show information about Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:810
-#| msgid "_Account:"
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "_Accounts"
 msgstr "ਅਕਾਊਂਟ(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:812
-#| msgid "Configure Evolution"
+#: ../src/shell/e-shell-window-actions.c:870
 msgid "Configure Evolution Accounts"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਖਾਤਾ ਸੰਰਚਨਾ"
 
-#: ../src/shell/e-shell-window-actions.c:817
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "_Close Window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/shell/e-shell-window-actions.c:898
 msgid "Open the Evolution User Guide"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਯੂਜ਼ਰ ਗਾਈਡ ਖੋਲ੍ਹੋ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਰਤੋਂਕਾਰ ਗਾਈਡ ਖੋਲ੍ਹੋ"
 
-#: ../src/shell/e-shell-window-actions.c:866
-msgid "I_mport..."
-msgstr "ਇੰਪੋਰਟ ਕਰੋ(_m)..."
+#: ../src/shell/e-shell-window-actions.c:924
+#, fuzzy
+#| msgid "I_mport"
+msgid "I_mport…"
+msgstr "ਇੰਪੋਰਟ(_m)"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:926
 msgid "Import data from other programs"
 msgstr "ਹੋਰ ਕਾਰਜਾਂ ਤੋਂ ਡਾਟਾ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:931
+msgid "New _Window"
+msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
+
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "Create a new window displaying this view"
 msgstr "ਇਸ ਝਲਕ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਨਵੀਂ ਵਿੰਡੋ ਬਣਾਓ"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Available Cate_gories"
 msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_g)"
 
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "Manage available categories"
 msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ ਪਰਬੰਧ"
 
-#: ../src/shell/e-shell-window-actions.c:903
+#: ../src/shell/e-shell-window-actions.c:959
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: ../src/shell/e-shell-window-actions.c:961
 msgid "Exit the program"
 msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ"
 
-#: ../src/shell/e-shell-window-actions.c:908
-msgid "_Advanced Search..."
-msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
+#: ../src/shell/e-shell-window-actions.c:966
+#, fuzzy
+#| msgid "Advanced Search"
+msgid "_Advanced Search…"
+msgstr "ਤਕਨੀਕੀ ਖੋਜ"
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:968
 msgid "Construct a more advanced search"
 msgstr "ਹੋਰ ਵੀ ਤਕਨੀਕੀ ਖੋਜ ਬਣਾਓ"
 
-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "Clear the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਸਾਫ਼ ਕਰੋ"
 
-#: ../src/shell/e-shell-window-actions.c:922
-msgid "_Edit Saved Searches..."
+#: ../src/shell/e-shell-window-actions.c:980
+#, fuzzy
+#| msgid "_Edit Saved Searches..."
+msgid "_Edit Saved Searches…"
 msgstr "ਸੰਭਾਲੀ ਖੋਜ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:982
 msgid "Manage your saved searches"
 msgstr "ਆਪਣੀ ਸੰਭਾਲੀ ਖੋਜ ਦਾ ਪਰਬੰਧ ਕਰੋ"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Click here to change the search type"
 msgstr "ਖੋਜ ਟਾਈਪ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:994
 msgid "_Find Now"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "Execute the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਚਲਾਓ"
 
-#: ../src/shell/e-shell-window-actions.c:943
-msgid "_Save Search..."
-msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
+#: ../src/shell/e-shell-window-actions.c:1001
+#, fuzzy
+#| msgid "Save Search"
+msgid "_Save Search…"
+msgstr "ਖੋਜ ਸੰਭਾਲੋ"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "Save the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਸੰਭਾਲੋ"
 
-#: ../src/shell/e-shell-window-actions.c:957
-msgid "Submit _Bug Report..."
-msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ(_B)..."
+#: ../src/shell/e-shell-window-actions.c:1015
+#, fuzzy
+#| msgid "_Forward Contacts"
+msgid "_Keyboard Shortcuts"
+msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
+
+#: ../src/shell/e-shell-window-actions.c:1017
+#, fuzzy
+#| msgid "Show Evolution's shortcut keys"
+msgid "Show keyboard shortcuts"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:1022
+#, fuzzy
+#| msgid "Submit Bug Report"
+msgid "Submit _Bug Report…"
+msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ"
+
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱਗ ਬੱਡੀ ਵਰਤ ਕੇ ਬੱਗ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell-window-actions.c:1029
 msgid "_Work Offline"
 msgstr "ਆਫ਼-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "Put Evolution into offline mode"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:1036
 msgid "_Work Online"
 msgstr "ਆਨ-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "Put Evolution into online mode"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਨਲਾਈਨ ਮੋਡ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Lay_out"
 msgstr "ਲੇਆਉਟ(_o)"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "_New"
 msgstr "ਨਵਾਂ(_N)"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1081
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1088
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱਚਰ ਦਿੱਖ(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1102
 msgid "_Window"
 msgstr "ਵਿੰਡੋ(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1131
 #, fuzzy
 #| msgid "Show _Status Bar"
 msgid "Show _Menu Bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1133
 #, fuzzy
 #| msgid "Show the side bar"
 msgid "Show the menu bar"
 msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "Show Side _Bar"
 msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1141
 msgid "Show the side bar"
 msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1147
 msgid "Show _Buttons"
 msgstr "ਬਟਨ ਵੇਖੋ(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Show the switcher buttons"
 msgstr "ਸਵਿੱਚਰ ਬਟਨ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1090
+#: ../src/shell/e-shell-window-actions.c:1155
 msgid "Show _Status Bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1157
 msgid "Show the status bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1163
 msgid "Show _Tool Bar"
 msgstr "ਟੂਲਬਾਰ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1165
 msgid "Show the tool bar"
 msgstr "ਟੂਲਬਾਰ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1187
 msgid "_Icons Only"
 msgstr "ਆਈਕਾਨ ਹੀ(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Display window buttons with icons only"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਨਾਲ ਆਈਕਾਨ ਹੀ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1129
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "_Text Only"
 msgstr "ਸਿਰਫ਼ ਟੈਕਸਟ(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1196
 msgid "Display window buttons with text only"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਨਾਲ ਟੈਕਸਟ ਹੀ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1136
+#: ../src/shell/e-shell-window-actions.c:1201
 msgid "Icons _and Text"
 msgstr "ਆਈਕਾਨ ਅਤੇ ਟੈਕਸਟ(_a)"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1203
 msgid "Display window buttons with icons and text"
 msgstr "ਵਿੰਡੋ ਬਟਨਾਂ ਨਾਲ ਆਈਕਾਨ ਅਤੇ ਟੈਕਸਟ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1208
 msgid "Tool_bar Style"
 msgstr "ਟੂਲਬਾਰ ਸਟਾਈਲ(_b)"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1210
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਡੈਸਕਟਾਪ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਨਾਲ ਵੇਖੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/shell/e-shell-window-actions.c:1218
 msgid "Delete Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਹਟਾਓ"
 
-#: ../src/shell/e-shell-window-actions.c:1160
-msgid "Save Custom View..."
-msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ..."
+#: ../src/shell/e-shell-window-actions.c:1225
+#, fuzzy
+#| msgid "Save Custom View"
+msgid "Save Custom View…"
+msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1227
 msgid "Save current custom view"
 msgstr "ਮੌਜੂਦਾ ਕਸਟਮਾਈਜ਼ ਵਿਊ ਸੰਭਾਲੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1169
+#: ../src/shell/e-shell-window-actions.c:1241
 msgid "C_urrent View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_u)"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1251
 msgid "Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1253
 msgid "Current view is a customized view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਇੱਕ ਕਸਟਮਾਈਜ਼ ਝਲਕ ਹੈ"
 
-#: ../src/shell/e-shell-window-actions.c:1189
-msgid "Page Set_up..."
-msgstr "ਸਫ਼ਾ ਸੈੱਟਅੱਪ(_u)..."
+#: ../src/shell/e-shell-window-actions.c:1261
+#, fuzzy
+#| msgid "Page Setup:"
+msgid "Page Set_up…"
+msgstr "ਸਫ਼ਾ ਨਿਰਧਾਰਨ:"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1263
 msgid "Change the page settings for your current printer"
 msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫ਼ਾ ਸੈਟਿੰਗ ਬਦਲੋ"
 
-#: ../src/shell/e-shell-window-actions.c:1561
+#: ../src/shell/e-shell-window-actions.c:1633
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
-#: ../src/shell/e-shell-window-actions.c:1684
+#: ../src/shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "ਝਲਕ ਚੁਣੋ: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1701
+#: ../src/shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "ਝਲਕ ਹਟਾਓ: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1805
+#: ../src/shell/e-shell-window-actions.c:1884
 msgid "Execute these search parameters"
 msgstr "ਇਹ ਖੋਜ ਪੈਰਾਮੀਟਰ ਚਲਾਓ"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../src/shell/e-shell-window.c:563
-#| msgid "New"
+#: ../src/shell/e-shell-window.c:514
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:787
+#: ../src/shell/e-shell-window-private.c:786
 #, c-format
-#| msgid "%s - Evolution"
 msgid "%s — Evolution"
 msgstr "%s — ਈਵੇਲੂਸ਼ਨ"
 
 #. Preview/Alpha/Beta version warning message
 #: ../src/shell/main.c:192
 #, no-c-format
-#| msgid ""
-#| "Hi.  Thanks for taking the time to download this preview release\n"
-#| "of the Evolution groupware suite.\n"
-#| "\n"
-#| "This version of Evolution is not yet complete. It is getting close,\n"
-#| "but some features are either unfinished or do not work properly.\n"
-#| "\n"
-#| "If you want a stable version of Evolution, we urge you to uninstall\n"
-#| "this version, and install version %s instead.\n"
-#| "\n"
-#| "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
-#| "This product comes with no warranty and is not intended for\n"
-#| "individuals prone to violent fits of anger.\n"
-#| "\n"
-#| "We hope that you enjoy the results of our hard work, and we\n"
-#| "eagerly await your contributions!\n"
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -28187,7 +28635,8 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦਾ ਸਥਿਰ ਵਰਜਨ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇਸ ਦਾ ਇਹ\n"
 "ਵਰਜਨ ਹਟਾਉਣਾ ਪਵੇਗਾ ਅਤੇ ਇਸ ਦੀ ਬਜਾਏ %s ਵਰਜਨ ਇੰਸਟਾਲ ਕਰੋ।\n"
 "\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਬੱਗ ਲੱਭ ਲਿਆ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦੀ ਸੂਚਨਾ\n\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਬੱਗ ਲੱਭ ਲਿਆ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦੀ ਸੂਚਨਾ\n"
+"\n"
 "https://gitlab.gnome.org/GNOME/evolution/issues/\n";
 "ਤੇ ਦਿਓ। ਇਹ ਉਤਾਪਦ ਬਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ ਦੇ ਹੈ ਅਤੇ ਕਿਸੇ ਦੇ ਗੁੱਸੇ ਲਈ ਜਿੰਮਵਾਰ\n"
 "ਨਹੀਂ ਹੈ।\n"
@@ -28209,7 +28658,7 @@ msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:312
+#: ../src/shell/main.c:325
 #, fuzzy
 #| msgid ""
 #| "Start Evolution showing the specified component. Available options are "
@@ -28222,39 +28671,39 @@ msgstr ""
 " 'calendar(ਕੈਲੰਡਰ)', "
 "'contacts(ਸੰਪਰਕ)', 'tasks(ਟਾਸਕ)', ਅਤੇ 'memos(ਮੀਮੋ)'"
 
-#: ../src/shell/main.c:316
+#: ../src/shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "ਦਿੱਤੀ ਜੁਮੈਟਰੀ ਮੁੱਖ ਵਿੰਡੋ ਉੱਤੇ ਲਾਗੂ ਕਰੋ"
 
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:333
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:335
 msgid "Ignore network availability"
 msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਅਣਡਿੱਠੀ ਕਰੋ"
 
-#: ../src/shell/main.c:325
+#: ../src/shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਧੱਕੇ ਨਾਲ ਬੰਦ ਕਰੋ"
 
-#: ../src/shell/main.c:328
+#: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਕੰਮ ਲਈ ਝਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
 
-#: ../src/shell/main.c:334
+#: ../src/shell/main.c:347
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "URI ਜਾਂ ਬਾਕੀ ਦੇ ਆਰਗੂਮੈਂਟ ਵਜੋਂ ਦਿੱਤੇ ਫਾਇਲ-ਨਾਂ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:349
 msgid "Request a running Evolution process to quit"
 msgstr "ਚੱਲਦੇ ਈਵੇਲਸ਼ਨ ਪਰੋਸੈਸ ਨੂੰ ਬੰਦ ਕਰਨ ਦੀ ਮੰਗ"
 
-#: ../src/shell/main.c:418
+#: ../src/shell/main.c:431
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -28263,12 +28712,11 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਹੋਰ ਈਵੇਲੂਸ਼ਨ ਮੌਕਾ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ। ਸਿਸਟਮ"
 " ਗਲਤੀ: %s"
 
-#: ../src/shell/main.c:474 ../src/shell/main.c:479
-#| msgid "- The Evolution PIM and Email Client"
+#: ../src/shell/main.c:493 ../src/shell/main.c:498
 msgid "— The Evolution PIM and Email Client"
 msgstr "— ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: ../src/shell/main.c:541
+#: ../src/shell/main.c:554
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -28280,7 +28728,7 @@ msgstr ""
 "%s: --online ਅਤੇ --offline ਇੱਕ ਸਮੇਂ ਨਹੀਂ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।\n"
 " ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ  '%s --help' ਚਲਾਓ।\n"
 
-#: ../src/shell/main.c:547
+#: ../src/shell/main.c:560
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --force-online and --offline cannot be used together.\n"
@@ -28292,6 +28740,10 @@ msgstr ""
 "%s: --force-online ਅਤੇ --offline ਇੱਕ ਸਮੇਂ ਨਹੀਂ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।\n"
 " ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ '%s --help' ਚਲਾਓ।\n"
 
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
+
 #: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "ਪੁਰਾਣੇ ਵਰਜਨ ਉੱਤੇ ਅੱਪਗਰੇਡ ਫੇਲ੍ਹ:"
@@ -28343,12 +28795,10 @@ msgid ""
 msgstr ""
 
 #: ../src/shell/shell.error.xml.h:13
-#| msgid "Choose Image"
 msgid "_Close Immediately"
 msgstr "ਤੁਰੰਤ ਬੰਦ ਕਰੋ(_C)"
 
 #: ../src/shell/shell.error.xml.h:14
-#| msgid "Waiting..."
 msgid "Keep _Waiting"
 msgstr "ਉਡੀਕ ਕਰੋ(_W)"
 
@@ -28376,27 +28826,22 @@ msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ(_R)"
 
 #  addressbook:load-error title
 #: ../src/shell/shell.error.xml.h:19
-#| msgid "Unable to open address book"
 msgid "Failed to connect address book “{0}”"
 msgstr "“{0}” ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"
 
 #: ../src/shell/shell.error.xml.h:20
-#| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to connect calendar “{0}”"
 msgstr "ਈਵੈਂਟ ਨੂੰ ਕੈਲੰਡਰ “{0}“  ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #: ../src/shell/shell.error.xml.h:21
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
 msgid "Failed to connect mail account “{0}”"
 msgstr "“{0}“ ਅਕਾਊਂਟ ਨਾਲ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
 #: ../src/shell/shell.error.xml.h:22
-#| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to connect memo list “{0}”"
 msgstr "ਮੀਮੋ ਨੂੰ “{0}” ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #: ../src/shell/shell.error.xml.h:23
-#| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to connect task list “{0}”"
 msgstr "ਕੰਮ ਨੂੰ “{0}” ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
@@ -28416,6 +28861,10 @@ msgstr ""
 msgid "Reason: {1}"
 msgstr ""
 
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
+
 #: ../src/shell/shell.error.xml.h:29
 msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr ""
@@ -28452,10 +28901,6 @@ msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ(_B)"
 
 #: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
-#| msgid ""
-#| "Certificate '%s' is a CA certificate.\n"
-#| "\n"
-#| "Edit trust settings:"
 msgid ""
 "Certificate “%s” is a CA certificate.\n"
 "\n"
@@ -28541,8 +28986,10 @@ msgid "Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
 
 #: ../src/smime/gui/certificate-manager.c:648
-msgid "Select a file to backup your key and certificate..."
-msgstr ""
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Select a file to backup your key and certificate…"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
@@ -28555,21 +29002,20 @@ msgid "%s-backup.p12"
 msgstr ""
 
 #: ../src/smime/gui/certificate-manager.c:721
-#| msgid "Certificate"
 msgid "Backup Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੈਕਅੱਪ"
 
 #. filename selection
 #: ../src/smime/gui/certificate-manager.c:736
-#| msgid "_Filename:"
 msgid "_File name:"
 msgstr "ਫਾਇਲ ਨਾਂ(_F):"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../src/smime/gui/certificate-manager.c:741
-#| msgid "Please select a folder"
-msgid "Please select a file..."
+#, fuzzy
+#| msgid "Please select a file..."
+msgid "Please select a file…"
 msgstr "ਫਾਇਲ ਚੁਣੋ ਜੀ..."
 
 #: ../src/smime/gui/certificate-manager.c:755
@@ -28585,7 +29031,6 @@ msgid ""
 msgstr ""
 
 #: ../src/smime/gui/certificate-manager.c:780
-#| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "ਪਾਸਵਰਡ ਦੁਹਰਾਓ(_R):"
 
@@ -28615,7 +29060,9 @@ msgid "Failed to backup key and certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #: ../src/smime/gui/certificate-manager.c:948
-msgid "Select a certificate to import..."
+#, fuzzy
+#| msgid "Select a certificate to import..."
+msgid "Select a certificate to import…"
 msgstr "ਅਯਾਤ ਕਰਨ ਲਈ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..."
 
 #: ../src/smime/gui/certificate-manager.c:997
@@ -28628,13 +29075,11 @@ msgid "Ask when used"
 msgstr ""
 
 #: ../src/smime/gui/certificate-manager.c:1116
-#| msgid "Never"
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
 #: ../src/smime/gui/certificate-manager.c:1118
-#| msgid "Margins"
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "ਹਾਸ਼ੀਆ"
@@ -28715,7 +29160,6 @@ msgstr ""
 "ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
 
 #: ../src/smime/gui/certificate-manager.c:1390
-#| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਿਖਾਓ(_D)"
 
@@ -28727,7 +29171,6 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਫਾਇਲ ਤੇ ਸਰਟੀਫਿਕੇਟ ਹੋਣੇ ਹਨ, ਜੋ ਕਿ ਇਹਨਾਂ ਲੋਕਾਂ ਦੀ ਪਛਾਣ ਕਰਦੇ ਹਨ:"
 
 #: ../src/smime/gui/certificate-manager.c:1626
-#| msgid "_List name:"
 msgid "Host name"
 msgstr "ਹੋਸਟ ਨਾਂ"
 
@@ -28736,7 +29179,6 @@ msgid "Issuer"
 msgstr "ਜਾਰੀ ਕਰਤਾ"
 
 #: ../src/smime/gui/certificate-manager.c:1629
-#| msgid "Fingerprints"
 msgid "Fingerprint"
 msgstr "ਫਿੰਗਰਪਰਿੰਟ"
 
@@ -28745,7 +29187,6 @@ msgid "Trust"
 msgstr ""
 
 #: ../src/smime/gui/certificate-manager.c:1651
-#| msgid "_Edit CA Trust"
 msgid "_Edit Trust"
 msgstr "ਭਰੋਸਾ ਸੋਧ(_E)"
 
@@ -28783,13 +29224,11 @@ msgstr ""
 
 #: ../src/smime/gui/component.c:53
 #, c-format
-#| msgid "Enter the password for '%s', token '%s'"
 msgid "Enter the password for “%s”, token “%s”"
 msgstr "”%s” , ”%s” ਟੋਕਨ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
 #: ../src/smime/gui/component.c:55
 #, c-format
-#| msgid "Enter the password for '%s'"
 msgid "Enter the password for “%s”"
 msgstr "”%s” ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
@@ -28859,7 +29298,7 @@ msgstr "ਇਸ CA ਉੱਤੇ ਵੈੱਬ-ਸਾਇਟਾਂ ਲਈ ਭਰੋ
 
 #: ../src/smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _email users."
-msgstr "ਇਸ CA ਤੇ ਈ-ਮੇਲ ਯੂਜ਼ਰਾਂ ਦੀ ਪਛਾਣ ਲਈ ਭਰੋਸਾ ਰੱਖੋ।(_e)"
+msgstr "ਇਸ CA ਤੇ ਈ-ਮੇਲ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਪਛਾਣ ਲਈ ਭਰੋਸਾ ਰੱਖੋ।(_e)"
 
 #: ../src/smime/gui/smime-ui.ui.h:21
 msgid "Trust this CA to identify _software developers."
@@ -28891,16 +29330,15 @@ msgid "Do not trust the authenticity of this certificate"
 msgstr "ਇਸ ਸਰਟੀਫਿਕੇਟ ਦੀ ਪਰ੍ਮਾਣਕਿਤਾ ਤੇ ਭਰੋਸਾ ਨਾ ਕਰੋ"
 
 #: ../src/smime/gui/smime-ui.ui.h:29
-#| msgid "Certificate"
 msgid "C_ertificate:"
 msgstr "ਸਰਟੀਫਿਕੇਟ(_e):"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:400
+#: ../src/smime/lib/e-cert.c:402
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: ../src/smime/lib/e-cert.c:401
+#: ../src/smime/lib/e-cert.c:403
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
@@ -28950,6 +29388,295 @@ msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਗਲਤ
 msgid "Imported Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d ਹਫਤਾ"
+#~ msgstr[1] "%d ਹਫਤਾ"
+
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "ਕੋਈ ਨਹੀਂ"
+
+#~ msgid "_Attachment..."
+#~ msgstr "ਨੱਥੀ(_A)..."
+
+#~| msgid "Atte_ndees..."
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "ਦਰਸ਼ਕ(_n)..."
+
+#~| msgid "%d day ago"
+#~| msgid_plural "%d days ago"
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
+#~ msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
+
+#~| msgid "%d hour before appointment"
+#~| msgid_plural "%d hours before appointment"
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
+#~ msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
+
+#~| msgid "%d minute before appointment"
+#~| msgid_plural "%d minutes before appointment"
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
+#~ msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
+
+#~| msgid "15 minutes"
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "੧੫ ਮਿੰਟ ਪਹਿਲਾਂ"
+
+#~| msgid "1 hour ago"
+#~| msgid_plural "%d hours ago"
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "੧ ਘੰਟਾ ਪਹਿਲਾਂ"
+
+#~| msgid "is before"
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "੧ ਦਿਨ ਪਹਿਲਾਂ"
+
+#~| msgid "Ca_tegories..."
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "ਕੈਟਾਗਰੀ(_C)..."
+
+#~| msgid "Not Started"
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
+
+#~| msgid "In Progress"
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
+
+#~| msgid "Completed"
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "ਸਮਾਪਤ"
+
+#~| msgid "Cancelled"
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "ਰੱਦ ਕੀਤਾ"
+
+#~| msgid "_Save Changes"
+#~ msgid "Saving changes..."
+#~ msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ..."
+
+#~ msgid "_Print..."
+#~ msgstr "ਪਰਿੰਟ ਕਰੋ(_P)..."
+
+#~| msgid "Preview"
+#~ msgid "Pre_view..."
+#~ msgstr "ਝਲਕ(_v)..."
+
+#~ msgid "Select..."
+#~ msgstr "ਚੁਣੋ..."
+
+#~ msgid "Attendee                          "
+#~ msgstr "ਦਰਸ਼ਕ                          "
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "ਦਰਸ਼ਕ(_N)..."
+
+#~ msgid "New _Appointment..."
+#~ msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)..."
+
+#~ msgid "New _Meeting..."
+#~ msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)..."
+
+#~| msgid "New _Task"
+#~ msgid "New _Task..."
+#~ msgstr "ਨਵਾਂ ਕੰਮ(_T)..."
+
+#~| msgid "_Open"
+#~ msgid "_Open..."
+#~ msgstr "ਖੋਲ੍ਹੋ(_O)..."
+
+#~| msgid "_Delete"
+#~ msgid "_Delete..."
+#~ msgstr "ਹਟਾਓ(_D)..."
+
+#~ msgid "Save as..."
+#~ msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+
+#~ msgid "Save _As..."
+#~ msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)..."
+
+#~ msgid "This certificate is not viewable"
+#~ msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਲ(_d)..."
+
+#~ msgid "Other..."
+#~ msgstr "ਹੋਰ..."
+
+#, fuzzy
+#~| msgid "Image files"
+#~ msgid "Image file"
+#~ msgstr "ਤਸਵੀਰ ਫਾਇਲਾਂ"
+
+#, fuzzy
+#~| msgid "_Find in Memo..."
+#~ msgid "_Find..."
+#~ msgstr "ਮੀਮੋ 'ਚ ਖੋਜ(_F)..."
+
+#, fuzzy
+#~| msgid "_Replace"
+#~ msgid "Re_place..."
+#~ msgstr "ਬਦਲੋ(_R)"
+
+#~| msgid "Save _Image..."
+#~ msgid "_Image..."
+#~ msgstr "ਚਿੱਤਰ(_I)..."
+
+#, fuzzy
+#~| msgid "_Rename..."
+#~ msgid "_Rule..."
+#~ msgstr "ਨਾਂ ਬਦਲੋ(_R)..."
+
+#~| msgid "Table"
+#~ msgid "_Table..."
+#~ msgstr "ਟੇਬਲ(_ T)..."
+
+#~| msgid "Image"
+#~ msgid "Image..."
+#~ msgstr "ਚਿੱਤਰ..."
+
+#~| msgid "Pager"
+#~ msgid "Page..."
+#~ msgstr "ਸਫ਼ਾ..."
+
+#, fuzzy
+#~| msgid "Full _Name..."
+#~ msgid "Rule..."
+#~ msgstr "ਪੂਰਾ ਨਾਂ(_N)..."
+
+#~| msgid "Table"
+#~ msgid "Table..."
+#~ msgstr "ਟੇਬਲ..."
+
+#~| msgid "Text"
+#~ msgid "Text..."
+#~ msgstr "ਲਿਖਤ..."
+
+#~ msgid "More..."
+#~ msgstr "...ਹੋਰ"
+
+#~ msgid "Add a C_olumn..."
+#~ msgstr "ਕਾਲਮ ਸ਼ਾਮਲ(_O)..."
+
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ(_m)..."
+
+#~ msgid "Save _Image..."
+#~ msgstr "ਚਿੱਤਰ ਇੰਝ ਸੰਭਾਲੋ(_I)..."
+
+#, fuzzy
+#~| msgid "Formatting Message..."
+#~ msgid "Storing changes..."
+#~ msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#, fuzzy
+#~| msgid "Retrieving Message..."
+#~ msgid "Retrieving message..."
+#~ msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ(_C)..."
+
+#~ msgid "_Find in Message..."
+#~ msgstr "ਸੁਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
+
+#~ msgid "Follow _Up..."
+#~ msgstr "ਅੱਗੇ ਖੋਲ੍ਹੋ(_U)..."
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
+
+#~ msgid "Loading..."
+#~ msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
+
+#~ msgid "Security Information"
+#~ msgstr "ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"
+
+#~ msgid "_Rename..."
+#~ msgstr "ਨਾਂ ਬਦਲੋ(_R)..."
+
+#~ msgid "_Forward Contact..."
+#~ msgstr "ਸੰਪਰਕ ਨੂੰ ਅੱਗੇ ਭੇਜੋ(_F)..."
+
+#~ msgid "_New Contact..."
+#~ msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
+
+#~ msgid "New Contact _List..."
+#~ msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ(_L)..."
+
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
+
+#~ msgid "_Save as vCard..."
+#~ msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)...."
+
+#~ msgid "_Copy..."
+#~ msgstr "ਕਾਪੀ ਕਰੋ(_C)..."
+
+#~ msgid "New All Day _Event..."
+#~ msgstr "ਨਵਾਂ ਸਾਰੇ ਦਿਨ ਦਾ ਈਵੈਂਟ(_E)..."
+
+#~| msgid "_Print..."
+#~ msgid "Print..."
+#~ msgstr "ਪਰਿੰਟ ਕਰੋ..."
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "iCalendar ਵਜੋਂ ਸੰਭਾਲੋ(_S)..."
+
+#~ msgid "_Copy Folder To..."
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_C)..."
+
+#~ msgid "_Move Folder To..."
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
+
+#~ msgid "_New..."
+#~ msgstr "ਨਵਾਂ(_N)..."
+
+#~| msgid "Delivery Notification for \"%s\""
+#~ msgid "Delivery Notification for “%s”"
+#~ msgstr "”%s” ਲਈ ਪਹੁੰਚ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਿਸ਼ੇਸ਼ਤਾ"
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "ਬੰਦ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "Evolution Website"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
+
+#~ msgid "I_mport..."
+#~ msgstr "ਇੰਪੋਰਟ ਕਰੋ(_m)..."
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
+
+#~ msgid "_Save Search..."
+#~ msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
+
+#~ msgid "Submit _Bug Report..."
+#~ msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ(_B)..."
+
+#~ msgid "Save Custom View..."
+#~ msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ..."
+
+#~ msgid "Page Set_up..."
+#~ msgstr "ਸਫ਼ਾ ਸੈੱਟਅੱਪ(_u)..."
+
 #~ msgid ""
 #~ "Check to make sure your password is spelled correctly and that you are "
 #~ "using a supported login method. Remember that many passwords are case "
@@ -29250,9 +29977,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "_Delegatees"
 #~ msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#~ msgid "Atte_ndees"
-#~ msgstr "ਦਰਸ਼ਕ(_N)"
-
 #~ msgid "%d day before appointment"
 #~ msgid_plural "%d days before appointment"
 #~ msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
@@ -29660,9 +30384,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "_Quick Reference"
 #~ msgstr "ਤੁਰੰਤ ਹਵਾਲਾ(_Q)"
 
-#~ msgid "Show Evolution's shortcut keys"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਵੇਖੋ"
-
 #~ msgid "Not part of certificate"
 #~ msgstr "ਸਰਟੀਫਿਕੇਟ ਦਾ ਹਿੱਸਾ ਨਹੀਂ"
 
@@ -29711,9 +30432,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Field Value"
 #~ msgstr "ਖੇਤਰ ਮੁੱਲ"
 
-#~ msgid "Details"
-#~ msgstr "ਵੇਰਵਾ"
-
 #  FIXME: add serial no, validity date, uses
 #~ msgid ""
 #~ "Issued to:\n"
@@ -29866,18 +30584,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪੁੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 #~ "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#~ msgid "Day View"
-#~ msgstr "ਦਿਨ ਝਲਕ"
-
-#~ msgid "Work Week View"
-#~ msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ"
-
-#~ msgid "Week View"
-#~ msgstr "ਹਫਤਾ ਝਲਕ"
-
-#~ msgid "Month View"
-#~ msgstr "ਮਹੀਨਾ ਝਲਕ"
-
 #~ msgid "Web Page"
 #~ msgstr "ਵੈਬ ਪੇਜ਼"
 
@@ -31433,9 +32139,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Whether to show week numbers in various places in the Calendar."
 #~ msgstr "ਕੀ ਕੈਲੰਡਰ 'ਚ ਕਈ ਥਾਵਾਂ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਉਣਾ ਹੈ।"
 
-#~ msgid "Scroll Month View by a week"
-#~ msgstr "ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਅੱਗੇ ਪਿੱਛੇ ਕਰੋ"
-
 #~ msgid "Whether to scroll a Month View by a week, not by a month."
 #~ msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ।"
 
@@ -32778,9 +33481,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Loading calendar..."
 #~ msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#~ msgid "Organizer:"
-#~ msgstr "ਪ੍ਰਬੰਧਕ:"
-
 #~ msgid "Server Message:"
 #~ msgstr "ਸਰਵਰ ਸੁਨੇਹਾ:"
 
@@ -32932,9 +33632,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Select Trash Folder"
 #~ msgstr "ਰੱਦੀ ਫੋਲਡਰ ਚੁਣੋ"
 
-#~ msgid "Sent and Draft Messages"
-#~ msgstr "ਭੇਜੇ ਅਤੇ ਡਰਾਫਟ ਸੁਨੇਹੇ"
-
 #~ msgid "Top Posting Option"
 #~ msgstr "ਉੱਤੇ ਜਵਾਬ ਦੇਣ ਚੋਣ"
 
@@ -33901,9 +34598,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Cursor Mode"
 #~ msgstr "ਕਰਸਰ ਢੰਗ"
 
-#~ msgid "Selected Column"
-#~ msgstr "ਚੁਣੇ ਕਾਲਮ"
-
 #~ msgid "Focused Column"
 #~ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 
@@ -34257,9 +34951,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Name begins with"
 #~ msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ ਹੁੰਦੇ ਨਾਂ"
 
-#~ msgid "_Print"
-#~ msgstr "ਪਰਿੰਟ ਕਰੋ(_P)"
-
 #~ msgid "Cop_y to Address Book..."
 #~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
@@ -34285,9 +34976,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Save Memo"
 #~ msgstr "ਮੀਮੋ ਸੰਭਾਲੋ"
 
-#~ msgid "Save Task"
-#~ msgstr "ਕੰਮ ਸੰਭਾਲੋ"
-
 #~ msgid "Configure your timezone, Calendar and Task List here "
 #~ msgstr "ਆਪਣਾ ਸਮਾਂ-ਖੇਤਰ, ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਦੀ ਸੰਰਚਨਾ ਲਈ ਇਥੇ ਜਾਓ"
 
@@ -34303,15 +34991,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Evolution Calendar/Task editor"
 #~ msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ/ਕੰਮ ਸੰਪਾਦਕ"
 
-#~ msgid "Evolution's Calendar component"
-#~ msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਦਾ ਕੈਲੰਡਰ ਭਾਗ"
-
-#~ msgid "Evolution's Memos component"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਦਾ ਮੀਮੋ ਭਾਗ"
-
-#~ msgid "Evolution's Tasks component"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਦਾ ਕੰਮ ਭਾਗ"
-
 #~ msgid "Memo_s"
 #~ msgstr "ਮੀਮੋ(_s)"
 
@@ -34726,9 +35405,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Evolution Mail accounts configuration control"
 #~ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
-#~ msgid "Evolution Mail component"
-#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਭਾਗ"
-
 #~ msgid "Evolution Mail composer"
 #~ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ"
 
@@ -34747,12 +35423,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Signature(s)"
 #~ msgstr "ਦਸਤਖਤ"
 
-#~ msgid "_Copy to Folder"
-#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
-
-#~ msgid "_Move to Folder"
-#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
-
 #~ msgid "Cancel _Drag"
 #~ msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
 
@@ -34801,9 +35471,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "untitled_image.%s"
 #~ msgstr "ਬਿਨ_ਨਾਂ_ਚਿੱਤਰ.%s"
 
-#~ msgid "_Reply to sender"
-#~ msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
-
 #~ msgid "Open in %s..."
 #~ msgstr "%s ਨਾਲ ਖੋਲ੍ਹੋ..."
 
@@ -35273,9 +35940,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Folder contact"
 #~ msgstr "ਫੋਲਡਰ ਸੰਪਰਕ"
 
-#~ msgid "Folder owner"
-#~ msgstr "ਫੋਲਡਰ ਮਾਲਕ"
-
 #~ msgid "Folder visible"
 #~ msgstr "ਫੋਲਡਰ ਦਿੱਖ"
 
@@ -35523,9 +36187,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ "\n"
 #~ "ਜਾਂ ਤੁਸੀਂ ਸਿਰਫ਼ ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ।"
 
-#~ msgid "Try again with a different password."
-#~ msgstr "ਇੱਕ ਵੱਖਰੇ ਪਾਸਵਰਡ ਨਾਲ ਮੁੜ-ਕੋਸ਼ਸ਼ ਕਰੋ।"
-
 #~ msgid "Unable to add user to access control list:"
 #~ msgstr "ਯੂਜ਼ਰ ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ:"
 
@@ -35869,9 +36530,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "_Move Folder Contacts To"
 #~ msgstr "ਫੋਲਡਰ ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)"
 
-#~ msgid "_Rename"
-#~ msgstr "ਨਾਂ ਬਦਲੋ(_R)"
-
 #~ msgid "_Save Contact as VCard..."
 #~ msgstr "ਸੰਪਰਕ ਨੂੰ VCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)..."
 
@@ -35947,9 +36605,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Hide window buttons"
 #~ msgstr "ਵਿੰਡੋ ਬਟਨ ਓਹਲੇ"
 
-#~ msgid "Submit Bug Report"
-#~ msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ"
-
 #~ msgid "Toggle whether we are working offline."
 #~ msgstr "ਅਸੀਂ ਆਫਲਾਈਨ ਕੰਮ ਕਰ ਰਹੇ ਹਾਂ, ਨੂੰ ਬਦਲੋ"
 
@@ -35977,9 +36632,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "<b>_Selection</b>"
 #~ msgstr "<b>ਚੋਣ(_S)</b>"
 
-#~ msgid "Save Custom View"
-#~ msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ"
-
 #~ msgid "Hide _Attachment Bar"
 #~ msgstr "ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਓਹਲੇ(_A)"
 
@@ -36855,9 +37507,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "Orientation"
 #~ msgstr "ਸਥਿਤੀ"
 
-#~ msgid "Page Setup:"
-#~ msgstr "ਸਫ਼ਾ ਨਿਰਧਾਰਨ:"
-
 #~ msgid "Paper source:"
 #~ msgstr "ਸਫ਼ਾ ਸਰੋਤ:"
 
@@ -37017,9 +37666,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 #~ msgid "F_ind:"
 #~ msgstr "ਖੋਜ(_i):"
 
-#~ msgid "Find in Message"
-#~ msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
-
 #~ msgid "None Selected"
 #~ msgstr "ਕੋਈ ਚੁਣਿਆ ਨਹੀਂ"
 


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