Update Punjabi Translation

author: A S Alam <aalam@users.sf.net> 2012-08-19 17:29:44 +0800
committer: A S Alam <aalam@users.sf.net> 2012-08-19 17:29:44 +0800
commit: 7d1751cc26a75166019917ec8c3b35e1083d27d6 (patch)
tree: 3d8ecd0e0b1734ec7ba7e17f44b41ee56c8eae9c
parent: 528eef4f3cd39048578be19cd745b4476019bc0d (diff)
download: gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.gz
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.bz2
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.lz
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.xz
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.zst
gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.zip
1 files changed, 7542 insertions, 7281 deletions
diff --git a/po/pa.po b/po/pa.po
index ccb088efac..5049bc9278 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:556
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # A S Alam <aalam@users.sf.net>, 2004, 2005, 2006, 2007, 2009, 2010, 2011.
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2008, 2009, 2012.
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-02-27 11:22+0000\n"
-"PO-Revision-Date: 2012-03-17 09:26+0530\n"
+"POT-Creation-Date: 2012-08-12 20:13+0000\n"
+"PO-Revision-Date: 2012-08-19 14:58+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"Language: pa\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -88,43 +88,62 @@ msgid "This address book will be removed permanently."
 msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "ਨਾ ਹਟਾਓ(_N)"
 
 #: ../addressbook/addressbook.error.xml.h:14
+#| msgid "Delete address book '{0}'?"
+msgid "Delete remote address book &quot;{0}&quot;?"
+msgstr "ਕੀ ਐਡਰੈੱਸ-ਬੁੱਕ &quot;{0}&quot; ਹਟਾਉਣੀ ਹੈ?"
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+msgstr ""
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਐਡਰੈਸ ਬੁੱਕ &quot;{0}&quot; ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। "
+"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:68
+#| msgid "Delegated From"
+msgid "_Delete From Server"
+msgstr "ਸਰਵਰ ਤੋਂ ਹਟਾਓ(_D)"
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "ਕੈਟਾਗਰੀ ਐਡੀਟਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #  addressbook:load-error title
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Unable to open address book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "ਖੋਜ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Would you like to save your changes?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "ਤੁਸੀਂ ਆਪਣੇ ਸੰਪਰਕ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ, ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੋਗੇ?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "_Discard"
 msgstr "ਰੱਦ ਕਰੋ(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Cannot move contact."
 msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -133,50 +152,50 @@ msgstr ""
 "ਇਹ ਸਰੋਤ ਉੱਤੇ ਸੰਭਵ "
 "ਨਹੀਂ ਹੈ, ਕੀ ਤੁਸੀਂ ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਦੀ ਕਾਪੀ ਭੇਜਣਾ ਚਾਹੋਗੇ?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "ਚਿੱਤਰ, ਜੋ ਤੁਸੀਂ ਚੁਣਿਆ ਹੈ, ਵੱਡਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦਾ ਅਕਾਰ ਤਬਦਲ ਕਰਕੇ ਸੰਭਾਲਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "_Resize"
 msgstr "ਮੁੜ-ਆਕਾਰ(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Use as it is"
 msgstr "ਇਹ ਇੰਝ ਹੀ ਵਰਤੋਂ(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Do not save"
 msgstr "ਨਾ ਸੰਭਾਲੋ(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} ਸੰਭਾਲਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ਨੂੰ {1} ਸੰਭਾਲਣ ਲਈ ਗਲਤੀ: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਗਲਤ ਢੰਗ ਨਾਲ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "ਤੁਹਾਡੇ ਸੰਪਰਕ {0} ਲਈ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਮੁੜ "
 "ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "ਐਡਰੈੱਸ '{0}' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -185,16 +204,16 @@ msgstr ""
 "ਕਿਸੇ ਤਰਾਂ ਵੀ "
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:601
-#: ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:36
+#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿਲ(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Some addresses already exist in this contact list."
 msgstr "ਕੁਝ ਐਡਰੈਸ ਪਹਿਲਾਂ ਹੀ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਮੌਜੂਦ ਹਨ।"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -203,19 +222,19 @@ msgstr ""
 "ਹਨ। ਕੀ ਤੁਸੀਂ "
 "ਇਹਨਾਂ ਨੂੰ ਫੇਰ ਵੀ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "Skip duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਛੱਡੋ"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "Add with duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਨਾਲ ਜੋੜੋ"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "List '{0}' is already in this contact list."
 msgstr "ਇਸ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚ ਲਿਸਟ '{0}' ਪਹਿਲਾਂ ਹੀ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -224,51 +243,21 @@ msgstr ""
 "ਨੂੰ ਕਿਵੇਂ ਵੀ "
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "Some features may not work properly with your current server"
-msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ"
-
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ "
-"ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ "
-"ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
-
-#: ../addressbook/addressbook.error.xml.h:42
-msgid "GroupWise Address book creation:"
-msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਐਡਰੈੱਸ-ਬੁੱਕ ਨਿਰਮਾਣ:"
-
 #: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰੁੱਪਵਾਇਜ਼ ਸਿਸਟਮ ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ "
-"ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ "
-"ਕੋਈ ਹੋਰ ਗਰੁੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਗਰੁੱਪਵਾਇਜ਼ "
-"ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ "
-"ਗਰੁੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋ।"
-
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਸੰਪਰਕ ਹਟਾਉਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "Cannot add new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../addressbook/addressbook.error.xml.h:47
 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."
@@ -278,9 +267,9 @@ msgstr ""
 "ਹੋਰ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ ਜੀ।"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:628
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
 
@@ -317,12 +306,11 @@ msgid "_Wants to receive HTML mail"
 msgstr "HTML ਪੱਤਰ ਮਨਜ਼ੂਰ ਹਨ(_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:811
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
 
@@ -335,7 +323,7 @@ msgid "Instant Messaging"
 msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:990
+#: ../addressbook/importers/evolution-vcard-importer.c:1002
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
@@ -344,9 +332,9 @@ msgid "_Home Page:"
 msgstr "ਮੁੱਖ ਸਫਾ(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
+#: ../modules/itip-formatter/itip-view.c:1827
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
@@ -363,6 +351,7 @@ msgid "Home Page:"
 msgstr "ਮੁੱਖ ਸਫ਼ਾ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/cal-config-google/evolution-cal-config-google.c:98
 msgid "Calendar:"
 msgstr "ਕੈਲੰਡਰ:"
 
@@ -437,8 +426,8 @@ msgid "_Anniversary:"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
+#: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 
@@ -448,9 +437,8 @@ msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-display.c:728
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "ਜਨਮ-ਦਿਨ"
 
@@ -488,27 +476,27 @@ msgid "_Address:"
 msgstr "ਐਡਰੈੱਸ(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
-#: ../widgets/misc/e-contact-map.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-display.c:399
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
+#: ../widgets/misc/e-contact-map.c:298
 msgid "Home"
 msgstr "ਘਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
-#: ../widgets/misc/e-contact-map.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:396
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Work"
 msgstr "ਕੰਮ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
+#: ../calendar/gui/e-cal-model.c:3564
 msgid "Other"
 msgstr "ਹੋਰ"
 
@@ -520,74 +508,79 @@ msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
 msgid "Notes"
 msgstr "ਨੋਟ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "Gadu-Gadu"
 msgstr "ਗਡੂ-ਗਡੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "GroupWise"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "Skype"
 msgstr "ਸਕਾਈਪੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+msgid "Twitter"
+msgstr "ਟਵਿੱਟਰ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:497
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
 msgid "Error modifying contact"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -595,28 +588,28 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ਇੱਕ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' ਭਵਿੱਖ ਦੀ ਮਿਤੀ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ਖਾਲੀ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
@@ -628,15 +621,15 @@ msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
 msgid "_Edit Full"
 msgstr "ਪੂਰਾ ਸੋਧੋ(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "ਪੂਰਾ ਨਾਂ(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
 msgid "E_mail"
 msgstr "ਈ-ਮੇਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
 msgid "_Select Address Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ(_S)"
 
@@ -706,7 +699,7 @@ msgid "_Suffix:"
 msgstr "ਪਿਛੇਤਰ(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਸੰਪਾਦਕ"
 
@@ -727,27 +720,39 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "ਇਸ ਲਿਸਟ ਉੱਤੇ ਪੱਤਰ ਭੇਜਣ ਦੌਰਾਨ ਐਡਰੈੱਸ ਓਹਲੇ ਕਰੋ(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-#: ../mail/mail-config.ui.h:156
+msgid "Add an email to the List"
+msgstr "ਲਿਸਟ ਵਿੱਚ ਈਮੇਲ ਸ਼ਾਮਿਲ"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#| msgid "Copy the email address to the clipboard"
+msgid "Remove an email address from the List"
+msgstr "ਲਿਸਟ ਤੋਂ ਈਮੇਲ ਐਡਰੈਸ ਹਟਾਓ"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+msgid "Insert email addresses from Address Book"
+msgstr "ਐਡਰੈਸ ਬੁੱਕ ਤੋਂ ਈਮੇਲ ਐਡਰੈਸ ਸ਼ਾਮਿਲ"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "_Select..."
 msgstr "ਚੁਣੋ(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
 msgid "Contact List Members"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮੈਂਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
 msgid "_Members"
 msgstr "ਮੈਂਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error modifying list"
 msgstr "ਸੋਧ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
 msgid "Error removing list"
 msgstr "ਹਟਾਉਣ ਸੂਚੀ ਗਲਤੀ"
 
@@ -775,7 +780,7 @@ msgid "Changed Contact:"
 msgstr "ਬਦਲਿਆ ਸੰਪਰਕ:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
@@ -795,195 +800,179 @@ msgstr "ਅਸਲੀ ਸੰਪਰਕ:"
 msgid "New Contact:"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Name contains"
 msgstr "ਨਾਂ ਰੱਖਦਾ ਹੈ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Email begins with"
 msgstr "ਈ-ਮੇਲ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Any field contains"
 msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
 #: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
 msgid "Copy _Email Address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:164
+#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
 msgid "_Send New Message To..."
 msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "Send a mail message to this address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਨੂੰ ਮੇਲ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:333
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
+#, c-format
+msgid "Click to mail %s"
+msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "ਨਕਸ਼ਾ ਖੋਲ੍ਹੋ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
 msgid "List Members:"
 msgstr "ਲਿਸਟ ਮੈਂਬਰ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "ਆਮ ਨਾਂ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
 msgid "Profession"
 msgstr "ਕਿੱਤਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
 msgid "Position"
 msgstr "ਸਥਿਤੀ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "ਮੈਨੇਜਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "ਸਹਾਇਕ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
 msgid "Video Chat"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
-#: ../calendar/gui/dialogs/calendar-setup.c:469
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:528
-#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../modules/calendar/e-cal-shell-view-actions.c:217
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view.c:631
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 msgid "Phone"
 msgstr "ਫੋਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
 msgid "Fax"
 msgstr "ਫੈਕਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
 msgid "Address"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
 msgid "Home Page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
 msgid "Web Log"
 msgstr "ਵੈਬ ਲਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "ਮੋਬਾਇਲ ਫੋਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "ਸਾਥੀ"
 
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:132
-#: ../modules/calendar/e-memo-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "ਨੋਟ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "List Members"
 msgstr "ਲਿਸਟ ਮੈਂਬਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
 msgid "Job Title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
 msgid "Home page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -995,7 +984,7 @@ msgstr ""
 "ਚਾਲੂ ਹੋਣ "
 "ਉਪਰੰਤ ਐਡਰੈੱਸ-ਬੁੱਕ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1005,7 +994,7 @@ msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ "
 "ਅਧਿਕਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:156
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1014,7 +1003,7 @@ msgstr ""
 "ਮੱਦਦ ਚਾਹੁੰਦੇ ਹੋ, "
 "ਤੁਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1023,11 +1012,11 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ "
 "ਜਾਂ ਸਰਵਰ ਪਹੁੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "ਵੇਰਵੇ ਸਮੇਤ ਗਲਤੀ ਸੁਨੇਹਾ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1039,7 +1028,7 @@ msgstr ""
 "ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ ਪਸੰਦ ਨਤੀਜਾਂ ਸਮਾਂ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1052,69 +1041,69 @@ msgstr ""
 "ਦਿਓ"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../addressbook/gui/widgets/eab-gui-util.c:225
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਬੈਕਐਂਡ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "ਇਸ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਬੈਕਐਂਡ ਨੇ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਇਨਕਾਰੀ ਹੈ: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
 #: ../addressbook/gui/widgets/eab-gui-util.c:242
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "ਇਹ ਕਿਊਰੀ ਨੂੰ ਸਫਲਤਾਪੂਰਕ ਪੂਰਾ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:270
+#: ../addressbook/gui/widgets/eab-gui-util.c:264
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:390
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
 msgstr "ਸੂਚੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Move contact to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:577
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "Copy contact to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "Move contacts to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:582
+#: ../addressbook/gui/widgets/eab-gui-util.c:593
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:168
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰਕ"
 msgstr[1] "%d ਸੰਪਰਕ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:363
+#: ../addressbook/gui/widgets/e-addressbook-model.c:371
 msgid "Error getting book view"
 msgstr "ਬੁੱਕ ਝਲਕ ਲੈਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:752
+#: ../addressbook/gui/widgets/e-addressbook-model.c:805
 msgid "Search Interrupted"
 msgstr "ਖੋਜ ਰੋਕੀ ਗਈ"
 
@@ -1122,55 +1111,55 @@ msgstr "ਖੋਜ ਰੋਕੀ ਗਈ"
 msgid "Error modifying card"
 msgstr "ਸੋਧਿਆ ਕਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Cut selected contacts to the clipboard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕੱਟੋ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Copy selected contacts to the clipboard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Paste contacts from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਸੰਪਰਕ ਚੇਪੋ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../addressbook/gui/widgets/e-addressbook-view.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "Delete selected contacts"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+#: ../addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Select all visible contacts"
 msgstr "ਸਭ ਵੇਖਾਈ ਦਿੰਦੇ ਸੰਪਰਕ ਚੁਣੋ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਲਿਸਟ ਹਟਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਲਿਸਟ (%s)ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸਭ ਸੰਪਰਕ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ (%s) ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1185,11 +1174,11 @@ msgstr[1] ""
 "%d ਸੰਪਰਕ ਖੋਲ੍ਹਣ ਨਾਲ %d ਵਿੰਡੋਜ਼ ਖੋਲ੍ਹ ਜਾਣਗੀਆਂ।\n"
 "ਕੀ ਤੁਸੀਂ ਇਹ ਸਭ ਸੰਪਰਕ ਵੇਖਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 msgid "_Don't Display"
 msgstr "ਨਾ ਵੇਖਾਓ(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਵੇਖੋ(_A)"
 
@@ -1304,7 +1293,7 @@ msgid "Title"
 msgstr "ਟਾਇਟਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-list-view.c:657
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "ਰੋਲ"
@@ -1356,20 +1345,20 @@ msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
 msgstr[1] "1ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Work Email"
 msgstr "ਕੰਮਕਾਜੀ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:94
 msgid "Home Email"
 msgstr "ਘਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:795
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:775
 msgid "Other Email"
 msgstr "ਹੋਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1368,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ ਜਾਰੀ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1393,7 +1382,7 @@ msgstr ""
 "\n"
 "ਜਾਂ ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1407,7 +1396,7 @@ msgstr ""
 "\n"
 "ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1417,7 +1406,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1431,159 +1420,136 @@ msgstr ""
 msgid "Card View"
 msgstr "ਕਾਰਡ ਵੇਖਾਓ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:415
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../calendar/importers/icalendar-importer.c:446
+#: ../calendar/importers/icalendar-importer.c:939
+#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1075
-#| msgid "Outlook CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਆਉਟਲੁੱਕ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1076
-#| msgid "Outlook CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "ਆਉਟਲੁੱਕ ਸੰਪਰਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
-#| msgid "Mozilla CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਮੌਜੀਲਾ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
-#| msgid "Mozilla CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "ਮੌਜੀਲਾ ਸੰਪਰਕ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
-#| msgid "Evolution CSV or Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1102
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਪਰਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
-#| msgid "Evolution CSV and Tab Importer"
+#: ../addressbook/importers/evolution-csv-importer.c:1103
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਪਰਕ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:657
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:668
 msgid "Evolution vCard Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ vCard ਇੰਪੋਰਟਰ"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:723
+#: ../addressbook/printing/e-contact-print.c:717
 #, c-format
 msgid "Page %d"
 msgstr "%d ਪੇਜ਼"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Specify the output file instead of standard output"
 msgstr "ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ ਫਾਇਲ ਦੀ ਬਜਾਏ ਆਉਟਪੁੱਟ ਫਾਇਲ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "ਸਥਾਨਕ ਐਡਰੈੱਸ ਫੋਲਡਰਾਂ ਦੀ ਸੂਚੀ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "ਕਾਰਡ vcard ਜਾਂ csv ਫਾਇਲ ਵਾਂਗ ਵੇਖਾਓ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:69
 msgid "[vcard|csv]"
 msgstr "[vcard।csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
+#: ../addressbook/tools/evolution-addressbook-export.c:72
 msgid "Export in asynchronous mode"
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਨਿਰਯਾਤ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:74
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "ਇੱਕ ਆਉਟਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਅਸਕਰੋਨਸ ਮੋਡ ਵਿੱਚ ਕਾਰਡਾਂ ਦੀ ਗਿਣਤੀ, ਡਿਫਾਲਟ ਆਕਾਰ 100 ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:76
+#: ../addressbook/tools/evolution-addressbook-export.c:77
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:149
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "ਕਮਾਂਡ ਲਾਇਨ ਆਰਗੂਮਿੰਟ ਗਲਤੀ, ਕਿਰਪਾ ਕਰਕੇ ਵੇਖਣ ਲਈ--help ਵਰਤੋਂ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv ਜਾਂ vcard ਫਾਰਮੈਟ ਵਰਤੋਂ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
+#: ../addressbook/tools/evolution-addressbook-export.c:172
 msgid "In async mode, output must be file."
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:170
+#: ../addressbook/tools/evolution-addressbook-export.c:180
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮੋਡ ਵਿੱਚ, ਆਕਾਰ ਚੋਣ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਸੂਚੀ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
-#: ../plugins/caldav/caldav-browse-server.c:221
-#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "'%s' ਕਲਾਇਟ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ਘੰਟਾ"
@@ -1592,14 +1558,14 @@ msgstr[1] "ਘੰਟੇ"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ਦਿਨ"
 msgstr[1] "ਦਿਨ"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
 msgid "Start time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
@@ -1608,87 +1574,89 @@ msgid "Appointments"
 msgstr "ਮੁਲਾਕਾਤ"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "ਸਭ ਮਨਸੂਖ(_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "ਬੇਕਾਰ(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3 ../e-util/e-alert-dialog.c:164
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "ਮਨਸੂਖ(_D)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1454
+#: ../modules/itip-formatter/itip-view.c:1554
+msgid "Location:"
+msgstr "ਟਿਕਾਣਾ:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "ਮੁਲਾਕਾਤ ਦਾ ਟਿਕਾਣਾ"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "ਅੰਤਰਾਲ ਸਮਾਂ(_t):"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:353
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "ਦਿਨ"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
+#: ../widgets/misc/e-interval-chooser.c:141
 msgid "hours"
 msgstr "ਘੰਟੇ"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:527
+#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "ਮੁਲਾਕਾਤ ਦਾ ਟਿਕਾਣਾ"
-
-#. Location
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1758
-#: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
-msgid "Location:"
-msgstr "ਟਿਕਾਣਾ:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "ਸਭ ਮਨਸੂਖ(_A)"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "ਕੋਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "ਤੁਹਾਡੇ ਲਈ %d ਰੀਮਾਈਡਰ"
 msgstr[1] "ਤੁਹਾਡੇ ਲਈ %d ਰੀਮਾਈਡਰ"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1872
-#: ../calendar/alarm-notify/alarm-queue.c:1907
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1876
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1700,7 +1668,7 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪੁੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1913
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1717,17 +1685,17 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1928
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1735,8 +1703,8 @@ msgstr[0] "%d ਘੰਟਾ"
 msgstr[1] "%d ਘੰਟੇ"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1746,8 +1714,8 @@ msgstr[1] "%d ਮਿੰਟ"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1994,6 +1962,7 @@ msgstr ""
 "ਸਕਦਾ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+#: ../modules/itip-formatter/itip-view.c:3062
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
@@ -2078,12 +2047,52 @@ msgstr "ਕੀ ਮੀਮੋ ਸੂਚੀ '{0}' ਹਟਾਉਣੀ ਹੈ?"
 msgid "This memo list will be removed permanently."
 msgstr "ਇਹ ਮੀਮੋ ਸੂਚੀ ਸਦਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#  mail:ask-send-no-subject primary
 #: ../calendar/calendar.error.xml.h:66
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "Delete remote calendar &quot;{0}&quot;?"
+msgstr "ਰਿਮੋਟ ਕੈਲੰਡਰ &quot;{0}&quot; ਹਟਾਉਣਾ ਹੈ?"
+
+#: ../calendar/calendar.error.xml.h:67
+msgid ""
+"This will permanently remove the calendar &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr ""
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਕੈਲੰਡਰ &quot;{0}&quot; ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। "
+"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../calendar/calendar.error.xml.h:69
+#| msgid "Delete task list '{0}'?"
+msgid "Delete remote task list &quot;{0}&quot;?"
+msgstr "ਕੀ ਕੰਮ ਸੂਚੀ &quot;{0}&quot; ਹਟਾਉਣੀ ਹੈ?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid ""
+"This will permanently remove the task list &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr ""
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਟਾਸਕ ਲਿਸਟ &quot;{0}&quot; ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ। "
+"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../calendar/calendar.error.xml.h:71
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "Delete remote memo list &quot;{0}&quot;?"
+msgstr "ਕੀ ਮੀਮੋ &quot;{0}&quot; ਹਟਾਉਣਾ ਹੈ?"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid ""
+"This will permanently remote the memo list &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr ""
+"ਇਸ ਨਾਲ ਸਰਵਰ ਤੋਂ ਰਿਮੋਟ ਮੀਮੋ ਲਿਸਟ &quot;{0}&quot; ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ "
+"ਜਾਵੇਗਾ। "
+"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#  mail:ask-send-no-subject primary
+#: ../calendar/calendar.error.xml.h:73
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "ਕੀ ਤੁਸੀਂ ਮੁਲਾਕਾਤ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:74
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2093,11 +2102,11 @@ msgstr ""
 "ਸਮਝ ਸਕਦੇ ਹੋ।"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:75
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੰਮ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2107,24 +2116,24 @@ msgstr ""
 "ਆ ਸਕਦੀ ਹੈ।"
 
 #  mail:ask-send-no-subject primary
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:77
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ਕੀ ਤੁਸੀਂ ਮੀਮੋ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:78
 msgid "Error loading calendar"
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:79
 msgid "The calendar is not marked for offline usage."
 msgstr "ਕੈਲੰਡਰ ਨੂੰ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:80
 msgid "Cannot create a new event"
 msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:82
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
@@ -2133,12 +2142,12 @@ msgstr ""
 "ਵਿੱਚੋਂਵੱਖਰਾ "
 "ਕੈਲੰਡਰ ਚੁਣੋ ਜੀ।"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "ਘਟਨਾ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:85
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2147,53 +2156,46 @@ msgstr ""
 "ਹਾਈਲਾਈਟ ਕਰੋ "
 "ਤਾਂ ਕਿ ਮੁਲਾਕਾਤ ਮਨਜ਼ੂਰ ਕੀਤੀਆਂ ਜਾ ਸਕਣ।"
 
-#: ../calendar/calendar.error.xml.h:79
-#| msgid "Cannot save event"
+#: ../calendar/calendar.error.xml.h:86
 msgid "Cannot save task"
 msgstr "ਟਾਸਕ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:88
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr "'{0}' ਦਿੱਤੀਆਂ ਹੋਈਆਂ ਟਾਸਕ ਲਈ ਸਹਾਇਕ ਨਹੀਂ, ਵੱਖਰੀ ਟਾਸਕ ਸੂਚੀ ਚੁਣੋ ਜੀ।"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:89
 msgid "Error loading task list"
 msgstr "ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:90
 msgid "The task list is not marked for offline usage."
 msgstr "ਕੰਮ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:91
 msgid "Error loading memo list"
 msgstr "ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:92
 msgid "The memo list is not marked for offline usage."
 msgstr "ਮੀਮੋ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:95
 msgid "Error on {0}: {1}"
 msgstr "{0} ਵਿੱਚ ਗਲਤੀ: {1}"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Some features may not work properly with your current server."
-msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"
+#: ../calendar/calendar.error.xml.h:96
+#| msgid "Could not open destination"
+msgid "Could not perform this operation."
+msgstr "ਇਹ ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-#: ../calendar/calendar.error.xml.h:90
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ "
-"ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ "
-"ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ "
-"ਚਾਹੀਦਾ ਹੈ।"
+#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
+msgid "You must be working online to complete this operation."
+msgstr "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਸੰਪੂਰਨ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਆਨ-ਲਾਇਨ ਰਹਿਣਾ ਚਾਹੀਦਾ ਹੈ."
 
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
@@ -2215,7 +2217,7 @@ msgstr "ਮਹੀਨਾ ਝਲਕ"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
@@ -2256,20 +2258,20 @@ msgstr "ਹੈ"
 msgid "is not"
 msgstr "ਇਹ ਨਹੀਂ"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
+#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "ਸਰਵਜਨਕ"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
 #: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
@@ -2287,9 +2289,9 @@ msgstr "ਦਰਸ਼ਕ"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:861
+#: ../plugins/publish-calendar/publish-calendar.c:870
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
@@ -2299,7 +2301,9 @@ msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:198
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "ਨੱਥੀ"
 
@@ -2325,7 +2329,6 @@ msgid "Occurs"
 msgstr "ਵਾਪਰਨਾ"
 
 #: ../calendar/gui/caltypes.xml.h:21
-#| msgid "is less than"
 msgid "Less Than"
 msgstr "ਤੋ ਘੱਟ ਹੈ"
 
@@ -2334,7 +2337,6 @@ msgid "Exactly"
 msgstr "ਸਹੀ"
 
 #: ../calendar/gui/caltypes.xml.h:23
-#| msgid "Korean"
 msgid "More Than"
 msgstr "ਇਸ ਤੋਂ ਵੱਧ"
 
@@ -2353,22 +2355,22 @@ msgid "Edit Reminder"
 msgstr "ਰੀਮਾਈਡਰ ਸੋਧ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:413
+#: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:824
-#: ../calendar/gui/e-alarm-list.c:409
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "ਧੁਨੀ ਚਲਾਉ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
 
@@ -2422,7 +2424,7 @@ msgstr "ਰੀਮਾਈਡਰ ਦੁਹਰਾਓ(_R)"
 msgid "extra times every"
 msgstr "ਹਰ ਵਾਧੂ ਸਮਾਂ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
 msgid "Options"
 msgstr "ਚੋਣ"
 
@@ -2458,7 +2460,7 @@ msgstr "ਆਰਗੂਮਿੰਟ(_A):"
 msgid "Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -2472,88 +2474,6 @@ msgstr "ਰੀਮਾਈਡਰ"
 msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "ਕਿਸਮ:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:529
-msgid "_Type:"
-msgstr "ਕਿਸਮ(_T):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
-msgid "_Name:"
-msgstr "ਨਾਂ(_N):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਕਾਪੀ ਕਰੋ(_y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ(_y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:320
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ(_y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-msgid "Sh_ow reminder notifications"
-msgstr "ਰੀਮਾਈਡਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ(_o)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "ਰੰਗ(_r):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:468
-#: ../calendar/gui/dialogs/calendar-setup.c:480
-#: ../calendar/gui/dialogs/calendar-setup.c:491
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
-#: ../modules/addressbook/addressbook-config.c:1114
-#: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "ਸਧਾਰਨ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "ਕੰਮ ਲਿਸਟ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:492
-msgid "Memo List"
-msgstr "ਮੀਮੋ ਲਿਸਟ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "Calendar Properties"
-msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "ਕੰਮ ਲਿਸਟ ਗੁਣ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "ਮੀਮੋ ਸੂਚੀ ਵਿਸ਼ੇਸ਼ਤਾ"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "ਇਹ ਘਟਨਾ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ"
@@ -2602,238 +2522,251 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ਤੁਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮੁਲਾਕਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:778
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮੀਮੋ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:801
 msgid "No Summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:912
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "ਕੀ ਅਸਲੀ ਆਈਟਮ ਰੱਖਣੀ ਹੈ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
+#: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1423
+#: ../widgets/misc/e-web-view-gtkhtml.c:456
+#: ../widgets/misc/e-web-view-gtkhtml.c:1299
 msgid "Copy the selection"
 msgstr "ਚੁਣੇ ਦੀ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../widgets/misc/e-web-view.c:1417 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "ਚੁਣੇ ਕੱਟੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "ਚੁਣੇ ਹਟਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "ਮੱਦਦ ਵੇਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../widgets/misc/e-web-view.c:1429 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਚੇਪੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "ਮੌਜੂਦਾ ਬਦਲਾਅ ਸੰਭਾਲੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+#: ../widgets/misc/e-mail-signature-editor.c:294
+#| msgid "_Save and Close"
+msgid "Save and Close"
+msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1220
+#| msgid "Save current changes"
+msgid "Save current changes and close editor"
+msgstr "ਮੌਜੂਦਾ ਬਦਲਾਅ ਸੰਭਾਲੋ ਅਤੇ ਐਡੀਟਰ ਬੰਦ ਕਰੋ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1558
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
 msgstr "ਵਰਗੀਕਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:172
+#: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/misc/e-signature-editor.c:225
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1593
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "ਚੋਣ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
+#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "ਨੱਥੀ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਅਟੈਚ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
 msgstr "ਕੈਟਾਗਰੀ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਝਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1267
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "ਪਬਲਿਕ(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "ਨਿੱਜੀ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "ਗੁਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "ਗੁਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "ਰੋਲ ਖੇਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1308
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਕ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2393
-#: ../calendar/gui/dialogs/comp-editor.c:2556
-#: ../calendar/gui/dialogs/comp-editor.c:3548
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "ਅਟੈਚਮੈਂਟ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3580
+#: ../calendar/gui/dialogs/comp-editor.c:3683
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#: ../calendar/gui/dialogs/comp-editor-page.c:439
 #, c-format
 msgid "Validation error: %s"
 msgstr "ਜਾਂਚ ਗਲਤੀ: %s"
@@ -2988,13 +2921,13 @@ msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
 msgid "Appointment"
 msgstr "ਮੁਲਾਕਾਤ"
 
 #: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:166
 msgid "Attendees"
 msgstr "ਦਰਸ਼ਕ"
 
@@ -3002,118 +2935,105 @@ msgstr "ਦਰਸ਼ਕ"
 msgid "Print this event"
 msgstr "ਇਹ ਈਵੈਂਟ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/event-page.c:566
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "ਈਵੈਂਟ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:643
+#: ../calendar/gui/dialogs/event-page.c:647
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ਈਵੈਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਕੈਲੰਡਰ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:651
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ਈਵੈਂਟ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:659
-#: ../calendar/gui/dialogs/event-page.c:3101
+#: ../calendar/gui/dialogs/event-page.c:663
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਰੀਮਾਈਡਰ"
 
-#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.c:730
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:1285
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1288
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
-#: ../calendar/gui/dialogs/memo-page.c:723
-#: ../calendar/gui/dialogs/task-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1664
-#: ../calendar/gui/dialogs/memo-page.c:762
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1680
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1698
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1714
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1905
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1907
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2998
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * on behalf of some other user
-#. Translators: This string is used when we are creating a Task
-#. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3019
-#: ../calendar/gui/dialogs/memo-page.c:1025
-#: ../calendar/gui/dialogs/task-page.c:1858
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr "ਤੁਸੀਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਕੰਮ ਕਰ ਰਹੇ ਹੋ"
-
-#: ../calendar/gui/dialogs/event-page.c:3361
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:3367
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟਾ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/event-page.c:3373
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/event-page.c:3392
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3398
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
@@ -3149,7 +3069,6 @@ msgid "1 day before appointment"
 msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ੧ ਦਿਨ ਪਹਿਲਾਂ"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
@@ -3244,11 +3163,11 @@ msgid "Select Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Select _Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
@@ -3256,38 +3175,53 @@ msgstr "ਮੀਮੋ"
 msgid "Print this memo"
 msgstr "ਇਹ ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/memo-page.c:423
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo's start date is in the past"
 msgstr "ਮੀਮੋ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../calendar/gui/dialogs/memo-page.c:465
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ਮੀਮੋ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਮੀਮੋ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../calendar/gui/dialogs/memo-page.c:469
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ਮੀਮੋ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/memo-page.c:981
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2667
-#: ../mail/em-format-html.c:2732 ../mail/em-format-html.c:2756
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:983
+#: ../em-format/e-mail-parser-application-mbox.c:111
+#: ../em-format/e-mail-parser-application-smime.c:107
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
+#: ../em-format/e-mail-parser-multipart-encrypted.c:122
+#: ../em-format/e-mail-parser-multipart-signed.c:147
+#: ../libemail-engine/mail-ops.c:719 ../mail/e-mail-reader.c:1726
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4499
+#: ../modules/itip-formatter/itip-view.c:4897 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#: ../calendar/gui/dialogs/memo-page.c:1173
+#: ../em-format/e-mail-formatter.c:1370
+#: ../em-format/e-mail-formatter-utils.c:180
+#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
 msgid "To"
 msgstr "ਵੱਲ"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:346
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "ਲਿਸਟ(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.c:354
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧਕ(_z):"
@@ -3343,21 +3277,21 @@ msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:576
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "ਆਵਰਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "End time of the recurrence was before event's start"
 msgstr "ਮੁੜ-ਹੋਣ ਦਾ ਸਮਾਂ ਈਵੈਂਟ ਸ਼ੁਰੂ ਹੋਣ ਦੇ ਸਮੇਂ ਤੋਂ ਪਹਿਲਾਂ ਹੈ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "on"
 msgstr "ਚਾਲੂ"
 
@@ -3365,7 +3299,7 @@ msgstr "ਚਾਲੂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
@@ -3374,7 +3308,7 @@ msgstr "ਪਹਿਲਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "second"
 msgstr "ਦੂਜਾ"
 
@@ -3382,7 +3316,7 @@ msgstr "ਦੂਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "third"
 msgstr "ਤੀਜਾ"
 
@@ -3390,7 +3324,7 @@ msgstr "ਤੀਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fourth"
 msgstr "ਚੌਥਾ"
 
@@ -3398,7 +3332,7 @@ msgstr "ਚੌਥਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "fifth"
 msgstr "ਪੰਜਵਾਂ"
 
@@ -3406,13 +3340,13 @@ msgstr "ਪੰਜਵਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
 msgid "last"
 msgstr "ਆਖਰੀ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1148
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
 
@@ -3420,7 +3354,7 @@ msgstr "ਹੋਰ ਮਿਤੀ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "1st to 10th"
 msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
 
@@ -3428,7 +3362,7 @@ msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "11th to 20th"
 msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
 
@@ -3436,41 +3370,41 @@ msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "21st to 31st"
 msgstr "੨੧ਵੇਂ ਤੋਂ ੩੧ਵਾਂ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
@@ -3478,31 +3412,31 @@ msgstr "ਐਤਵਾਰ"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1322
+#: ../calendar/gui/dialogs/recurrence-page.c:1326
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1501
+#: ../calendar/gui/dialogs/recurrence-page.c:1505
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2221
 msgid "Add exception"
 msgstr "ਅਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2258
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to modify."
 msgstr "ਸੋਧ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2264
+#: ../calendar/gui/dialogs/recurrence-page.c:2268
 msgid "Modify exception"
 msgstr "ਅਪਵਾਦ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2308
+#: ../calendar/gui/dialogs/recurrence-page.c:2312
 msgid "Could not get a selection to delete."
 msgstr "ਹਟਾਉਣ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2447
+#: ../calendar/gui/dialogs/recurrence-page.c:2451
 msgid "Date/Time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
@@ -3560,7 +3494,7 @@ msgstr "ਹਰੇਕ"
 msgid "Exceptions"
 msgstr "ਛੋਟ"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "ਝਲਕ"
 
@@ -3583,79 +3517,77 @@ msgstr "ਵੈਬ ਪੇਜ਼"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:345
+#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "ਉਚਤਮ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:328
-#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../calendar/gui/e-cal-component-preview.c:347
+#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:330
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:349
+#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "ਨਿਊਨਤਮ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:490
-#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:301
-#: ../calendar/gui/e-cal-model-tasks.c:492
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
-#: ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
+#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3408
 msgid "In Progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:494
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
-#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../calendar/gui/e-cal-model-tasks.c:496
-#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
-#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
@@ -3663,8 +3595,8 @@ msgstr "ਰੱਦ ਕੀਤਾ"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3522
-#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-cal-model.c:3618
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:1
@@ -3704,48 +3636,47 @@ msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ ਲ
 msgid "_Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "ਇਹ ਕੰਮ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/task-page.c:254
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "ਟਾਸਕ ਦੀ ਸ਼ੁਰੂ ਮਿਤੀ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "ਟਾਸਕ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੇ ਸਮੇਂ 'ਚ ਹੈ"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ਟਾਸਕ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:297
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ਟਾਸਕ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/dialogs/task-page.c:297
-#| msgid "Task cannot be edited, because the selected task list is read only"
+#: ../calendar/gui/dialogs/task-page.c:301
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
 msgstr ""
 "ਟਾਸਕ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਦਿੱਤੀ ਗਈਆਂ ਟਾਸਕਾਂ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1777
+#: ../calendar/gui/dialogs/task-page.c:1813
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "'%s' ਵਿੱਚ ਟਾਸਕ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ: %s"
@@ -3849,14 +3780,14 @@ msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲਈ ਕੈਲੰ�
 msgid "a table to view and select the current time range"
 msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਸੀਮਾ ਵੇਖਣ ਅਤੇ ਚੁਣਨ ਲਈ ਇੱਕ ਟੇਬਲ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:1118
 msgid "Gnome Calendar"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3866,30 +3797,30 @@ 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.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
-#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
+#: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1098
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1129
+#: ../modules/calendar/e-cal-shell-view-private.c:1136
+#: ../modules/calendar/e-cal-shell-view-private.c:1139
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3898,10 +3829,10 @@ 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.
-#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
-#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
+#: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3914,7 +3845,7 @@ msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:359
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3922,69 +3853,69 @@ msgstr[0] "%d ਦਿਨ"
 msgstr[1] "%d ਦਿਨ"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:365
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#: ../calendar/gui/e-alarm-list.c:427
+#: ../calendar/gui/e-alarm-list.c:426
 msgid "Unknown action to be performed"
 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"
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 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"
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s ਮੁਲਾਕਾਤ ਦੇ ਸ਼ੁਰੂ ਬਾਅਦ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:452
 #, c-format
 msgid "%s at the start of the appointment"
 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"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the end of the appointment"
 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"
-#: ../calendar/gui/e-alarm-list.c:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਬਾਅਦ %s %s "
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the end of the appointment"
 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"
-#: ../calendar/gui/e-alarm-list.c:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at %s"
 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
-#: ../calendar/gui/e-alarm-list.c:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "ਅਣਜਾਣ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
@@ -4007,42 +3938,48 @@ msgstr "ਮਹੀਨੇ ਦੀ ਕੈਲੰਡਰ ਦਿੱਖ"
 msgid "calendar view for one or more weeks"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਹਫਤਿਆਂ ਲਈ ਕੈਲੰਡਰ ਝਲਕ"
 
-#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Categories:"
 msgstr "ਕੈਟਾਗਰੀਆਂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:276
 msgid "Summary:"
 msgstr "ਸੰਖੇਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Start Date:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:295
+#| msgid "End Date"
+msgid "End Date:"
+msgstr "ਸਮਾਪਤੀ ਮਿਤੀ:"
+
+#: ../calendar/gui/e-cal-component-preview.c:306
 msgid "Due Date:"
 msgstr "ਮਿਆਦ:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../modules/itip-formatter/itip-view.c:1457
+#: ../modules/itip-formatter/itip-view.c:1563
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:343
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:397
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
@@ -4055,10 +3992,10 @@ msgid "Start date"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
 #: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "ਕਿਸਮ"
@@ -4067,7 +4004,7 @@ msgstr "ਕਿਸਮ"
 msgid "Completion date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
 msgid "Complete"
 msgstr "ਮੁਕੰਮਲ"
 
@@ -4082,14 +4019,14 @@ msgstr "% ਮੁਕੰਮਲ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "ਬਣਾਇਆ"
 
@@ -4099,37 +4036,37 @@ msgstr "ਬਣਾਇਆ"
 msgid "Last modified"
 msgstr "ਆਖਰੀ ਸੋਧ"
 
-#: ../calendar/gui/e-calendar-view.c:427
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../calendar/gui/e-calendar-view.c:433
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/e-calendar-view.c:439
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "ਈਵੈਂਟ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "ਚੁਣੇ ਈਵੈਂਟ ਹਟਾਓ"
 
-#: ../calendar/gui/e-calendar-view.c:464 ../calendar/gui/e-memo-table.c:198
-#: ../calendar/gui/e-task-table.c:286
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:283
 msgid "Deleting selected objects"
 msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../calendar/gui/e-calendar-view.c:660 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
+#: ../calendar/gui/e-task-table.c:1158
 msgid "Updating objects"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1918 ../calendar/gui/e-memo-table.c:555
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:824
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
@@ -4137,20 +4074,20 @@ msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1922 ../calendar/gui/e-memo-table.c:560
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:828
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1938 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1969
+#: ../calendar/gui/e-calendar-view.c:2043
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
@@ -4164,86 +4101,86 @@ msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 msgid "End Date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
+#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3446
+#: ../modules/itip-formatter/itip-view.c:5977
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1625
+#: ../calendar/gui/e-cal-model.c:1657
 msgid "Recurring"
 msgstr "ਆਵਿਰਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:1627
+#: ../calendar/gui/e-cal-model.c:1659
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:1062
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1075
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:211
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "ਨਹੀ"
 
-#: ../calendar/gui/e-cal-model.c:3021
+#: ../calendar/gui/e-cal-model.c:3114
 #, c-format
 msgid "Opening %s"
 msgstr "%s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-cal-model.c:3466
-#: ../calendar/gui/e-meeting-list-view.c:218
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../calendar/gui/e-cal-model.c:3559
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../modules/itip-formatter/itip-view.c:5965
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-cal-model.c:3467
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../calendar/gui/e-cal-model.c:3560
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:5971
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-cal-model.c:3468
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-cal-model.c:3561
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
-#: ../calendar/gui/e-cal-model.c:3469
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../calendar/gui/e-cal-model.c:3562
+#: ../calendar/gui/e-meeting-list-view.c:225
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../modules/itip-formatter/itip-view.c:5974
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
-#: ../calendar/gui/e-cal-model.c:3470
+#: ../calendar/gui/e-cal-model.c:3563
 msgid "Needs action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/e-task-table.c:633
 msgid "Free"
 msgstr "ਵੇਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:720
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4254,22 +4191,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:772
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 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.
-#: ../calendar/gui/e-cell-date-edit-text.c:166
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:174
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4280,16 +4217,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
-#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
-#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
+#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
-#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
-#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
+#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
@@ -4299,13 +4236,13 @@ msgstr "ਸ਼ਾਮ"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1833 ../calendar/gui/e-day-view-top-item.c:833
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 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
-#: ../calendar/gui/e-day-view.c:2650
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
@@ -4316,129 +4253,127 @@ msgstr "ਹਫ਼ਤਾ %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:791
+#: ../calendar/gui/e-day-view-time-item.c:790
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:815
 msgid "Show the second time zone"
 msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
+#: ../calendar/gui/e-day-view-time-item.c:832
+#: ../modules/calendar/e-calendar-preferences.c:185
+#: ../modules/calendar/e-calendar-preferences.c:237
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-day-view-time-item.c:866
 #: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:268
 msgid "Select..."
 msgstr "ਚੁਣੋ..."
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Chair Persons"
 msgstr "ਪ੍ਰਧਾਨ"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "ਲੋੜੀਦੀ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:1160
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1157
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1158
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1172
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
 msgid "Required Participant"
 msgstr "ਲੋੜੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/print.c:1177
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1174
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/print.c:1178
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1175
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-store.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1082
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:615
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-list-view.c:671
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1906
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "%s ਸਰਵਰ ਉੱਤੇ %s ਯੂਜ਼ਰ ਵਜੋਂ ਵੇਹਲ/ਰੁੱਝੇ ਜਾਣਕਾਰੀ ਲੈਣ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../calendar/gui/e-meeting-store.c:1897
+#: ../calendar/gui/e-meeting-store.c:1916
 #, c-format
 msgid "Failure reason: %s"
 msgstr "ਫੇਲ੍ਹ ਹੋਣ ਦਾ ਕਾਰਨ: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1902
-#: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:458
-#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../calendar/gui/e-meeting-store.c:1921
+#: ../plugins/publish-calendar/publish-calendar.c:335
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
@@ -4527,47 +4462,46 @@ msgstr "ਆਮ ਨਾਂ"
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../calendar/gui/e-memo-table.c:436
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:459
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:476
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
 msgid "* No Summary *"
 msgstr "* ਸੰਖੇਪ ਨਹੀਂ *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
 msgid "Start: "
 msgstr "ਸ਼ੁਰੂ:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
 msgid "Due: "
 msgstr "ਬਾਕੀ:"
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Cut selected memos to the clipboard"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:745
 msgid "Copy selected memos to the clipboard"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Paste memos from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਮੀਮੋ ਚੇਪੋ"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
 msgid "Delete selected memos"
 msgstr "ਚੁਣੇ ਕੰਮ ਹਟਾਓ"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:763
 msgid "Select all visible memos"
 msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਮੀਮੋ ਚੁਣੋ"
 
@@ -4579,41 +4513,40 @@ msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:611
+#: ../calendar/gui/e-task-table.c:608
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1048
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
+#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:457
+#: ../modules/calendar/e-cal-shell-content.c:437
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "ਕੰਮ"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Cut selected tasks to the clipboard"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1028
 msgid "Copy selected tasks to the clipboard"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1034
 msgid "Paste tasks from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਟਾਸਕ ਚੇਪੋ"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1040
+#: ../modules/calendar/e-task-shell-view-actions.c:735
 msgid "Delete selected tasks"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਹਟਾਓ"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Select all visible tasks"
 msgstr "ਸਭ ਦਿਸ ਰਹੀਆਂ ਟਾਸਕਾਂ ਚੁਣੋ"
 
@@ -4627,40 +4560,40 @@ msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1963
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2253
+#: ../calendar/gui/gnome-cal.c:2315
 msgid "Purging"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:819
 msgid "An organizer must be set."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
 msgid "Memo information"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
 msgid "Free/Busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
@@ -4668,7 +4601,7 @@ msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:955
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
@@ -4677,7 +4610,7 @@ msgstr "ਮਨਜ਼ੂਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:826
+#: ../calendar/gui/itip-utils.c:962
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
@@ -4689,7 +4622,7 @@ msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
@@ -4698,7 +4631,7 @@ msgstr "ਇਨਕਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:976
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
@@ -4706,7 +4639,7 @@ msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:853
+#: ../calendar/gui/itip-utils.c:989
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵੀਨ"
@@ -4714,7 +4647,7 @@ msgstr "ਨਵੀਨ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:860
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
@@ -4722,7 +4655,7 @@ msgstr "ਰੱਦ ਕਰੋ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:867
+#: ../calendar/gui/itip-utils.c:1003
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
@@ -4730,252 +4663,252 @@ msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:874
+#: ../calendar/gui/itip-utils.c:1010
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸੁਝਾਅ"
 
-#: ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:1088
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../calendar/gui/itip-utils.c:960
+#: ../calendar/gui/itip-utils.c:1096
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:1123
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਨਵਾਂ ਈਵੈਂਟ ਪਹਿਲਾਂ ਦੇ ਕਿਸੇ ਨਾਲ ਟਕਰਾ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
 msgstr "ਸਰੋਤ ਬੁੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ, ਗਲਤੀ: "
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../calendar/gui/itip-utils.c:1306
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "1st"
 msgstr "੧ਲਾਂ"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "2nd"
 msgstr "੨ਜਾ"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "3rd"
 msgstr "੩ਜਾ"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "4th"
 msgstr "੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "5th"
 msgstr "੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "6th"
 msgstr "੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "7th"
 msgstr "੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "8th"
 msgstr "੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "9th"
 msgstr "੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "10th"
 msgstr "੧੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "11th"
 msgstr "੧੧ਵਾਂ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "12th"
 msgstr "੧੨ਵਾਂ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "13th"
 msgstr "੧੩ਵਾਂ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "14th"
 msgstr "੧੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "15th"
 msgstr "੧੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "16th"
 msgstr "੧੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "17th"
 msgstr "੧੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "18th"
 msgstr "੧੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "19th"
 msgstr "੧੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "20th"
 msgstr "੨੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "21st"
 msgstr "੨੧ਵਾਂ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "22nd"
 msgstr "੨੨ਵਾਂ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "23rd"
 msgstr "੨੩ਵਾਂ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "24th"
 msgstr "੨੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "25th"
 msgstr "੨੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "26th"
 msgstr "੨੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "27th"
 msgstr "੨੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "28th"
 msgstr "੨੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "29th"
 msgstr "੨੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "30th"
 msgstr "੩੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "31st"
 msgstr "੩੧ਵਾਂ"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Su"
 msgstr "ਐਤ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Mo"
 msgstr "ਸੋ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Tu"
 msgstr "ਮੰ"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "We"
 msgstr "ਬੁੱ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Th"
 msgstr "ਵੀ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Fr"
 msgstr "ਸ਼ੁੱ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Sa"
 msgstr "ਸ਼"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3153
 msgid " to "
 msgstr " ਵੱਲ "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3166
+#: ../calendar/gui/print.c:3163
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3169
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3179
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3186
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3351
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
 
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3378
 msgid "Attendees: "
 msgstr "ਦਰਸ਼ਕ:"
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3421
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3436
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3454
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3465
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3478
 #, c-format
 msgid "Categories: %s"
 msgstr "ਕੈਟਾਗਰੀ: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3489
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
@@ -5000,185 +4933,185 @@ msgstr "ਤੋ ਜਿਆਦਾ ਹੈ"
 msgid "is less than"
 msgstr "ਤੋ ਘੱਟ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ"
 
-#: ../calendar/importers/icalendar-importer.c:437
-#: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../calendar/importers/icalendar-importer.c:468
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../modules/itip-formatter/itip-view.c:5576
 msgid "Opening calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:585
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾਇਲਾਂ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:676
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:760
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ਫਾਇਲਾਂ (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:761
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:1041
+#: ../calendar/importers/icalendar-importer.c:1075
 msgid "Calendar Events"
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ"
 
-#: ../calendar/importers/icalendar-importer.c:1085
+#: ../calendar/importers/icalendar-importer.c:1119
 msgid "Evolution Calendar intelligent importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੁਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ਮੀਟਿੰਗ"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ਈਵੈਂਟ"
 
-#: ../calendar/importers/icalendar-importer.c:1156
-#: ../calendar/importers/icalendar-importer.c:1472
+#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1473
+#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/importers/icalendar-importer.c:1168
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ਮੁੜ-ਵਾਪਰਦਾ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1207
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ਇੱਕ ਮੌਕਾ"
 
-#: ../calendar/importers/icalendar-importer.c:1178
+#: ../calendar/importers/icalendar-importer.c:1212
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ਰੀਮਾਈਡਰ ਹਨ"
 
-#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ਨੱਥੀ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ਪਬਲਿਕ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ਪ੍ਰਾਈਵੇਟ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ਵਰਗੀਕਰਨ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1211
-#: ../calendar/importers/icalendar-importer.c:1512
+#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1546
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1508
+#: ../calendar/importers/icalendar-importer.c:1259
+#: ../calendar/importers/icalendar-importer.c:1542
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ਮੁਕੰਮਲ"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1248
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1292
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ਕੈਟਾਗਰੀਆਂ"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1290
+#: ../calendar/importers/icalendar-importer.c:1324
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1301
-#: ../calendar/importers/icalendar-importer.c:1304
+#: ../calendar/importers/icalendar-importer.c:1335
+#: ../calendar/importers/icalendar-importer.c:1338
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1324
-#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ਦਰਸ਼ਕ"
 
-#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1504
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "ਕਿਸਮ"
@@ -6734,326 +6667,12 @@ msgstr "ਪ੍ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਯਾਪੀ"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "ਵਿਚੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਸਾਕਟ ਦਾ ID"
-
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "ਸਾਕਟ"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "ਆਪਣਾ ਪੂਰਾ ਨਾਂ ਦਿਓ।"
-
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਈਮੇਲ ਐਡਰੈੱਸ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
-
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "ਆਪਣਾ ਪਾਸਵਰਡ ਦਿਓ ਜੀ।"
-
-#: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5429 ../plugins/caldav/caldav-source.c:67
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:376
-#: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5300 ../mail/em-account-editor.c:5357
-#: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
-msgid "Google"
-msgstr "ਗੂਗਲ"
-
-#: ../capplet/settings/mail-account-view.c:497
-#: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4833 ../mail/em-account-editor.c:4868
-#| msgid "Always"
-msgid "Always (SSL)"
-msgstr "ਹਮੇਸ਼ਾ (SSL)"
-
-#: ../capplet/settings/mail-account-view.c:500
-#: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4836 ../mail/em-account-editor.c:4871
-#| msgid "Whenever Possible"
-msgid "When possible (TLS)"
-msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ (TLS)"
-
-#: ../capplet/settings/mail-account-view.c:503
-#: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4839
-#: ../mail/em-account-editor.c:4874
-msgid "Never"
-msgstr "ਕਦੇ ਨਹੀਂ"
-
-#: ../capplet/settings/mail-account-view.c:511
-msgid "Personal details:"
-msgstr "ਨਿੱਜੀ ਵੇਰਵਾ:"
-
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
-msgid "Name:"
-msgstr "ਨਾਂ:"
-
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
-msgid "Email address:"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ:"
-
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
-msgid "Details:"
-msgstr "ਵੇਰਵਾ:"
-
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
-msgid "Receiving"
-msgstr "ਪ੍ਰਾਪਤੀ"
-
-#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
-msgid "Server type:"
-msgstr "ਸਰਵਰ ਕਿਸਮ:"
-
-#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
-msgid "Server address:"
-msgstr "ਸਰਵਰ ਐਡਰੈੱਸ:"
-
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
-msgid "Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
-
-#: ../capplet/settings/mail-account-view.c:579
-msgid "Use encryption:"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ:"
-
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
-msgid "Sending"
-msgstr "ਭੇਜਣਾ"
-
-#: ../capplet/settings/mail-account-view.c:655
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"ਈਮੇਲ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਤੁਹਾਨੂੰ ਅਕਾਊਂਟ ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਆਪਣਾ "
-"ਈਮੇਲ ਐਡਰੈੱਸ ਅਤੇ "
-"ਪਾਸਵਰਡ ਹੇਠਾਂ ਭਰੋ ਅਟੇ ਅਸੀਂ ਸਭ ਸੈਟਿੰਗ ਆਪਣੇ ਆਪ ਲੈਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਾਂਗੇ। ਜੇ ਅਸੀਂ ਇਹ "
-"ਸਭ ਕੁਝ ਆਟੋਮੈਟਿਕ "
-"ਨਾ ਕਰ ਸਕੇ ਤਾਂ ਤੁਹਾਨੂੰ ਆਪਣੇ ਸਰਵਰ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੀ ਦੇਣੀ ਪਵੇਗੀ।"
-
-#: ../capplet/settings/mail-account-view.c:657
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-"ਅਫਸੋਸ, ਅਸੀਂ ਤੁਹਾਡੀ ਮੇਲ ਲਈ ਆਟੋਮੈਟਿਕ ਸੈਟਿੰਗ ਨਹੀਂ ਲੈ ਸਕੇ। ਇਹ ਹੇਠਾਂ ਦਰਜ ਕਰੋ ਜੀ। "
-"ਅਸੀਂ ਤੁਹਾਡੇ ਵਲੋਂ "
-"ਦਿੱਤੀ ਗਈ ਜਾਣਕਾਰੀ ਮੁਤਾਬਕ ਪੂਰਾ ਵੇਰਵਾ ਲੈਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਤਾਂ ਕੀਤੀ ਹੈ, ਪਰ ਤੁਹਾਨੂੰ "
-"ਉਹਨਾਂ ਨੂੰ ਬਦਲਣਾ ਵੀ "
-"ਪੈ ਸਕਦਾ ਹੈ।"
-
-#: ../capplet/settings/mail-account-view.c:659
-msgid "You can specify more options to configure the account."
-msgstr "ਤੁਸੀਂ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਲਈ ਹੋਰ ਚੋਣਾਂ ਦੇ ਸਕਦੇ ਹੋ।"
-
-#: ../capplet/settings/mail-account-view.c:661
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-"ਹੁਣ ਤੁਹਾਨੂੰ ਮੇਲ ਭੇਜਣ ਲਈ ਸੈਟਿੰਗ ਦੇਣ ਦੀ ਲੋੜ ਹੈ। ਅਸੀਂ ਕੁਝ ਅੰਦਾਜ਼ਾ ਲਗਾਉਣ ਦੀ "
-"ਕੋਸ਼ਿਸ਼ ਕਰ ਚੁੱਕੇ ਹਾਂ, ਪਰ "
-"ਤੁਹਾਨੂੰ ਇਹ ਚੈੱਕ ਕਰ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਕਿ ਉਹ ਠੀਕ ਹਨ।"
-
-#: ../capplet/settings/mail-account-view.c:662
-msgid "You can specify your default settings for your account."
-msgstr "ਤੁਸੀਂ ਆਪਣੇ ਅਕਾਊਂਟ ਲਈ ਆਪਣੀ ਡਿਫਾਲਟ ਸੈਟਿੰਗ ਦੇ ਸਕਦੇ ਹੋ।"
-
-#: ../capplet/settings/mail-account-view.c:663
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr ""
-"ਸਮਾਂ ਹੈ ਚੈੱਕ ਕਰਨ ਦਾ, ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਿ ਅਸੀਂ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ "
-"ਕਰੀਏ ਅਤੇ ਤੁਹਾਡੀਆਂ "
-"ਮੇਲਾਂ ਲੈਣੀਆਂ ਸ਼ੁਰੂ ਕਰੀਏ।"
-
-#: ../capplet/settings/mail-account-view.c:678
-#: ../mail/em-account-editor.c:2948 ../mail/em-account-editor.c:3087
-msgid "Identity"
-msgstr "ਪਛਾਣ"
-
-#: ../capplet/settings/mail-account-view.c:678
-msgid "Next - Receiving mail"
-msgstr "ਅੱਗੇ - ਈਮੇਲ ਲੈਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Receiving mail"
-msgstr "ਈਮੇਲ ਲੈਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:679
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Next - Sending mail"
-msgstr "ਅੱਗੇ - ਈਮੇਲ ਭੇਜਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Back - Identity"
-msgstr "ਪਿੱਛੇ - ਪਛਾਣ"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Next - Receiving options"
-msgstr "ਅੱਗੇ - ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
-
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Receiving options"
-msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
-
-#: ../capplet/settings/mail-account-view.c:680
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving mail"
-msgstr "ਪਿੱਛੇ - ਮੇਲ ਲੈਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Sending mail"
-msgstr "ਮੇਲ ਭੇਜਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:682
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Next - Review account"
-msgstr "ਅੱਗੇ - ਅਕਾਊਂਟ ਪੜਤਾਲ"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Next - Defaults"
-msgstr "ਅੱਗੇ - ਡਿਫਾਲਟ"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving options"
-msgstr "ਪਿੱਛੇ - ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
-
-#: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4100
-msgid "Defaults"
-msgstr "ਮੂਲ"
-
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Back - Sending mail"
-msgstr "ਪਿੱਛੇ - ਮੇਲ ਭੇਜਣੀਆਂ"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Review account"
-msgstr "ਅਕਾਊਂਟ ਪੜਤਾਲ"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Finish"
-msgstr "ਮੁਕੰਮਲ"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Back - Sending"
-msgstr "ਪਿੱਛੇ - ਭੇਜਣਾ"
-
-#: ../capplet/settings/mail-account-view.c:855
-msgid "Setup Google contacts with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ ਸੰਪਰਕ ਸੈਟਅੱਪ"
-
-#: ../capplet/settings/mail-account-view.c:856
-msgid "Setup Google calendar with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
-
-#: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4928
-msgid "You may need to enable IMAP access."
-msgstr "ਤੁਹਾਨੂੰ IMAP ਅਸੈੱਸ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"
-
-#: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4905
-msgid "Google account settings:"
-msgstr "ਗੂਗਲ ਅਕਾਊਂਟ ਸੈਟਿੰਗ:"
-
-#: ../capplet/settings/mail-account-view.c:895
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਯਾਹੂ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
-
-#: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4975
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr ""
-"ਯਾਹੂ ਕੈਲੰਡਰ ਪਹਿਲਾਂ ਨਾਂ_ਆਖਰੀ ਨਾਂ ਰਾਹੀਂ ਰੱਖਦੇ ਹਨ। ਅਸੀਂ ਕੈਲੰਡਰ ਨਾਂ ਬਣਾਉਣ ਦੀ "
-"ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਹੈ। "
-"ਇਸਕਰਕੇ ਕੈਲੰਡਰ ਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ, ਜੇ ਠੀਕ ਨਾ ਹੋਵੇ ਤਾਂ ਕੈਲੰਡਰ ਨਾਂ ਫੇਰ ਲਿਖੋ।"
-
-#: ../capplet/settings/mail-account-view.c:908
-#: ../mail/em-account-editor.c:4960
-msgid "Yahoo account settings:"
-msgstr "ਯਾਹੂ ਅਕਾਊਂਟ ਸੈਟਿੰਗ:"
-
-#: ../capplet/settings/mail-account-view.c:922
-msgid "Yahoo Calendar name:"
-msgstr "ਯਾਹੂ ਕੈਲੰਡਰ ਨਾਂ:"
-
-#: ../capplet/settings/mail-account-view.c:1119
-msgid "Password:"
-msgstr "ਪਾਸਵਰਡ:"
-
-#: ../capplet/settings/mail-account-view.c:1173
-#: ../capplet/settings/mail-settings-view.c:262
-msgid "Close Tab"
-msgstr "ਟੈਬ ਬੰਦ ਕਰੋ"
-
-#: ../capplet/settings/mail-account-view.c:1185
-msgid "Account Wizard"
-msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ"
-
-#: ../capplet/settings/mail-capplet-shell.c:212
-msgid "Evolution account assistant"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
-
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:534
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
-
-#: ../capplet/settings/mail-settings-view.c:152
-#, c-format
-msgid "Modify %s..."
-msgstr "%s ਸੋਧ..."
-
-#: ../capplet/settings/mail-settings-view.c:154
-msgid "Add a new account"
-msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
-
-#: ../capplet/settings/mail-settings-view.c:194
-msgid "Account management"
-msgstr "ਅਕਾਊਂਟ ਪਰਬੰਧ"
-
-#: ../capplet/settings/mail-settings-view.c:274
-msgid "Settings"
-msgstr "ਸੈਟਿੰਗ"
-
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:211
+#: ../widgets/misc/e-mail-signature-editor.c:285
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
@@ -7069,7 +6688,7 @@ msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(_M)"
 msgid "Open New Message window"
 msgstr "ਨਵੀਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੰਰਚਨਾ"
 
@@ -7105,7 +6724,7 @@ msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ(_D)"
 msgid "Save as draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
 msgid "S_end"
 msgstr "ਭੇਜੋ(_e)"
 
@@ -7197,15 +6816,15 @@ msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿ�
 msgid "Save Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the recipients of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:45
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸੁਨੇਹੇ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੇ"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:48
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7215,75 +6834,60 @@ msgstr ""
 "ਐਡਰੈੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:849
 msgid "Fr_om:"
 msgstr "ਵਲੋਂ(_o):"
 
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:856
 msgid "_Reply-To:"
 msgstr "ਜਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:792
+#: ../composer/e-composer-header-table.c:861
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:797
+#: ../composer/e-composer-header-table.c:867
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:802
+#: ../composer/e-composer-header-table.c:873
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
 #  * Post-To
-#: ../composer/e-composer-header-table.c:807
+#: ../composer/e-composer-header-table.c:878
 msgid "_Post To:"
 msgstr "ਭੇਜੋ(_P):"
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:882
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:820
+#: ../composer/e-composer-header-table.c:890
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-composer-private.c:215
-msgid "Undo the last action"
-msgstr "ਪਿਛਲੀ ਕਾਰਵਾਈ ਵਾਪਸ ਲਵੋ"
-
-#: ../composer/e-composer-private.c:219
-msgid "Redo the last undone action"
-msgstr "ਆਖਰੀ ਵਾਪਸ ਕੀਤੀ ਕਾਰਵਾਈ ਨੂੰ ਮੁੜ-ਕਰੋ"
-
-#: ../composer/e-composer-private.c:223
-msgid "Search for text"
-msgstr "ਟੈਕਸਟ ਖੋਜੋ"
-
-#: ../composer/e-composer-private.c:227
-msgid "Search for and replace text"
-msgstr "ਟੈਕਸਟ ਦੀ ਖੋਜ ਕਰੋ ਅਤੇ ਬਦਲੋ"
-
-#: ../composer/e-composer-private.c:337
+#: ../composer/e-composer-private.c:345
 msgid "Save draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:856
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ਬਾਹਰੀ ਸੁਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:865
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7292,15 +6896,15 @@ msgstr ""
 "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ੍ਰਿਪਸ਼ਨ "
 "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4198
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ਲੇਖਣ ਵਿੱਚ ਕੁਝ ਨਾ-ਟੈਕਸਟ ਭਾਗ ਹੈ, ਜਿਸ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../composer/e-msg-composer.c:4867
+#: ../composer/e-msg-composer.c:4875
 msgid "Untitled Message"
 msgstr "ਗ਼ੈਰ-ਟਾਇਟਲ ਸੁਨੇਹਾ"
 
@@ -7451,7 +7055,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ "
 "ਰੱਖਣਾ ਾਹਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਕੀ ਤ"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "ਰਿਪੋਰਟ ਕੀਤੀ ਗਲਤੀ &quot;{0}&quot; ਸੀ।"
 
@@ -7494,13 +7098,13 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਅਲਾਰਮ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 msgid "Calendar event notifications"
 msgstr "ਕੈਲੰਡਰ ਈਵੈਂਟ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
 msgid "Groupware Suite"
 msgstr "ਗਰੁੱਪਵੇਅਰ ਸੂਟ"
 
@@ -7521,8 +7125,6 @@ msgid "Configure email accounts"
 msgstr "ਈਮੇਲ ਅਕਾਊਂਟ ਸੰਰਚਨਾ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
-#| msgid "Calendar information"
 msgid "Enable address formatting"
 msgstr "ਐਡਰੈਸ ਫਾਰਮੈਟ ਕਰਨਾ ਚਾਲੂ"
 
@@ -7533,12 +7135,10 @@ msgid ""
 msgstr "ਕੀ ਐਡਰੈਸ ਨੂੰ ਟਿਕਾਣਾ ਦੇਸ਼ਨ ਦੇ ਮਿਆਰ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕਰਨਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Autocomplete length"
 msgstr "ਸਵੈ-ਪੂਰਤੀ ਲੰਬਾਈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -7546,12 +7146,10 @@ msgstr ""
 "ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸਵੈ ਪੂਰਨ ਕਾਰਵਾਈ ਨੂੰ ਸ਼ੁਰੂ ਕਰੇ, ਅੱਖਰਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "ਐਡਰੈੱਸ ਨਾਲ ਆਟੋ-ਪੂਰਾ ਨਾਂ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -7559,22 +7157,18 @@ msgstr ""
 "ਕੀ ਐਂਟਰੀ ਵਿੱਚ ਆਟੋ-ਪੂਰਨ ਸੰਪਰਕ ਦੇ ਨਾਂ ਨਾਲ ਮੇਲ ਐਡਰੈੱਸ ਵੇਖਾਉਣ ਲਈ ਮਜਬੂਰ ਕਰਨਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ਨਾਂ ਡਾਈਲਾਗ ਵਿੱਚ ਚੁਣੇ ਅਖੀਰੀ ਫੋਲਡਰ ਦਾ URI"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ਚੁਣੇ ਨਾਂ ਡਾਈਲਾਗ ਵਿੱਚ ਚੁਣੇ ਅਖੀਰੀ ਫੋਲਡਰ ਦਾ URI ਹੈ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "ਸੰਪਰਕ ਲੇਆਉਟ ਸਟਾਈਲ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.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 "
@@ -7582,50 +7176,39 @@ msgid ""
 "contact list."
 msgstr ""
 "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਸੰਪਰਕ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
-"\"0"
-"\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੰਪਰਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
-"ਝਲਕ "
+"\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੰਪਰਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ "
+"ਝਲਕ) ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਸੰਪਰਕ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
 msgstr "ਸੰਪਰਕ ਝਲਕ ਬਾਹੀ ਸਥਿਤੀ (ਹਰੀਜੱਟਲ)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "ਸੰਪਰਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਹਰੀਜੱਟਲ ਹੋਵੇ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
 msgstr "ਸੰਪਰਕ ਝਲਕ ਬਾਹੀ ਸਥਿਤੀ (ਵਰਟੀਕਲ)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "ਸੰਪਰਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 msgid "Show maps"
 msgstr "ਨਕਸ਼ੇ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#| msgid "Whether to show maps in preview pane."
 msgid "Whether to show maps in preview pane"
 msgstr "ਕੀ ਝਲਕ ਪੱਟੀ ਵਿੱਚ ਨਕਸ਼ੇ ਵੇਖਾਉਣੇ ਹਨ।"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 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"
@@ -7633,22 +7216,18 @@ msgstr ""
 "\"ਸੰਪਰਕ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਐਡਰੈੱਸ ਬੁੱਕ ਦੀ UID ਹੈ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "Show preview pane"
 msgstr "ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "ਕੀ ਝਲਕ ਪੈਨ ਵੇਖਾਉਣੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -7657,34 +7236,26 @@ msgstr ""
 "ਅੱਖਰ ਸੈੱਟ ਤੋਂ ਆਉਦੇ ਹਨ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Save directory for reminder audio"
 msgstr "ਰੀਮਾਈਡਰ ਆਡੀਓ ਲਈ ਸੰਭਾਲਣ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Directory for saving reminder audio files"
 msgstr "ਰੀਮਾਈਡਰ ਆਡੀਓ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Birthday and anniversary reminder value"
 msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਡਰ ਮੁੱਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#| msgid "Number of units for determining a birthday or anniversary reminder."
 msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇਗੰਢ ਰੀਮਾਈਡਰ ਜਾਣਨ ਲਈ ਇਕਾਈਆਂ ਦੀ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਡਰ ਯੂਨਿਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#| msgid ""
-#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-#| "\"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\""
@@ -7692,14 +7263,10 @@ msgstr ""
 "ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਡਰ ਲਈ ਯੂਨਿਟ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Compress weekends in month view"
 msgstr "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤੇ ਸਮੇਟੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-#| msgid ""
-#| "Whether to compress weekends in the month view, which puts Saturday and "
-#| "Sunday in the space of one weekday."
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday"
@@ -7709,36 +7276,26 @@ msgstr ""
 "ਵੇਖਾਇਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "Ask for confirmation when deleting items"
 msgstr "ਆਈਟਮਾਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#| msgid ""
-#| "Whether to ask for confirmation when deleting an appointment or task."
 msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#| msgid ""
-#| "Whether to ask for confirmation when expunging appointments and tasks."
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "ਕੀ ਮੁਲਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Month view vertical pane position"
 msgstr "ਮਹੀਨਾ ਦਿੱਖ ਲੰਬਕਾਰੀ ਪੱਟੀ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#| msgid ""
-#| "Position of the vertical pane, between the calendar lists and the date "
-#| "navigator calendar."
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar"
@@ -7747,54 +7304,42 @@ msgstr ""
 "ਵਿੱਚ ਹੈ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Workday end hour"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Workday end minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਮਿੰਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਖਤਮ ਹੋਣ, ੦ ਤੋਂ ੫੯"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Workday start hour"
 msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Workday start minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਮਿੰਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਸ਼ੁਰੂ ਹੋਣ, ੦ ਤੋਂ ੫੯"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#| msgid ""
-#| "Shows the second time zone in a Day View, if set. Value is similar to one "
-#| "used in a 'timezone' key."
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
@@ -7803,24 +7348,18 @@ msgstr ""
 "ਵਿੱਚ ਵਰਤੇ ਵਾਂਗ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਵਰਤੇ ਤਾਜ਼ਾ ਦੂਜੇ ਸਮਾਂ ਜ਼ੋਨ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-#| msgid "List of recently used second time zones in a Day View."
 msgid "List of recently used second time zones in a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤੇ ਦੂਜੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-#| msgid "Maximum number of recently used timezones to remember."
 msgid "Maximum number of recently used timezones to remember"
 msgstr "ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#| msgid ""
-#| "Maximum number of recently used timezones to remember in a "
-#| "'day_second_zones' list."
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
@@ -7828,127 +7367,99 @@ msgstr ""
 "'day_second_zones' ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid "Default reminder value"
 msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਮੁੱਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#| msgid "Number of units for determining a default reminder."
 msgid "Number of units for determining a default reminder"
 msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ (ਰੀਮਾਈਡਰ) ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid "Default reminder units"
 msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਯੂਨਿਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
 msgid "Show status field in the event/task/meeting editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Show timezone field in the event/meeting editor"
 msgstr "ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Show type field in the event/task/meeting editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖਣ ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Hide completed tasks"
 msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-#| msgid "Whether to hide completed tasks in the tasks view."
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid "Hide task units"
 msgstr "ਕੰਮ ਆਈਟਮਾਂ ਓਹਲੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-#| 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 "ਟਾਸਕ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid "Hide task value"
 msgstr "ਟਾਸਕ ਮੁੱਲ ਓਹਲੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-#| msgid "Number of units for determining when to hide tasks."
 msgid "Number of units for determining when to hide tasks"
 msgstr "ਟਾਸਕ (ਕੰਮ) ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Horizontal pane position"
 msgstr "ਖਿਤਿਜੀ ਪੱਟੀ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-#| msgid ""
-#| "Position of the horizontal pane, between the date navigator calendar and "
-#| "the task list when not in the month view, in pixels."
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
@@ -7958,99 +7469,74 @@ msgstr ""
 "ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Last reminder time"
 msgstr "ਪਿਛਲਾ ਰੀਮਾਈਡਰ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-#| msgid "Time the last reminder ran, in time_t."
 msgid "Time the last reminder ran, in time_t"
 msgstr "ਸਮਾਂ ਜਦੋਂ ਰੀਮਾਈਡਰ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਦਿਨ ਝਲਕ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-#| msgid "Color to draw the Marcus Bains line in the Day View."
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਸਮਾਂ ਰੇਖਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#| msgid ""
-#| "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "ਸਮਾਂ ਰੇਖਾ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਖਿੱਚਣ ਲਈ ਰੰਗ (ਮੂਲ ਖਾਲੀ ਹੈ)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#| msgid ""
-#| "Whether to draw the Marcus Bains Line (line at current time) in the "
-#| "calendar."
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "ਕੀ ਕੈਲੰਡਰ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ (ਮੌਜੂਦਾ ਸਮੇਂ ਦੀ ਰੇਖਾ) ਖਿੱਚਣੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
 msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਸਥਿਤੀ (ਹਰੀਜੱਟਲ)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-#| msgid "Position of the task preview pane when oriented horizontally."
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਹਰੀਜੱਟਲ ਹੋਵੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "ਮੀਮੋ ਲੇਆਉਟ ਸਟਾਈਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-#| 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 "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
-"ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਮੀਮੋ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। \"0"
-"\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
-"ਝਲਕ "
+"ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਮੀਮੋ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
+"\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ "
+"ਝਲਕ) ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
 msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਸਥਿਤੀ (ਵਰਟੀਕਲ)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-#| msgid "Position of the memo preview pane when oriented vertically."
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "ਖਿਤਿਜੀ ਪਾਸੇ ਦੀ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#| msgid ""
-#| "Position of the horizontal pane, between the view and the date navigator "
-#| "calendar and task list in the month view, in pixels."
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
@@ -8060,32 +7546,26 @@ msgstr ""
 "ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#| msgid "Whether to scroll a Month View by a week, not by a month."
 msgid "Scroll Month View by a week, not by a month"
 msgstr "ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#| msgid "Whether to scroll a Month View by a week, not by a month."
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Reminder programs"
 msgstr "ਰੀਮਾਈਡਰ ਪ੍ਰੋਗਰਾਮ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#| msgid "Programs that are allowed to be run by reminders."
 msgid "Programs that are allowed to be run by reminders"
 msgstr "ਪ੍ਰੋਗਰਾਮ, ਜੋ ਕਿ ਰੀਮਾਈਡਰ ਵਲੋਂ ਚਲਾਉਣ ਦੀ ਇਜ਼ਾਜ਼ਤ ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Show display reminders in notification tray"
 msgstr "ਰੀਮਾਈਡਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#| msgid "Whether or not to use the notification tray for display reminders."
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "ਰੀਮਾਈਡਰ ਵੇਖਾਉਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
@@ -8098,14 +7578,10 @@ msgid "Name of the preferred New toolbar button item"
 msgstr "ਪਸੰਦੀਦਾ ਨਵੀਂ ਟੂਲਬਾਰ ਬਟਨ ਆਈਟਮ ਦਾ ਨਾਂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਕੈਲੰਡਰ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#| msgid ""
-#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
-#| "\"Calendar\" view."
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8113,43 +7589,31 @@ msgstr ""
 "'ਕੈਲੰਡਰ' ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਕੈਲੰਡਰੀ ਲਿਸਟ ਦੀ UID ਹੈ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਮੀਮੋ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-#| msgid ""
-#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
-#| "\"Memos\" view."
 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:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਟਾਸਕ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-#| msgid ""
-#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
-#| "\"Tasks\" view."
 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:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਟੈਪਲੇਟ URL"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 #, 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."
 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"
@@ -8159,199 +7623,149 @@ msgstr ""
 "ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "ਮੁੜ-ਹੋਣ ਵਾਲੇ ਈਵੈਂਟ ਤਿਰਛੇ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
-#| msgid ""
-#| "Show days with recurrent events in italic font in bottom left calendar."
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "ਖੱਬੇ ਪਾਸੇ ਹੇਠਾਂ ਕੈਲੰਡਰ ਵਿੱਚ ਮੁੜ ਵਾਪਰਨ ਵਾਲੇ ਈਵੈਂਟ ਲਈ ਦਿਨ ਤਿਰਛੇ ਰੂਪ 'ਚ ਵੇਖਾਉ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-#| msgid "Delete the selected calendar"
-msgid "List of selected calendars"
-msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਦੀ ਸੂਚੀ"
+msgid "Search range for time-based searching in years"
+msgstr "ਸਮਾਂ ਅਧਾਰਿਤ ਖੋਜ ਕਰਨ ਲਈ ਖੋਜ ਹੱਦ ਸਾਲਾਂ ਵਿੱਚ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-#| msgid "List of available calendars:"
-msgid "List of calendars to load"
-msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ ਦੀ ਸੂਚੀ"
+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 "
+"years"
+msgstr ""
+"ਮੌਜੂਦਾ ਚੁਣੇ ਦਿਨ ਤੋਂ ਖੋਜ ਕਿੰਨੇ ਸਾਲਾਂ ਲਈ ਸਮਾਂ ਅਧਾਰਿਤ ਖੋਜ ਅੱਗੇ ਜਾਂ ਪਿੱਛੇ ਕੀਤੀ ਜਾ "
+"ਸਕਦੀ ਹੈ, ਜਦੋਂ ਹੋਰ "
+"ਮੌਜੂਦਗੀ ਦੀ ਜਾਂਚ ਕਰਨੀ ਹੋਵੇ; ਡਿਫਾਲਟ 10 ਸਾਲ ਹੈ।"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-#| msgid "Delete the selected memo list"
-msgid "List of selected memo lists"
-msgstr "ਚੁਣੇ ਮੀਮੋ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-#| msgid "The registry of memo lists"
-msgid "List of memo lists to load"
-msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੇ ਮੀਮੋ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#| msgid "Delete the selected task list"
-msgid "List of selected task lists"
-msgstr "ਚੁਣੀਆਂ ਟਾਸਕ ਦੀ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#| msgid "The registry of task lists"
-msgid "List of task lists to load"
-msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੀ ਟਾਸਕ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#| msgid ""
-#| "Whether to display the end time of events in the week and month views."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 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:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
 msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-#| msgid "If \"true\", show the memo preview pane in the main window."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Show the task preview pane"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-#| msgid "If \"true\", show the task preview pane in the main window."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "ਦਿਨ ਝਲਕ, ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#| msgid "Whether to show week numbers in various places in the Calendar."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "ਕੀ ਕੈਲੰਡਰ 'ਚ ਕਈ ਥਾਵਾਂ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-#| msgid "Vertical Position"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Vertical position for the tag pane"
 msgstr "ਟੈਗ ਬਾਹੀ ਲਈ ਲੰਬਕਾਰੀ ਸਥਿਤੀ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#| msgid "T_asks due today:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਨੂੰ ਉਭਾਰੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "ਕੀ ਅੱਜ ਦੀਆਂ ਟਾਸਕ ਨੂੰ ਖਾਸ ਰੰਗ ਨਾਲ ਉੜਾਘਨਾ ਹੈ (ਅੱਜ-ਦੀਆਂ-ਟਾਸਕ-ਰੰਗ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Tasks due today color"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-#| msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 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:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਸਥਿਤੀ (ਹਰੀਜੱਟਲ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Task layout style"
 msgstr "ਟਾਸਕ ਲੇਆਉਟ ਸਟਾਈਲ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-#| 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:105
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
 "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਟਾਸਕ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
-"\"0\" "
-"(ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) ਝਲਕ "
+"\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ "
+"ਝਲਕ) ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਸਥਿਤੀ (ਵਰਟੀਕਲ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-#| msgid "Position of the task preview pane when oriented vertically."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#| msgid "_Overdue tasks:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
 msgstr "ਸਮਾਂ-ਲੰਘੀਆਂ ਟਾਸਕਾਂ ਉਭਾਰੋ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "ਕੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀਆਂ ਟਾਸਕ ਨੂੰ ਖਾਸ ਰੰਗ ਨਾਲ ਉੜਾਘਨਾ ਹੈ (ਮਿਆਦ-ਲੰਘੀ-ਟਾਸਕ-ਰੰਗ)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Overdue tasks color"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-#| msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 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:116
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
 msgstr "ਸਮਾਂ ਵੰਡ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-#| msgid "Intervals shown in Day and Work Week views, in minutes."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
 msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#| msgid ""
-#| "The default timezone to use for dates and times in the calendar, as an "
-#| "untranslated Olsen timezone database location like \"America/New York\"."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8360,126 +7774,94 @@ msgstr ""
 "ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
 "ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
 msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-#| msgid ""
-#| "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 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:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Birthday and anniversary reminder"
 msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਡਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#| msgid "Whether to set a reminder for birthdays and anniversaries."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "ਕੀ ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Default appointment reminder"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#| msgid "Whether to set a default reminder for appointments."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether to set a default reminder for appointments"
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Use system timezone"
 msgstr "ਸਿਸਟਮ ਟਾਈਮ-ਜ਼ੋਨ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#| msgid ""
-#| "Use the system timezone instead of the timezone selected in Evolution."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਚੁਣੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਸਮਾਂ-ਖੇਤਰ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#| msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ ਹੋਣ ਦਾ ਦਿਨ, ਐਤਵਾਰ (੦) ਤੋਂ ਸ਼ਨਿਚੱਰਵਾਰ (੬)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Work days"
 msgstr "ਕਾਰਜੀ ਦਿਨ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
-#| msgid "Days on which the start and end of work hours should be indicated."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "ਦਿਨ, ਜਿੰਨਾ ਤੋਂ ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਸ਼ੁਰੂ ਅਤੇ ਅੰਤ ਹੁੰਦੇ ਹਨ, ਵੇਖਾਉਣ ਲ਼ਈ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Configuration version"
-msgstr "ਸੰਰਚਨਾ ਵਰਜਨ"
+#| msgid "Evolution Restore"
+msgid "Previous Evolution version"
+msgstr "ਪਿਛਲਾ ਈਵੇਲੂਸ਼ਨ ਵਰਜਨ"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Last upgraded configuration version"
-msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+"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."
 msgstr ""
-"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ "
-"\"2.6.0"
-"\")"
+"ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਭ ਤੋਂ ਨਵੇਂ ਵਰਜਨ ਨੂੰ \"major.minor.micro\" ਵਜੋਂ ਦਰਸਾਇਆ ਜਾਂਦਾ ਹੈ। "
+"ਇਹ ਪੁਰਾਣੇ ਤੋਂ "
+"ਨਵੇਂ ਵਰਜਨ ਲਈ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#| msgid "Enable and disable plugins"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
 msgstr "ਬੰਦ ਕੀਤੀਆਂ ਪਲੱਗਇਨ ਦੀ ਸੂਚੀ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਬੰਦ ਕੀਤੀਆਂ ਪਲੱਗਇਨ ਦੀ ਸੂਚੀ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#| msgid "Default window X coordinate"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
 msgstr "ਵਿੰਡੋ X ਧੁਰਾ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#| msgid "Default window Y coordinate"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The window's Y coordinate"
 msgstr "ਵਿੰਡੋ Y ਧੁਰਾ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
-#| msgid "The window to which the shell view belongs"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
 msgid "The window's width in pixels"
 msgstr "ਪਿਕਸਲ ਵਿੱਚ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
-#| msgid "Default window height"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
 msgid "The window's height in pixels"
 msgstr "ਵਿੰਡੋ ਦੀ ਉਚਾਈ ਪਿਕਸਲ ਵਿੱਚ"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:11
-#| msgid "Whether or not the window should be maximized."
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
 msgstr "ਕੀ ਵਿੰਡੋ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਕਰਨਾ ਹੈ"
 
@@ -8500,37 +7882,28 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "ਕੀ ਗਨੋਮ ਕੈਲੰਡਰ ਤੋਂ ਟਾਸਕ ਇੰਪੋਰਟ ਕਰਨੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਈਵੇਲੂਸ਼ਨ ਡਿਫਾਲਟ ਮੇਲਰ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "ਹਰ ਵਾਰ ਜਦੋਂ ਵੀ ਈਵੇਲੂਸ਼ਨ ਚੱਲ ਤਾਂ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਡਿਫਾਲਟ ਮੇਲਰ ਹੈ ਜਾਂ ਨਹੀਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Default charset in which to compose messages"
 msgstr "ਸੁਨੇਹਾ ਬਣਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Default charset in which to compose messages."
 msgstr "ਸੁਨੇਹਾ ਬਣਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Path where picture gallery should search for its content"
 msgstr "ਪਾਥ, ਜਿੱਥੇ ਤਸਵੀਰ ਗੈਲਰੀ ਇਸ ਦੀ ਸਮੱਗਰੀ ਲੱਭੇ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#| 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 "
@@ -8542,44 +7915,34 @@ msgstr ""
 "ਫੋਲਡਰ ਲਈ ਪੁਆਇੰਟ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "ਲਾਈਨ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ਤੁਹਾਡੇ ਲਿਖਣ ਦੌਰਾਨ ਹੀ ਸ਼ਬਦਾਂ ਤੇ ਸ਼ਬਦ-ਜੋੜ ਗਲਤੀਂ ਕੱਢੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਲਿੰਕ ਪਛਾਣ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "ਟੈਕਸਟ ਵਿੱਚ ਲਿੰਕਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਤਬਦੀਲ ਕਰੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "ਆਟੋਮੈਟਿਕ ਈਮੋਸ਼ਨ ਪਛਾਣ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#| msgid "Attribute message."
 msgid "Attribute message"
 msgstr "ਗੁਣ ਸੁਨੇਹਾ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-#| msgid ""
-#| "The text that is inserted when replying to a message, attributing the "
-#| "message to the original author."
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -8589,14 +7952,10 @@ msgstr ""
 "ਸੁਨੇਹਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-#| msgid "Forward message."
 msgid "Forward message"
 msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#| msgid ""
-#| "The text that is inserted when forwarding a message, saying that the "
-#| "forwarded message follows."
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -8605,14 +7964,10 @@ msgstr ""
 "ਭੇਜਿਆ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#| msgid "Original message."
 msgid "Original message"
 msgstr "ਅਸਲੀ ਸੁਨੇਹਾ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-#| msgid ""
-#| "The text that is inserted when replying to a message (top posting), "
-#| "saying that the original message follows."
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -8622,12 +7977,10 @@ msgstr ""
 "ਲਿਖਿਆ ਹੈ ਕਿ ਅਸਲੀ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Group Reply replies to list"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ ਲਿਸਟ ਨੂੰ ਜਵਾਬ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 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 "
@@ -8641,12 +7994,10 @@ msgstr ""
 "ਪ੍ਰਾਪਤ ਕੀਤਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "ਜਵਾਬਾਂ ਦੇ ਹੇਠਾਂ ਕਰਸਰ ਰੱਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8657,52 +8008,42 @@ msgstr ""
 "ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਜਾਂ ਹੇਠਾਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Always request read receipt"
 msgstr "ਪੜ੍ਹਨ ਰਸੀਦ ਦੀ ਹਮੇਸ਼ਾ ਮੰਗ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ਕੀ ਮੂਲ ਰੂਪ ਵਿੱਚ ਹਰੇਕ ਸੁਨੇਹੇ ਨਾਲ ਜਵਾਬੀ ਰਸੀਦ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਵੇ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲਟ HTML ਪੱਤਰ ਭੇਜੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲਟ HTML ਪੱਤਰ ਭੇਜੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੰਗ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ਜਦੋਂ ਇਨ-ਲਾਈਨ ਸਪੈਲਿੰਗ ਦੀ ਵਰਤੋਂ ਹੋਵੇ ਤਾਂ ਗਲਤ ਸ਼ਬਦ ਲਈ ਹੇਠਾਂ ਲਾਈਨ ਲਈ ਰੰਗ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਭਾਸ਼ਾਵਾਂ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "ਜਦੋਂ ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Bcc\" ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8712,12 +8053,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "ਜਦੋਂ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Cc\" ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8727,12 +8066,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8742,12 +8079,10 @@ msgstr ""
 "ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਵਿੱਚ ਭੇਜਣ ਦੌਰਾਨ \"ਵਲੋਂ\" ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8757,12 +8092,10 @@ msgstr ""
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8772,34 +8105,24 @@ msgstr ""
 "ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#| msgid "_Keep signature above the original message on replying"
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 "ਜਦੋਂ ਅਸਲੀ ਸੁਨੇਹੇ ਨੂੰ ਸਾਇਨ ਕੀਤਾ ਹੋਵੇ ਤਾਂ ਜਵਾਬ ਨੂੰ ਡਿਜ਼ਿਟਲ ਰੂਪ ਵਿੱਚ ਸਾਇਨ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 msgstr ""
 "ਜਦੋਂ ਸੁਨੇਹੇ ਦਾ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ, ਜੋ ਕਿ PGP ਜਾਂ S/MIME ਸਾਇਣ ਹੋਵੇ ਤਾਂ PGP ਅਤੇ "
-"S/MIME ਦਸਤਖਤ "
-"ਆਪਣੇ-ਆਪ ਹੀ ਚਾਲੂ ਕਰੋ।"
+"S/MIME ਦਸਤਖਤ ਆਪਣੇ-"
+"ਆਪ ਹੀ ਚਾਲੂ ਕਰੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:33
-#| msgid "Encode file names in an Outlook/GMail way"
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "ਆਉਟਲੁੱਕ/ਜੀਮੇਲ ਢੰਗ ਨਾਲ ਫਾਇਲ-ਨਾਂ ਇੰਕੋਡ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:34
-#| msgid ""
-#| "Encode file names in the mail headers same as Outlook or GMail do, to let "
-#| "them display correctly file names with UTF-8 letters sent by Evolution, "
-#| "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-#| "standard."
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8813,12 +8136,10 @@ msgstr ""
 "੨੦੪੭ ਸਟੈਂਡਰਡ ਨੂੰ ਮੰਨਦੇ ਹਨ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "ਜਵਾਬ ਦੇ ਉੱਤੇ ਨਿੱਜੀ ਦਸਤਖਤ ਦਿਓ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8829,12 +8150,10 @@ msgstr ""
 "ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਕਿ ਹੇਠਾਂ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "ਦਸਤਖਤ ਡੀਲਿਮਟਰ ਸ਼ਾਮਲ ਨਾ ਕਰੋ"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8844,12 +8163,10 @@ msgstr ""
 "ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ ਦਿਓ ਅਣਡਿੱਠਾ:"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 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. "
@@ -8882,16 +8199,35 @@ msgid ""
 "prefix. An example is 'SV,AV'."
 msgstr ""
 "ਵਿਸ਼ਾ ਵਾਕ ਵਿੱਚ ਲੋਕਲ 'ਜਵਾਬ(Re)' ਦੀ ਸੂਚੀ ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕਰਕੇ ਛੱਡਣ ਲਈ, ਜਦੋਂ "
-"ਸੁਨੇਹੇ "
-"ਲਈ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ, ਮਿਆਰੀ 'ਜਵਾਬ(Re)' ਅਗੇਤਰ ਦੇ ਨਾਲ। ਉਦਾਹਰਨ ਲਈ 'SV,AV'।"
+"ਸੁਨੇਹੇ ਲਈ ਜਵਾਬ "
+"ਦੇਣਾ ਹੋਵੇ, ਮਿਆਰੀ 'ਜਵਾਬ(Re)' ਅਗੇਤਰ ਦੇ ਨਾਲ। ਉਦਾਹਰਨ ਲਈ 'SV,AV'।"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr "ਚੱਕਣ-ਸੁੱਟਣ ਕਾਰਵਾਈ ਲਈ ਫਾਇਲ ਫਾਰਮੈਟ ਸੰਭਾਲੋ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr "'mbox' ਜਾਂ 'pdf' ਹੋ ਸਕਦਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Save name format for drag-and-drop operation"
+msgstr "ਚੱਕਣ-ਸੁੱਟਣ ਕਾਰਵਾਈ ਲਈ ਨਾਂ ਫਾਰਮੈਟ ਸੰਭਾਲੋ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+msgstr ""
+"ਮੌਜੂਦਾ ਮਿਤੀ ਅਤੇ ਸਮਾਂ ਲਈ 2 ਵਰਤੋਂ ਜਾਂ ਸੁਨੇਹਾ ਦੀ ਭੇਜਣ ਮਿਤੀ ਲਈ ਹੋਰ ਮੁੱਲ ਦਿਉ। ਇਸ "
+"ਦਾ ਭਾਵ "
+"ਹੈ ਕਿ ਜਦੋਂ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾਂਦਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "ਚਿੱਤਰ ਐਨੀਮੇਸ਼ਨ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8900,35 +8236,29 @@ msgstr ""
 "ਕੀਤੇ ਅਤੇ ਸਥਿਰ ਚਿੱਤਰ "
 "ਹੀ ਪਸੰਦ ਕਰਦੇ ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "ਅੱਗੇ ਖੋਜ ਫੀਚਰ ਕਿਸਮ ਨੂੰ ਯੋਗ ਜਾਂ ਆਯੋਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "ਬਾਹਰੀ ਖੋਜ ਫੀਚਰ ਨੂੰ ਯੋਗ ਕਰੋ, ਜੋ ਕਿ ਫੋਲਡਰ ਨਾਂ ਦੀ ਖੋਜ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਈ ਅੰਡਾਕਾਰ-ਸਾਈਜ਼ ਯੋਗ ਜਾਂ ਆਯੋਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ਕੀ ਬਾਹੀ  ਵਿੱਚ ਅੰਡਾਕਾਰ ਫੋਲਡਰ ਨਾਂ ਫੀਚਰ ਆਯੋਗ ਕਰਨਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "ਮੈਜਿਕ ਸਪੇਸ ਬਾਰ ਯੋਗ ਜਾਂ ਆਯੋਗ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8936,63 +8266,51 @@ msgstr ""
 "ਇਸ ਨੂੰ ਯੋਗ ਕਰਨ ਨਾਲ ਸਪੇਸ ਬਾਰ ਸਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ, ਸੁਨੇਹਾ ਸੂਚੀ ਅਤੇ ਫੋਲਡਰ ਵਿੱਚ "
 "ਸਕਰੋਲ ਕਰੇਗੀ। "
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਲਈ ਰਲਦੇ ਸੁਨੇਹਾ ਲਿਸਟ ਝਲਕ ਸੈਟਿੰਗ ਵਰਤਣ ਲਈ ਚਾਲੂ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਲਈ ਰਲਦੇ ਸੁਨੇਹਾ ਲਿਸਟ ਝਲਕ ਸੈਟਿੰਗ ਵਰਤਣ ਲਈ ਚਾਲੂ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "ਕੀਟਾਟੀਓਨ ਉਭਾਰਨ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "ਕੀਟਾਟੀਓਨ ਉਭਾਰਨ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "ਕਾਰਟੀ ਮੋਡ ਯੋਗ/ਅਯੋਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ਕਾਰੀਟ ਮੋਡ ਯੋਗ, ਤਾਂ ਕਿ ਤੁਸੀਂ ਪੱਤਰ ਪੜਨ ਦੌਰਾਨ ਕਰਸਰ ਵੇਖਾ ਸਕੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਸਮੂਹ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਲਈ ਡਿਫਾਲਟ ਅੱਖਰ ਇਕੋਡਿੰਗ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸੁਨੇਹੇ ਲਈ HTTP ਤੋਂ ਚਿੱਤਰ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -9004,33 +8322,27 @@ msgstr ""
 "ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ "
 "ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show Animations"
 msgstr "ਐਨੀਮੇਸ਼ਨ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show animated images as animations."
 msgstr "ਐਨੀਮੇਸ਼ਨ ਸੁਨੇਹੇ ਐਨੀਮੇਸ਼ਨ ਵਜੋਂ ਹੀ ਵੇਖੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all message headers"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਹੈੱਡਰ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show all the headers when viewing a messages."
 msgstr "ਸੁਨੇਹਾ ਵੇਖਣ ਦੌਰਾਨ ਸਭ ਹੈੱਡਰ ਵੇਖੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਸੂਚੀ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -9043,33 +8355,27 @@ msgstr ""
 "ਹੈੱਡਰ ਵੇਖਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show photo of the sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ਸੁਨੇਹਾ ਪੜ੍ਹਨ ਪੈਂਨ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Search for the sender photo in local address books"
 msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਫੋਟੋ ਦੀ ਖੋਜ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "This option would help in improving the speed of fetching."
 msgstr "ਇਹ ਚੋਣ ਲੈਣ ਦੀ ਸਪੀਡ ਸੁਧਾਰਨ ਲਈ ਮੱਦਦ ਕਰੇਗੀ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬੋਨਬੋ ਭਾਗ ਦਰਸ਼ਕ ਦੀ ਜਾਂਚ ਲਈ MIME ਕਿਸਮ ਲਿਸਟ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -9080,54 +8386,41 @@ msgstr ""
 "ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ MIME ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ "
 "ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "ਦਿੱਤੇ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਬਣਾਓ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "ਦਿੱਤੇ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਬਣਾ ਦਿਉ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:90
-#| msgid "Timeout for marking message as seen"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Timeout for marking messages as seen"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:91
-#| msgid "Timeout for marking message as seen."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ ਮਿਲੀਸਕਿੰਟ ਵਿੱਚ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Sender email-address column in the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਸੁਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਵਿੱਚ ਵੱਖਰੇ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-#| msgid ""
-#| "Determines whether to use the same fonts for both \"From\" and \"Subject"
-#| "\" lines in the \"Messages\" column in vertical view."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr ""
 "ਕੀ ਵਰਟੀਕਲ ਝਲਕ ਵਿੱਚ \"ਸੁਨੇਹਾ\" ਕਾਲਮ ਵਿੱਚ \"ਵਲੋਂ\" ਅਤੇ \"ਵਿਸ਼ਾ\" ਲਾਈਨਾਂ ਲਈ ਇੱਕੋ "
-"ਫੋਂਟ ਵਰਤਣੇ "
-"ਹਨ"
+"ਫੋਂਟ ਵਰਤਣੇ ਹਨ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -9136,43 +8429,32 @@ msgstr ""
 "ਫੋਂਟ ਵਰਤਣੇ "
 "ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show deleted messages in the message-list"
 msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖੋ (ਵਿੰਨੇ ਹੋਏ)।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:96
-#| msgid "All local folders"
-msgid "Enable local folders"
-msgstr "ਲੋਕਲ ਫੋਲਡਰ ਚਾਲੂ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid "Whether to show local folders (On This Computer) in a folder tree"
-msgstr "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਲੋਕਲ ਫੋਲਡਰ ਵੇਖਾਉਣਾ (ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ) ਹੈ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Enable search folders"
-msgstr "ਖੋਜ ਫੋਲਡਰ ਯੋਗ"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#| msgid "Enable search folders"
+msgid "Enable Unmatched search folder"
+msgstr "ਬੇਮੇਲ ਖੋਜ ਫੋਲਡਰ ਯੋਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Enable search folders on startup."
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ।"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+"ਖੋਜ ਫੋਲਡਰਾਂ ਵਿੱਚ ਬੇਮੇਲ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ। ਇਹ ਕੁਝ ਨਹੀਂ ਕਰਦੀ, ਜੇ ਖੋਜ ਫੋਲਡਰ ਬੰਦ "
+"ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫੋਲਡਰ ਝਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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."
@@ -9181,25 +8463,19 @@ msgstr ""
 "ਮੇਲ ਅਣ-"
 "ਚੁਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Height of the message-list pane"
 msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane."
 msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "State of message headers in paned view"
 msgstr "ਪੈਨ ਝਲਕ ਵਿੱਚ ਸੁਨੇਹਾ ਹੈੱਡਰ ਦੀ ਹਾਲਤ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#| msgid ""
-#| "Describes whether message headers in paned view should be collapsed or "
-#| "expanded by default. \"0\" = expanded \"1\" = collapsed"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
@@ -9208,23 +8484,19 @@ msgstr ""
 "ਜਾਂ ਫੈਲਾਇਆ। \"0\" "
 "= ਫੈਲਾਇਆ ਅਤੇ \"1\" = ਸਮੇਟਿਆ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "ਲੇਆਉਟ ਸਟਾਈਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9232,94 +8504,50 @@ msgid ""
 "message list."
 msgstr ""
 "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਸੁਨੇਹਾ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
-"\"0"
-"\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ "
+"\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ "
 "ਝਲਕ) ਝਲਕ "
 "ਬਾਹੀ ਨੂੰ ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵੇਰੀਬਲ ਚੌੜੇ ਫੋਂਟ ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "ਟਰਮੀਨਲ ਫੋਂਟ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਟਰਮੀਨਲ ਫੋਂਟ ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਕਸਟਮ ਫੋਂਟ ਵਰਤੋਂ ਜੀ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ਵਿੱਚ ਛੋਟਾ ਐਡਰੈੱਸ ਵੇਖਾਓ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 "TO/CC/B_CC ਵਿੱਚ ਐਡਰੈੱਸ ਗਿਣਤੀ ਵਿੱਚ ਦਿੱਤੇ ਨੰਬਰਾਂ ਮੁਤਾਬਕ ਛੋਟਾ ਐਡਰੈੱਸ ਵੇਖਾਓ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "ਕੇਵਲ ਉਹੀ ਟੈਕਸਟ ਸੁਨੇਹੇ ਵੇਖੋ, ਜੋ ਕਿ ਕੁਝ ਆਕਾਰ ਤੋਂ ਵੱਧ ਨਹੀਂ ਹਨ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"ਕੇਵਲ ਉਹੀ ਸੁਨੇਹੇ ਵੇਖਾਉਣ ਲਈ ਯੋਗ ਕਰਦਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਦੀ ਲਿਮਟ "
-"'message_text_part_limit' ਕੁੰਜੀ "
-"'ਚ ਸੈੱਟ ਕੀਤੇ ਤੋਂ ਵੱਧ ਨਹੀਂ ਹੈ।"
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "ਵੇਖਾਉਣ ਲਈ ਸੁਨੇਹਾ ਟੈਕਸਟ ਲਿਮਟ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮੁਤਾਬਕ ਫਾਰਮੈਟ "
-"ਕੀਤਾ ਜਾ ਸਕਦਾ "
-"ਹੈ। ਡਿਫਾਲਟ 4 (੪) MB / ੪੦੯੬ KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇਹ ਮੁੱਲ "
-"ਤਾਂ ਹੀ "
-"ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ, ਜਦੋਂ 'force_message_limit' ਕੁੰਜੀ ਐਕਟੀਵੇਟ ਹੈ।"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਸਿਰਨਾਵੀਆਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9328,13 +8556,11 @@ msgstr ""
 "ਇੱਕ '...' "
 "ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼ੇ ਤੇ ਅਧਾਰਿਤ ਸੁਨੇਹਾ-ਸੂਚੀ ਦਾ ਥਰਿੱਡ ਬਣਾਓ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9343,15 +8569,11 @@ msgstr ""
 "ਹਵਾਲਾ ਖੇਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹੋਵੇ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "ਥਰਿੱਡ ਫੈਲੀ ਹਾਲਤ ਲਈ ਡਿਫਾਲਟ ਮੁੱਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Requires a restart to apply."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9360,13 +8582,11 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-"
 "ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ਕੀ ਮਾਮਲੇ ਨੂੰ ਉਸ ਮਾਮਲੇ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਾ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9376,12 +8596,11 @@ msgstr ""
 "ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, "
 "ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "ਅਕਾਊਂਟਾਂ ਨੂੰ ਵਰਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਲੜੀਬੱਧ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9389,38 +8608,32 @@ msgid ""
 "given by a user"
 msgstr ""
 "ਮੇਲ ਝਲਕ ਵਿੱਚ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਅਕਾਊਂਟ ਨੂੰ ਕਿਵੇਂ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ ਦੱਸੋ। ਜਦੋਂ ਸਹੀਂ "
-"ਸੈੱਟ ਕੀਤਾ ਤਾਂ "
-"ਅਕਾਊਂਟ ਨੂੰ ਵਰਤਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਅਤੇ ਖੋਜ "
-"ਫੋਲਡਰ ਨੂੰ "
-"ਛੱਡ ਕੇ, ਨਹੀਂ ਤਾਂ ਅਕਾਊਂਟ ਨੂੰ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
+"ਸੈੱਟ ਕੀਤਾ ਤਾਂ ਅਕਾਊਂਟ "
+"ਨੂੰ ਵਰਤਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਅਤੇ ਖੋਜ ਫੋਲਡਰ ਨੂੰ "
+"ਛੱਡ ਕੇ, ਨਹੀਂ ਤਾਂ "
+"ਅਕਾਊਂਟ ਨੂੰ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "ਲਾਗ ਫਿਲਟਰ ਐਕਸ਼ਨ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "ਦਿੱਤੀ ਲਾਗ ਫਾਇਲ ਲਈ ਲਾਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "ਲਾਗ ਫਿਲਟਰ ਐਕਸ਼ਨਾਂ ਲਈ ਲਾਗ-ਫਾਇਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "ਲਾਗ ਫਿਲਟਰ ਐਕਸ਼ਨਾਂ ਲਈ ਲਾਗ-ਫਾਇਲ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "ਫਿਲਟਰ ਕਰਨ ਦੇ ਬਾਅਦ ਆਉਟਬਾਕਸ ਸਾਫ਼ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -9431,54 +8644,40 @@ msgstr ""
 "ਜਦੋਂ ਕੋਈ 'ਅੱਗੇ ਭੇਜੋ' ਫਿਲਟਰ ਕਾਰਵਾਈ ਕੀਤੀ ਹੋਵੇ ਤੇ ਆਖਰੀ ਕਾਰਵਾਈ ਦੇ ਲਗਭਗ ਇੱਕ ਮਿੰਟ "
 "ਬਾਅਦ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "ਡਿਫਾਲਟ ਅੱਗੇ ਭੇਜਣ ਦੀ ਸਟਾਇਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਸ਼ੈਲੀ (\"normal\", \"full headers\", \"source\")"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt on empty subject"
 msgstr "ਖਾਲੀ ਵਿਸ਼ੇ ਤੇ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#| msgid "Prompt when replying to many recipients"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when emptying the trash"
 msgstr "ਜਦੋਂ ਰੱਦੀ ਖਾਲੀ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#| msgid "Prompt the user when he or she tries to expunge a folder."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਰੱਦੀ ਨੂੰ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇ ਤਾਂ ਉਸ ਨੂੰ ਪੁੱਛੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user expunges"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜਣ ਤੋਂ ਪੁੱਛੋ, ਜਦੋਂ ਮੇਲ ਐਡਰੈਸ ਨਾ ਦਿੱਤਾ ਗਿਆ ਹੋਵੇ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9487,24 +8686,20 @@ msgstr ""
 "ਐਡਰੈੱਸ ਦਿੱਤੇ ਹੋਏ "
 "ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "ਜੇਕਰ ਸਿਰਫ Bcc ਖੇਤਰ ਹੀ ਭਰਿਆ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ Cc ਪ੍ਰਾਪਤਕਰਤਾ ਦੇ ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9513,13 +8708,11 @@ msgstr ""
 "ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ "
 "ਹਨ, ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ ੧੦ ਸੁਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9528,24 +8721,20 @@ msgstr ""
 "ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ "
 "ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰਨੇ ਹੋਣ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 "ਜਦੋਂ ਕਈ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪੁੱਛਣ ਨੂੰ ਯੋਗ/ਆਯੋਗ ਕਰਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਹੋਣ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9555,13 +8744,55 @@ msgstr ""
 "ਸੁਨੇਹੇ ਹਟਾਉਣ ਨਾਲ "
 "ਸੁਨੇਹੇ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ, ਨਾ ਕਿ ਕੇਵਲ ਖੋਜ ਨਤੀਜਿਆਂ ਵਿੱਚੋਂ।"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#| msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਚੁੱਕਣ ਤੇ ਸੁੱਟਣ ਰਾਹੀਂ ਫੋਲਡਰ ਨੂੰ ਕਾਪੀ ਕਰਨ ਬਾਰੇ ਪੁੱਛਣਾ ਹੈ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#| msgid ""
+#| "Possible values are: 'never' - to never close browser window, 'always' - "
+#| "to always close browser window or 'ask' - (or any other value) will ask "
+#| "user."
+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 "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"ਸੰਭਵ ਮੁੱਲ ਹਨ: 'never (ਕਦੇ ਨਹੀਂ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਕਾਪੀ ਨਾ "
+"ਕਰਨ ਦੇਣ ਲਈ, "
+"'always (ਹਮੇਸ਼ਾ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਕਾਪੀ ਕਰਨ "
+"ਦੇਣ ਲਈ, "
+"ਜਾਂ 'ask (ਪੁੱਛੋ)'  - (ਜਾਂ ਕੋਈ ਹੋਰ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#| msgid "Whether to show local folders (On This Computer) in a folder tree"
+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:157
-#: ../mail/evolution-mail.schemas.in.h:165
+#| msgid ""
+#| "Possible values are: 'never' - to never close browser window, 'always' - "
+#| "to always close browser window or 'ask' - (or any other value) will ask "
+#| "user."
+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 "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"ਸੰਭਵ ਮੁੱਲ ਹਨ: 'never (ਕਦੇ ਨਹੀਂ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਨਾਲ ਭੇਜਣ ਦੇਣ "
+"ਲਈ, "
+"'always (ਹਮੇਸ਼ਾ)' - ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਬਿਨਾਂ ਪੁੱਛੇ ਚੱਕਣ ਅਤੇ ਸੁੱਟਣ ਰਾਹੀ ਭੇਜਣ ਲਈ, "
+"ਜਾਂ 'ask (ਪੁੱਛੋ)'  - (ਜਾਂ ਕੋਈ ਹੋਰ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛਣ ਲਈ।"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt when replying privately to list messages"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਲਿਸਟ ਸੁਨੇਹਿਆਂ ਲਈ ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9570,13 +8801,11 @@ msgstr ""
 "ਲਿਸਟ ਉੱਤੇ ਆਏ ਸੁਨੇਹਾ "
 "ਦਾ ਜਵਾਬ ਪ੍ਰਾਈਵੇਟ ਭੇਜ ਰਹੇ ਹੋਵੇ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਮੇਲਿਗ ਲਿਸਟ ਹਾਈਜੈਕ ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9588,21 +8817,18 @@ msgstr ""
 "ਕਿ ਤੁਹਾਡੇ ਜਵਾਬ "
 "ਨੂੰ ਲਿਸਟ ਉੱਤੇ ਵਾਪਸ ਭੇਜਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt when replying to many recipients"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਕਈ ਪ੍ਰਾਪਤ-ਕਰਤਾਵਾਂ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "ਲਗਾਤਾਰ ਪੁੱਛਣਾ ਚਾਲੂ /ਬੰਦ ਕਰਦਾ ਹੈ, ਜਦੋਂ ਤੁਸੀਂ ਕਈ ਲੋਕਾਂ ਨੂੰ ਜਵਾਬ ਭੇਜ ਰਹੇ ਹੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -9611,77 +8837,61 @@ msgstr ""
 "ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਨੂੰ "
 "ਬੰਦ ਕਰਨ ਸਮੇਂ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#| msgid ""
-#| "Possible values are: never - to never close browser window always - to "
-#| "always close browser window ask - (or any other value) will ask user"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
 msgstr ""
 "ਸੰਭਵ ਮੁੱਲ ਹਨ: 'never (ਕਦੇ ਨਹੀਂ)' - ਹਮੇਸ਼ਾ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਕਦੇ ਨਾ ਬੰਦ ਕਰਨ ਲਈ, "
-"'always (ਹਮੇਸ਼ਾ)' - "
-"ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਹਮੇਸ਼ਾ ਬੰਦ ਕਰਨ ਲਈ, ਜਾਂ 'ask (ਪੁੱਛੋ)'  - (ਜਾਂ ਕੋਈ ਮੁੱਲ) ਯੂਜ਼ਰ "
-"ਨੂੰ ਪੁੱਛੋ"
+"'always "
+"(ਹਮੇਸ਼ਾ)' - ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਹਮੇਸ਼ਾ ਬੰਦ ਕਰਨ ਲਈ, ਜਾਂ 'ask (ਪੁੱਛੋ)'  - (ਜਾਂ ਕੋਈ "
+"ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Empty Trash folders on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਸਾਫ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰਨ ਸਮੇਂ ਰੱਦੀ ਖਾਲੀ ਕਰੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਅੰਤਰਾਲ ਦਿਨਾਂ ਵਿੱਚ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Last time Empty Trash was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਦਾ ਸਮਾਂ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਦੀ ਕਾਰਵਾਈ, 1 ਜਨਵਰੀ 1970 ਤੋਂ ਲੈ ਕੇ ਦਿਨਾਂ ਚ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:181
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀ ਨੂੰ ਵੇਖਾਏ ਜਾਣ ਦਾ ਸਮਾਂ ਸਕਿੰਟਾਂ ਵਿੱਚ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-#: ../mail/evolution-mail.schemas.in.h:182
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Level beyond which the message should be logged."
 msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ \"0\"। ਚੇਤਾਵਨੀ ਲਈ \"1\"। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ \"2\"।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "ਅਸਲੀ \"ਮਿਤੀ\" ਹੈੱਡਰ ਮੁੱਲ ਵੇਖੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9691,13 +8901,11 @@ msgstr ""
 "ਹਮੇਸ਼ਾ \"ਮਿਤੀ\" "
 "ਹੈੱਡਰ ਮੁੱਲ ਯੂਜ਼ਰ ਵਲੋਂ ਦੱਸੇ ਫਾਰਮੈਟ ਨਾਲ ਅਤੇ ਲੋਕਲ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "List of Labels and their associated colors"
 msgstr "ਲੇਬਲ ਸੂਚੀ ਅਤੇ ਸੰਬੰਧਿਤ ਰੰਗ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9706,54 +8914,44 @@ msgstr ""
 "ਕਿ HTML "
 "ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Check incoming mail being junk"
 msgstr "ਆਉਣ ਵਾਲੇ ਪੱਤਰਾਂ ਲਈ ਜੰਕ ਜਾਂਚ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Run junk test on incoming mail."
 msgstr "ਆ ਰਹੀਆਂ ਮੇਲਾਂ ਲਈ ਜੰਕ ਟੈਸਟ ਚਲਾਓ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Empty Junk folders on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਫੋਲਡਰ ਖਾਲੀ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ਈਵੂਲੇਸ਼ਨ ਬੰਦ ਕਰਨ ਸਮੇਂ ਸਭ ਜੰਕ ਫੋਲਡਰ ਖਾਲੀ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ ਕਰਨ ਉੱਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਸਮਾਂ ਦਿਨਾਂ ਵਿੱਚ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Last time Empty Junk was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਸੀ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਖਾਲ ਕੀਤਾ ਗਿਆ ਸੀ, 1 ਜਨਵਰੀ 1970 ਤੋਂ ਲੈ ਕੇ ਦਿਨਾਂ 'ਚ (ਈਪੋਚ)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "The default plugin for Junk hook"
 msgstr "ਜੰਕ ਹੁੱਕ ਲਈ ਡਿਫਾਲਟ ਪਲੱਗਇਨ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9763,13 +8961,11 @@ msgstr ""
 "ਆਯੋਗ ਹੈ ਤਾਂ ਇਹ "
 "ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ਦੱਸੋ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲਾ ਈਮੇਲ ਐਡਰੈੱਸ-ਬੁੱਕ 'ਚ ਖੋਜਿਆ ਜਾਵੇ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9782,16 +8978,14 @@ msgstr ""
 "ਜੇ ਰਿਮੋਟ ਐਡਰੈਸ "
 "ਬੁੱਕ (LDAP ਵਾਂਗ) ਨੂੰ ਆਟੋ-ਪੂਰਨ ਲਈ ਮਾਰਕ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "ਦੱਸੋ ਕਿ ਕੀ ਜੰਕ ਫਿਲਟਰਿੰਗ ਲਈ ਐਡਰੈੱਸ ਕੇਵਲ ਲੋਕਲ  ਐਡਰੈੱਸ-ਬੁੱਕ 'ਚ ਹੀ ਖੋਜੇ ਜਾਣ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9801,13 +8995,11 @@ msgstr ""
 "ਐਡਰੈੱਸ ਦੀ ਖੋਜ ਲਈ "
 "ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਕਿ ਜੰਕ ਫਿਲਟਰ ਤੋਂ ਅਣਜਾਣ ਸੰਪਰਕ ਨੂੰ ਅੱਡ ਕੀਤਾ ਜਾ ਸਕੇ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ਦੱਸੋ ਕਿ ਜੰਕ ਲਈ ਚੈੱਕ ਕਰਨ ਸਮੇਂ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਵਰਤੇ ਜਾਣ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9817,13 +9009,11 @@ msgstr ""
 "ਦੀ ਨਿਗਰਾਨੀ "
 "ਕੀਤ ਤਾਂ ਇਹ ਜੰਕ ਚੈੱਕ ਕਰਨ ਦੀ ਗਤੀ ਵਧਾਏਗਾ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Custom headers to use while checking for junk."
 msgstr "ਜੰਕ ਵਾਸਤੇ ਚੈੱਕ ਕਰਨ ਵਾਸਤੇ ਕਸਟਮ ਹੈੱਡਰ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9832,38 +9022,31 @@ msgstr ""
 "\"headername=value\" "
 "ਫਾਰਮੈਟ ਦੀ ਲਾਈਨ ਦੇ ਰੂਪ 'ਚ ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "UID string of the default account."
 msgstr "ਮੂਲ ਅਕਾਊਂਟ ਲ਼ਈ UID ਲਾਈਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Save directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for saving mail component files."
 msgstr "ਮੇਲ ਭਾਗ ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਵਾਸਤੇ ਡਾਇਰੈਟਰੀ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Composer load/attach directory"
 msgstr "ਕੰਪੋਜ਼ਰ ਲੋਡ/ਅਟੈਂਚ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for loading/attaching files to composer."
 msgstr "ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਫਾਇਲਾਂ ਲੋਡ ਕਰਨ/ਅਟੈਂਚ ਕਰਨ ਵਾਸਤੇ ਡਾਇਰੈਕਟਰੀ ਹੈ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages on start"
 msgstr "ਸ਼ੁਰੂ ਕਰਨ ਸਮੇਂ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-#| msgid ""
-#| "Whether check for new messages when Evolution is started. This includes "
-#| "also sending messages from Outbox."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9872,34 +9055,27 @@ msgstr ""
 "ਭੇਜੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਸ਼ਾਮਲ "
 "ਹਨ।"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages in all active accounts"
 msgstr "ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਕਰੋ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-#| msgid ""
-#| "Whether check for new messages in all active accounts regardless of the "
-#| "account \"Check for new messages every X minutes\" option when Evolution "
-#| "is started. This option is used only together with 'send_recv_on_start' "
-#| "option."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "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:205
-#: ../mail/evolution-mail.schemas.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸੈਕਰੋਨਾਈਜ਼ ਅੰਤਰਾਲ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-#: ../mail/evolution-mail.schemas.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9908,80 +9084,103 @@ msgstr ""
 "ਅੰਤਰਾਲਘੱਟੋ-ਘੱਟ 30 "
 "ਸਕਿੰਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#. Translators: This is the 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
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "ਅਟੈਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਵਲੋਂ ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਖੋਜ ਲਈ ਸੂਹਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr "ਅਟੈਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਵਲੋਂ ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਖੋਜ ਲਈ ਸੂਹਾਂ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
-#| msgid "Address Book Properties"
 msgid "Address book source"
 msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ ਸਰੋਤ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-#| msgid "Select Address book for Automatic Contacts"
-msgid "Address book to use for storing automatically synced contacts"
-msgstr "ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਸਟੋਰ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਐਡਰੈਸ ਬੁੱਕ"
+#| msgid "Address book to use for storing automatically synced contacts"
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਸਟੋਰ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਐਡਰੈਸ ਬੁੱਕ।"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-#| msgid "Automatic Contacts"
-msgid "Auto sync GAIM contacts"
-msgstr "ਆਟੋਮੈਟਿਕ GAIM ਸੰਪਰਕ ਸਿੰਕ"
+#| msgid "Auto sync GAIM contacts"
+msgid "Auto sync Pidgin contacts"
+msgstr "ਆਟੋਮੈਟਿਕ ਪਿਡਗਿਨ ਸੰਪਰਕ ਸਿੰਕ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "ਕੀ GAIM ਸੰਪਰਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕਰਨਾ ਹੈ"
+#| msgid "Whether GAIM contacts should be automaticall synced"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "ਕੀ ਪਿਡਗਿਨ ਸੰਪਰਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕਰਨਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-#| msgid "Invalid contact."
 msgid "Enable autocontacts"
 msgstr "ਆਪਣੇ-ਆਪ-ਸੰਪਰਕ ਚਾਲੂ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#| msgid ""
+#| "Whether contacts should be automatically added to the user's addressbook"
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
+"Whether contacts should be automatically added to the user's address book."
 msgstr "ਕੀ ਸੰਪਰਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਯੂਜ਼ਰ ਦੀ ਐਡਰੈਸ-ਬੁੱਕ ਵਿੱਚ ਜੋੜਨਾ ਹੈ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-#| msgid "Address Book Properties"
-msgid "GAIM address book source"
-msgstr "GAIM ਐਡਰੈੱਸ ਕਿਤਾਬ ਸਰੋਤ"
+#| msgid "GAIM address book source"
+msgid "Pidgin address book source"
+msgstr "ਪਿਡਗਿਨ ਐਡਰੈੱਸ ਕਿਤਾਬ ਸਰੋਤ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr "GAIM ਤੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਸਟੋਰ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਐਡਰੈਸ ਬੁੱਕ"
+#| msgid ""
+#| "Address book to use for storing automatically synced contacts from GAIM"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+"ਪਿਡਗਿਨ ਤੋਂ ਆਟੋਮੈਟਿਕ ਹੀ ਸਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਸਟੋਰ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਐਡਰੈਸ ਬੁੱਕ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "GAIM ਚੈਕ ਅੰਤਰਾਲ"
+#| msgid "GAIM check interval"
+msgid "Pidgin check interval"
+msgstr "ਪਿਡਗਿਨ ਚੈਕ ਅੰਤਰਾਲ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "ਸੰਪਰਕਾਂ ਦੇ GAIM ਸਿੰਕ ਲਈ ਚੈੱਕ ਅੰਤਰਾਲ"
+#| msgid "Check interval for GAIM syncing of contacts"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "ਸੰਪਰਕਾਂ ਦੇ ਪਿਡਗਿਨ ਸਿੰਕ ਲਈ ਚੈੱਕ ਅੰਤਰਾਲ"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "GAIM ਆਖਰੀ ਸਿੰਕ MD5"
+#| msgid "GAIM last sync MD5"
+msgid "Pidgin last sync MD5"
+msgstr "ਪਿਡਗਿਨ ਆਖਰੀ ਸਿੰਕ MD5"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "GAIM ਆਖਰੀ ਵਾਰ ਸਿੰਕ ਸਮਾਂ"
+#| msgid "GAIM last sync MD5"
+msgid "Pidgin last sync MD5."
+msgstr "ਪਿਡਗਿਨ ਆਖਰੀ ਸਿੰਕ MD5"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+#| msgid "GAIM last sync time"
+msgid "Pidgin last sync time"
+msgstr "ਪਿਡਗਿਨ ਆਖਰੀ ਵਾਰ ਸਿੰਕ ਸਮਾਂ"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+#| msgid "GAIM last sync time"
+msgid "Pidgin last sync time."
+msgstr "ਪਿਡਗਿਨ ਆਖਰੀ ਵਾਰ ਸਿੰਕ ਸਮਾਂ"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਦੀ ਲਿਸਟ"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9993,33 +9192,27 @@ msgstr ""
 "ਮੁੱਲ \";\" ਨਾਲ ਵੱਖ।"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "ਡਿਫਾਲਟ ਬਾਹਰੀ ਐਡੀਟਰ"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr "ਮੂਲ ਕਮਾਂਡ, ਜੋ ਕਿ ਐਡੀਟਰ ਵਜੋਂ ਵਰਤੀ ਜਾਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 #: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "ਜਦੋਂ  ਵੀ ਨਵੀਂ ਮੇਲ ਲਿਖਣੀ ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#| msgid "Automatically launch editor when key is pressed in the mail composer"
 msgid "Automatically launch editor when key is pressed in the mail composer."
 msgstr "ਜਦੋਂ ਮੇਲ ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਸਵਿੱਚ ਦੱਬੀ ਜਾਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਐਡੀਟਰ ਚਲਾਓ।"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "ਮੂਲ ਰੂਪ ਵਿੱਚ ਚਿਹਰਾ ਤਸਵੀਰ ਲਾਓ"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -10029,7 +9222,6 @@ msgstr ""
 "ਪਹਿਲਾਂ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ, ਨਹੀਂ ਤਾਂ ਕੁਝ ਨਹੀਂ ਹੋਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-#| msgid "_Delete Message"
 msgid "Delete processed"
 msgstr "ਕਾਰਵਾਈ ਕੀਤੇ ਹਟਾਓ"
 
@@ -10038,12 +9230,10 @@ msgid "Whether to delete processed iTip objects"
 msgstr "ਕੀ ਕਾਰਵਾਈ ਕੀਤੇ iTip ਆਬਜੈਕਟ ਹਟਾਉਣੇ ਹਨ"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਆਏ ਸੁਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ਕੀ ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿਚਲੇ ਸੁਨੇਹਿਆਂ ਲਈ ਹੀ ਨੋਟੀਫਾਈ ਕਰਨਾ ਹੈ।"
 
@@ -10056,12 +9246,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ D-BUS ਸੁਨੇਹਾ ਬਣਾਓ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਏ ਵਿੱਚ ਆਈਕਾਨ ਯੋਗ ਕਰੋ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਨਵਾਂ ਮੇਲ ਆਈਕਾਨ ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਏ ਵਿੱਚ ਵੇਖੋ।"
 
@@ -10074,57 +9262,68 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਆਈਕਾਨ ਉੱਤੇ ਸੁਨੇਹਾ ਵੇਖਣਾ"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ।"
+#| msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਸੁਣਨਯੋਗ ਸੂਚਨਾ ਚਾਲੂ ਕਰਨੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "ਕੀ ਨਵੇਂ ਸੁਨੇਹੇ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਜਾਂ ਬੀਪ ਚਲਾਈ ਜਾਵੇ।"
+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-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\" ਕੁੰਜੀਆਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "ਬੀਪ ਜਾਂ ਸਾਊਂਡ ਫਾਈਲ ਚਲਾਓ"
+#| msgid "Whether to show the preview pane."
+msgid "Whether to emit a beep."
+msgstr "ਕੀ ਬੀਪ ਚਲਾਉਣੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr "ਜੇ \"ਸਹੀਂ\" ਕੀਤਾ ਤਾਂ ਨਵੇਂ ਸੁਨੇਹੇ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਜਾਂ ਬੀਪ ਚਲਾਈ ਜਾਵੇ।"
+#| msgid "Whether play sound or beep when new messages arrive."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "ਕੀ ਨਵੇਂ ਸੁਨੇਹੇ ਆਉਣ ਉੱਤੇ ਬੀਪ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#| msgid "Sound file name to be played."
 msgid "Sound filename to be played."
 msgstr "ਚਲਾਉਣ ਲਈ ਸਾਊਂਡ ਫਾਇਲ-ਨਾਂ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
 msgstr ""
-"ਜੇ ਬੀਪ ਮੋਡ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਚਲਾਉਣ ਉੱਤੇ ਸਾਊਂਡ ਫਾਇਲ।"
+"ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਫਾਇਲ ਚਲਾਈ ਜਾਵੇਗੀ, ਜੇ \"notify-sound-play-file"
+"\"  \"true\" ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#| msgid "FILE"
-msgid "FIXME"
-msgstr "FIXME"
+#| msgid "Beep or play sound file."
+msgid "Whether to play a sound file."
+msgstr "ਕੀ ਆਵਾਜ਼ ਫਾਇਲ ਚਲਾਉਣੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+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."
+msgstr ""
+"ਕੀ ਸਾਊਂਡ ਫਾਇਲ ਚਲਾਉਣੀ ਹੈ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ। ਸਾਊਂਡ ਫਾਇਲ ਦਾ ਨਾਂ "
+"'notify-sound-file' ਕੁੰਜੀ ਰਾਹੀਂ "
+"ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "ਸਾਊਂਡ ਥੀਮ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "ਜੇ ਬੀਪ ਮੋਡ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਚਲਾਉਣ ਉੱਤੇ ਥੀਮ ਸਾਊਂਡ ਫਾਇਲ।"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
-#| msgid "Use custom fonts for displaying mail."
 msgid "Mode to use when displaying mails"
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਮੋਡ"
 
@@ -10135,17 +9334,30 @@ msgid ""
 "and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਮੋਡ। \"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 the preview pane."
 msgid "Whether to show suppressed HTML output"
 msgstr "ਕੀ ਸੁਪ੍ਰੈਸ ਕੀਤੀ HTML ਆਉਟਪੁੱਟ ਵੇਖਾਉਣੀ ਹੈ"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+#| msgid "List of server URLs for free/busy publishing."
+msgid "List of Destinations for publishing"
+msgstr "ਪਬਲਿਸ਼ ਕਰਨ ਲਈ ਟਿਕਾਣਿਆਂ ਦੀ ਸੂਚੀ"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"ਕੈਲੰਡਰ ਪਬਲਿਸ਼ ਕਰਨ ਦੇ ਦੌਰਾਨ ਟਿਕਾਣਿਆਂ ਦੀ ਸੂਚੀ ਦੇਣ ਲਈ ਕੁੰਜੀ ਹੈ। XML ਵਿੱਚ ਹਰੇਕ "
+"ਮੁੱਲ "
+"ਇੱਕ ਟਿਕਾਣੇ ਨਾਲ ਪਬਲਿਸ਼ ਕਰਨ ਲਈ ਸੈੱਟਅੱਪ ਹੈ।"
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
@@ -10153,23 +9365,19 @@ msgstr ""
 "ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਟੈਪਲੇਟ ਪਲੱਗਇਨ ਸਬ-ਟਾਈਟਲ ਲਈ ਸ਼ਬਦ/ਮੁੱਲ ਜੋੜ ਦੀ ਲਿਸਟ ਹੈ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਡਾਈਲਾਗ ਛੱਡੋ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਕਾਸ ਵਰਜਨ ਡਾਈਲਾਗ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Initial attachment view"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਅਟੈਚਮੈਂਟ ਝਲਕ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -10184,55 +9392,44 @@ msgstr "ਸ਼ੁਰੂਆਤੀ ਫਾਇਲ ਚੋਣਕਾਰ ਫੋਲਡਰ
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ਡਾਈਲਾਗ ਲਈ ਸ਼ੁਰੂਆਤੀ ਫੋਲਡਰ"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:312
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਢੰਗ ਨਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਵੇਗਾ, ਨਾਕਿ ਆਨਲਾਇਨ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-#| msgid "Opening folder '%s'"
 msgid "Offline folder paths"
 msgstr "ਆਫਲਾਈਨ ਫੋਲਡਰ ਪਾਥ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-#| msgid ""
-#| "List of paths for the folders to be synchronized to disk for offline usage"
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ, ਦੇ ਰਸਤੇ ਦੀ ਲਿਸਟ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "ਐਕਸਪ੍ਰੈਸ ਮੋਡ ਚਾਲੂ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "ਫਲੈਗ, ਜੋ ਸਭ ਤੋਂ ਸੌਖਾ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਚਾਲੂ ਕਰਦਾ ਹੈ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਵਿੰਡੋ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Window button style"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਸਟਾਇਲ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10243,183 +9440,454 @@ msgstr ""
 "\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "ਟੂਲਬਾਰ ਉਪਲੱਬਧ ਹੈ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "ਕੀ ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ਭਾਗ ਦਾ ID ਜਾਂ ਏਲੀਆਸ ਨੂੰ ਸ਼ੁਰੂਆਤ ਤੇ ਵੇਖਿਆ ਜਾਇਆ ਕਰੇਗਾ।"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "ਮੂਲ ਬਾਹੀ ਚੌੜਾਈ"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਸਪੈਮ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਲੋਕਲ ਸਪੈਮ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-#| msgid "Failed to read output from SpamAssassin: "
 msgid "Socket path for SpamAssassin"
 msgstr "SpamAssassin ਲਈ ਸਾਕਟ ਪਾਥ"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ (spamc/spamd)"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#| msgid "SpamAssassin Options"
 msgid "SpamAssassin client binary"
 msgstr "SpamAssassin ਕਲਾਇਟ ਲਾਇਬਰੇਰੀ"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#| msgid "Use SpamAssassin daemon and client"
 msgid "SpamAssassin daemon binary"
 msgstr "SpamAssassin ਡੈਮਨ ਲਾਇਬਰੇਰੀ"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
+#: ../widgets/misc/e-attachment-bar.c:106
+#: ../widgets/misc/e-attachment-paned.c:176
+#: ../widgets/misc/e-attachment-paned.c:181
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ਅਟੈਚਮੈਂਟ"
+msgstr[1] "ਅਟੈਚਮੈਂਟ"
+
+#: ../em-format/e-mail-formatter-attachment.c:369
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+msgid "Display as attachment"
+msgstr "ਅਟੈਚਮੈਂਟ ਵਜੋਂ ਵੇਖਾਉ"
+
+#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
 msgid "From"
 msgstr "ਵਲੋਂ"
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2736
-#: ../mail/em-format-html.c:2759 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/e-mail-formatter.c:1371
+#: ../em-format/e-mail-formatter-utils.c:182
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2669 ../mail/em-format-html.c:2740
-#: ../mail/em-format-html.c:2762 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1372
+#: ../em-format/e-mail-formatter-utils.c:184
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../em-format/e-mail-formatter.c:1373
+#: ../em-format/e-mail-formatter-quote-headers.c:166
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1126
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "ਫੇਸ"
 
-#: ../em-format/em-format.c:1474
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user@example.com"
+#: ../em-format/e-mail-formatter-headers.c:114
+#: ../plugins/mail-notification/mail-notification.c:396
 #, c-format
-msgid "%s attachment"
-msgstr "%s ਨੱਥੀ"
+msgid "From: %s"
+msgstr "ਵਲੋਂ: %s"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
+#: ../em-format/e-mail-formatter-headers.c:134
+#: ../em-format/e-mail-formatter-headers.c:139
+msgid "(no subject)"
+msgstr "(ਵਿਸ਼ਾ ਨਹੀਂ)"
 
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
+#: ../em-format/e-mail-formatter-headers.c:340
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ਇਹ ਸੁਨੇਹਾ %s ਵਲੋਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
 
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
+#: ../em-format/e-mail-formatter-image.c:152
+#| msgid "Save Image"
+msgid "Regular Image"
+msgstr "ਨਿਯਮਤ ਚਿੱਤਰ"
 
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+#: ../em-format/e-mail-formatter-image.c:158
+#| msgid "Display the next message"
+msgid "Display part as an image"
+msgstr "ਚਿੱਤਰ ਵਜੋਂ ਭਾਗ ਵੇਖਾਉ"
 
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
+#: ../em-format/e-mail-formatter-message-rfc822.c:237
+#| msgid "message"
+msgid "RFC822 message"
+msgstr "RFC822 ਸੁਨੇਹਾ"
 
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
+#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#| msgid "Formatting message"
+msgid "Format part as an RFC822 message"
+msgstr "RFC822 ਸੁਨੇਹੇ ਵਜੋਂ ਫਾਰਮੈਟ ਭਾਗ"
 
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
+#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/menus/gal-define-views-dialog.c:352
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+msgid "Name"
+msgstr "ਨਾਂ"
 
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
+#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "ਅਕਾਰ"
+
+#. Add encryption/signature header
+#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
+msgid "Security"
+msgstr "ਸੁਰੱਖਿਆ"
+
+#: ../em-format/e-mail-formatter-print-headers.c:147
+#| msgid "Assigned"
+msgid "GPG signed"
+msgstr "GPG ਦਸਤਖਤ ਕੀਤੇ"
 
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "PGP ਸੁਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: "
+#: ../em-format/e-mail-formatter-print-headers.c:152
+#| msgid "Unencrypted"
+msgid "GPG encrpyted"
+msgstr "GPG ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
+
+#: ../em-format/e-mail-formatter-print-headers.c:158
+#| msgid "S/MIME Sig_n"
+msgid "S/MIME signed"
+msgstr "S/MIME ਸਾਈਨ ਕੀਤੇ"
+
+#: ../em-format/e-mail-formatter-print-headers.c:164
+#| msgid "S/MIME En_crypt"
+msgid "S/MIME encrpyted"
+msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ"
 
 #  pseudo-header
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2861
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1104
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1221
-msgid "-------- Forwarded Message --------"
-msgstr "-------- ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ --------"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
+#: ../em-format/e-mail-formatter-text-enriched.c:115
+msgid "Richtext"
+msgstr "ਰਿਚ-ਟੈਕਸਟ"
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
+#: ../em-format/e-mail-formatter-text-enriched.c:121
+msgid "Display part as enriched text"
+msgstr "ਭਾਗ ਨੂੰ ਇੰਰਿਚ ਟੈਕਸਟ ਵਜੋਂ ਵੇਖਾਓ"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:104
+#: ../em-format/e-mail-formatter-text-html.c:338
+msgid "HTML"
+msgstr "HTML"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:110
+#: ../em-format/e-mail-formatter-text-html.c:344
+#| msgid "For_mat messages in HTML"
+msgid "Format part as HTML"
+msgstr "HTML ਵਾਂਗ ਫਾਰਮੈਟ ਭਾਗ"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:182
+#| msgid "Plain Text Mode"
+msgid "Plain Text"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:129
+#: ../em-format/e-mail-formatter-text-plain.c:188
+#| msgid "Only ever show plain text"
+msgid "Format part as plain text"
+msgstr "ਪਲੇਟ ਟੈਕਸਟ ਵਾਂਗ ਫਾਰਮੈਟ ਭਾਗ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Unsigned"
+msgstr "ਨਾ-ਦਸਤਖਤ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid "Valid signature"
+msgstr "ਜਾਇਜ ਦਸਤਖਤ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਹੈ ਅਤੇ ਜਾਇਜ ਮਤਲਬ ਵੀ ਹੈ, ਪਰ ਇਹ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਲੱਗਦਾ ਹੈ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid "Invalid signature"
+msgstr "ਗਲਤ ਦਸਤਖਤ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid "Valid signature, but cannot verify sender"
+msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਜਾਇਜ ਹਨ, ਪਰ ਇਸ ਦੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਾਂਚਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid "Signature exists, but need public key"
+msgstr "ਦਸਤਖਤ ਮੌਜੂਦ ਹਨ, ਪਰ ਪਬਲਿਕ ਕੁੰਜੀ ਲੋੜੀਦੀ ਹੈ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid "Unencrypted"
+msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ "
+"ਸਕਦੇ ਹਨ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid "Encrypted, weak"
+msgstr "ਇੰਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+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 "
+"message in a practical amount of time."
+msgstr ""
+"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ "
+"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
+"ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid "Encrypted"
+msgstr "ਇੰਕ੍ਰਿਪਟਡ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਹੈ, ਇਸ ਸੁਨੇਹੇ ਦੇ ਕਿਸੇ ਭਾਗ ਨੂੰ ਬਾਹਰੋਂ ਵੇਖਣਾ ਸੰਭਵ ਨਹੀਂ "
+"ਹੋਵੇਗਾ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid "Encrypted, strong"
+msgstr "ਇੰਕ੍ਰਿਪਟ, ਸਖਤ"
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+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 "
+"practical amount of time."
+msgstr ""
+"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ "
+"ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
+"ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
+
+#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_View Certificate"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
+
+#: ../em-format/e-mail-formatter-secure-button.c:205
+msgid "This certificate is not viewable"
+msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
+
+#: ../em-format/e-mail-formatter-source.c:139
+msgid "Source"
+msgstr "ਸਰੋਤ"
+
+#: ../em-format/e-mail-formatter-source.c:145
+msgid "Display source of a MIME part"
+msgstr "MIME ਭਾਗ ਦਾ ਸਰੋਤ ਵੇਖਾਓ"
+
+#: ../em-format/e-mail-parser-application-mbox.c:108
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr "MBOX ਭਾਗ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s"
+
+#: ../em-format/e-mail-parser-application-smime.c:104
+#, c-format
+#| msgid "Could not parse PGP/MIME message"
+msgid "Could not parse S/MIME message: %s"
+msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#, c-format
+#| msgid "Could not parse PGP message: "
+msgid "Could not parse PGP message: %s"
+msgstr "PGP ਸੁਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
+#: ../em-format/e-mail-parser-multipart-signed.c:144
+#, c-format
+#| msgid "Error verifying signature"
+msgid "Error verifying signature: %s"
+msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#: ../em-format/e-mail-parser-message-external.c:86
+#| msgid "Malformed external-body part."
+msgid "Malformed external-body part"
+msgstr "ਨਿਕਾਰਾ ਬਾਹਰੀ-ਭਾਗ"
+
+#: ../em-format/e-mail-parser-message-external.c:118
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਪੁਆਇੰਟਰ"
+
+#: ../em-format/e-mail-parser-message-external.c:129
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਪੁਆਇੰਟਰ"
+
+#: ../em-format/e-mail-parser-message-external.c:131
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਪੁਆਇੰਟਰ"
+
+#: ../em-format/e-mail-parser-message-external.c:150
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ਰਿਮੋਟ ਡਾਟੇ (%s) ਲਈ ਪੁਆਇੰਟਰ"
+
+#: ../em-format/e-mail-parser-message-external.c:167
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟੇ (\"%s\" ਕਿਸਮ) ਲਈ ਪੁਆਇੰਟਰ"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:81
+#: ../em-format/e-mail-parser-multipart-signed.c:95
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#, c-format
+#| msgid "Could not parse PGP/MIME message"
+msgid "Could not parse PGP/MIME message: %s"
+msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#: ../em-format/e-mail-parser-multipart-signed.c:129
+msgid "Unsupported signature format"
+msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
+
+#: ../em-format/e-mail-part-utils.c:493
+#, c-format
+msgid "%s attachment"
+msgstr "%s ਨੱਥੀ"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
@@ -10535,14 +10003,14 @@ msgstr "ਦਿੱਖ"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/itip-formatter/itip-view.c:235
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "ਅੱਜ"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow"
 msgstr "ਭਲਕੇ"
 
@@ -10632,12 +10100,6 @@ msgstr "\"%s\" ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" ਨੂੰ %s ਉੱਤੇ ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:392
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "ਹਫਤੇ"
-
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ਪਰਿੰਟਿੰਗ ਦੇ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
@@ -10654,7 +10116,6 @@ msgstr "ਪਰਿੰਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰ�
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
 #: ../e-util/e-system.error.xml.h:1
-#| msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgid "A file named \"{0}\" already exists. Do you want to replace it?"
 msgstr "ਫਾਇਲ ਨਾਂ \"{0}\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
@@ -10666,7 +10127,6 @@ msgstr ""
 "ਜਾ ਰਿਹਾ ਹੈ।"
 
 #: ../e-util/e-system.error.xml.h:3
-#| msgid "_Reply"
 msgid "_Replace"
 msgstr "ਬਦਲੋ(_R)"
 
@@ -10688,129 +10148,149 @@ msgstr "ਕਿਉਂਕਿ \"{1}\""
 msgid "Cannot open file \"{0}\"."
 msgstr "ਫਾਇਲ \"{0}\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।"
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-system.error.xml.h:7
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "ਡਾਟਾ ਸਰੋਤ &quot;{0}&quot; ਨੂੰ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "ਰਿਪੋਰਟ ਕੀਤੀ ਗਲਤੀ &quot;{1}&quot; ਸੀ।"
+
+#: ../e-util/e-system.error.xml.h:9
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "ਡਾਟਾ ਸਰੋਤ &quot;{0}&quot; ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../e-util/e-system.error.xml.h:10
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "ਸਰੋਤ &quot;{0}&quot; ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
-#: ../e-util/e-util.c:292
+#: ../e-util/e-util.c:290
 msgid "Could not display help for Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਲਈ ਮੱਦਦ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
 #. 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
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸਕਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਸਕਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਕਿੰਟ"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਮਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਿੰਟ"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ ੧ ਘੰਟਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ %d ਘੰਟੇ"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ੧ ਦਿਨ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਦਿਨ"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ ੧ ਹਫ਼ਤਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ %d ਹਫ਼ਤੇ"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਮਹੀਨਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਹੀਨੇ"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾਂ"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਾਲ"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:132
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤੀ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
+#: ../filter/e-filter-datespec.c:157
 msgid "now"
 msgstr "ਹੁਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:142
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:290
+#: ../filter/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "ਮੇਲ ਕਰਨ ਲਈ ਸਮਾਂ ਚੁਣੋ"
 
@@ -10818,72 +10298,78 @@ msgstr "ਮੇਲ ਕਰਨ ਲਈ ਸਮਾਂ ਚੁਣੋ"
 msgid "Choose a File"
 msgstr "ਫਾਇਲ ਚੁਣੋ"
 
-#: ../filter/e-filter-rule.c:686
+#: ../filter/e-filter-rule.c:741
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾਂ(_u):"
 
-#: ../filter/e-filter-rule.c:718
-msgid "Find items that meet the following conditions"
-msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
+#: ../filter/e-filter-rule.c:791
+#| msgid "Find items that meet the following conditions"
+msgid "all the following conditions"
+msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਸਭ ਸ਼ਰਤਾਂ"
 
-#: ../filter/e-filter-rule.c:743
-msgid "If all conditions are met"
-msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
+#: ../filter/e-filter-rule.c:792
+#| msgid "Find items that meet the following conditions"
+msgid "any of the following conditions"
+msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਸ਼ਰਤਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਮਿਲਦੀ"
 
-#: ../filter/e-filter-rule.c:744
-msgid "If any conditions are met"
-msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
+#: ../filter/e-filter-rule.c:798
+#| msgid "_Find items:"
+msgid "_Find items which match:"
+msgstr "ਆਈਟਮਾਂ ਖੋਜੋ, ਜੋ ਕਿ ਮਿਲਦੀਆਂ ਹੋਣ(_F):"
 
-#: ../filter/e-filter-rule.c:747
-msgid "_Find items:"
-msgstr "ਆਈਟਮ ਖੋਜ(_F):"
+#: ../filter/e-filter-rule.c:820
+msgid "Find items that meet the following conditions"
+msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../widgets/misc/e-mail-signature-combo-box.c:318
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../filter/e-filter-rule.c:777
+#: ../filter/e-filter-rule.c:836
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "ਜਵਾਬ"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:838
 msgid "Replies and parents"
 msgstr "ਜਵਾਬ ਤੇ ਮੁੱਢਲੇ"
 
-#: ../filter/e-filter-rule.c:780
+#: ../filter/e-filter-rule.c:839
 msgid "No reply or parent"
 msgstr "ਕੋਈ ਜਵਾਬ ਜਾਂ ਮੁੱਢਲਾ ਨਹੀਂ"
 
-#: ../filter/e-filter-rule.c:783
+#: ../filter/e-filter-rule.c:842
 msgid "I_nclude threads:"
 msgstr "ਥਰਿੱਡ ਸਮੇਤ(_n):"
 
-#: ../filter/e-filter-rule.c:808
+#: ../filter/e-filter-rule.c:919
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
-#: ../filter/e-rule-editor.c:274
+#: ../filter/e-rule-editor.c:273
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../filter/e-rule-editor.c:367
+#: ../filter/e-rule-editor.c:366
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸੋਧ"
 
@@ -10898,12 +10384,10 @@ msgid "You must choose a date."
 msgstr "ਤੁਹਾਨੂੰ ਮਿਤੀ ਚੁਣਨੀ ਚਾਹੀਦੀ ਹੈ।"
 
 #: ../filter/filter.error.xml.h:3
-#| msgid "Missing file name."
 msgid "Missing filename."
 msgstr "ਗੁੰਮ ਫਾਇਲ ਨਾਂ।"
 
 #: ../filter/filter.error.xml.h:4
-#| msgid "You must specify a file name."
 msgid "You must specify a filename."
 msgstr "ਤੁਹਾਨੂੰ ਫਾਇਲ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
@@ -10921,7 +10405,7 @@ msgstr "ਨਿਯਮਿਤ ਸਮੀਕਰਨ &quot;{1}&quot; ਨੂੰ ਕੰ�
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "ਨਾਂ ਗੁੰਮ ਹੈ।"
 
@@ -10949,10 +10433,14 @@ msgstr "ਸਮਾਂ ਜੋ ਤੁਸੀਂ ਦਿੱਤਾ ਹੈ"
 msgid "a time relative to the current time"
 msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਦੇ ਅਨੁਸਾਰ ਸਮਾਂ"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "ਸਕਿੰਟ"
 
+#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "ਹਫਤੇ"
+
 #: ../filter/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
@@ -11006,151 +10494,148 @@ msgstr ""
 "ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਫਿਲਟਰ ਚਲਾਉਣ ਦੇ ਸੁਨੇਹੇ ਨਾਲ ਮਿਲਾਈ\n"
 "ਜਾਵੇਗੀ।"
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, c-format
+#| msgid "Invalid authentication"
+msgid "Invalid authentication result code (%d)"
+msgstr "ਗਲਤ ਪ੍ਰਮਾਣਕਿਤ ਨਤੀਜਾ ਕੋਡ (%d)"
+
+#: ../libemail-engine/e-mail-folder-utils.c:112
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ਸੁਨੇਹਾ '%s' ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:378
-#: ../libemail-engine/e-mail-folder-utils.c:627
+#: ../libemail-engine/e-mail-folder-utils.c:675
+#: ../libemail-engine/e-mail-folder-utils.c:926
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:472
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਲਈ ਚੁਣੇ ਸੁਨੇਹੇ ਜਾਂਚੋ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:875
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1009
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ਫਾਇਲ \"%s\" ਹਟਾਈ ਗਈ ਹੈ।"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1013
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "ਫਾਇਲ ਨੂੰ ਹਟਾਇਆ ਗਿਆ ਹੈ।"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1072
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨਅਟੈਚਮੈਂਟ hਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1234
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d ਸੁਨੇਹਾ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "%d ਸੁਨੇਹੇ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:609
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "ਗਲਤ ਫੋਲਡਰ URI '%s'"
 
-#: ../libemail-engine/e-mail-session.c:106 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:765
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:107 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1031
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 msgid "Outbox"
 msgstr "ਬਾਹਰ-ਬਕਸਾ"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1037
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
+#: ../plugins/templates/templates.c:1359
 msgid "Templates"
 msgstr "ਟੈਪਲੇਟ"
 
-#: ../libemail-engine/e-mail-session.c:929
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s ਲਈ ਭੇਦ ਲਿਖੋ"
-
-#: ../libemail-engine/e-mail-session.c:933
-msgid "Enter Passphrase"
-msgstr "ਭੇਦ ਲਿਖੋ"
+#| msgid "User canceled operation."
+msgid "User cancelled operation"
+msgstr "ਯੂਜ਼ਰ ਨੇ ਓਪਰੇਸ਼ਨ ਰੱਦ ਕੀਤਾ"
 
-#: ../libemail-engine/e-mail-session.c:937
+#: ../libemail-engine/e-mail-session.c:1489
 #, c-format
-msgid "Enter Password for %s"
-msgstr "%s ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
-
-#: ../libemail-engine/e-mail-session.c:941
-msgid "Enter Password"
-msgstr "ਪਾਸਵਰਡ ਭਰੋ"
+msgid "%s authentication failed"
+msgstr "%s ਪ੍ਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"
 
-#: ../libemail-engine/e-mail-session.c:992
+#: ../libemail-engine/e-mail-session.c:1534
 #, c-format
-msgid "User canceled operation."
-msgstr "ਯੂਜ਼ਰ ਨੇ ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ।"
+msgid "No data source found for UID '%s'"
+msgstr "UID '%s' ਲਈ ਕੋਈ ਡਾਟਾ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ।"
 
-#: ../libemail-engine/e-mail-session.c:1111
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
+#| msgid ""
+#| "No destination address provided, forward of the message has been "
+#| "cancelled."
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "ਕੋਈ ਟਿਕਾਣਾ ਐਡਰੈੱਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ,  ਸੁਨੇਹੇ ਲਈ ਅੱਗੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ।"
-
-#: ../libemail-engine/e-mail-session.c:1120
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ਵਰਤਣ ਲਈ ਕੋਈ ਅਕਾਊਂਟ ਨਹੀਂ ਲੱਭਿਆ, ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜਣ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"
+"No destination address provided, forwarding of the message has been "
+"cancelled."
+msgstr "ਕੋਈ ਟਿਕਾਣਾ ਐਡਰੈੱਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ, ਸੁਨੇਹੇ ਲਈ ਅੱਗੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ।"
 
-#: ../libemail-engine/e-mail-session.c:1274
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
-#| msgid "Authentication Failed"
-msgid "%s authentication failed"
-msgstr "%s ਪ੍ਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"
+#| msgid "No account found to use, forward of the message has been cancelled."
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr "ਵਰਤਣ ਲਈ ਕੋਈ ਪਛਾਣ ਨਹੀਂ ਲੱਭੀ, ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜਣ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"
 
-#: ../libemail-engine/e-mail-session.c:1348
+#: ../libemail-engine/e-mail-session-utils.c:420
 #, c-format
-#| msgid "Your password has expired."
-msgid "No password was provided"
-msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ ਸੀ ਦਿੱਤਾ ਗਿਆ"
+msgid "No mail service found with UID '%s'"
+msgstr "UID '%s' ਨਾਲ ਕੋਈ ਮੇਲ ਸਰਵਿਸ ਨਹੀਂ ਲੱਭੀ"
 
-#: ../libemail-engine/e-mail-session-utils.c:416
+#: ../libemail-engine/e-mail-session-utils.c:429
 #, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "ਅਕਾਊਂਟ '%s' ਲਈ ਟਰਾਂਸਪੋਰਟ ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਿਆ"
+msgid "UID '%s' is not a mail transport"
+msgstr "UID '%s' ਮੇਲ ਟਰਾਂਸਪੋਰਟ ਨਹੀਂ ਹੈ"
 
-#: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/e-mail-session-utils.c:521
+#: ../libemail-engine/mail-ops.c:697
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਫੇਲ੍ਹ: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:531
-#: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/e-mail-session-utils.c:550
+#: ../libemail-engine/e-mail-session-utils.c:584
+#: ../libemail-engine/mail-ops.c:714 ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11159,51 +10644,46 @@ msgstr ""
 "%s ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਫੇਲ੍ਹ: %s\n"
 "ਇਸ ਦੀ ਬਜਾਏ ਲੋਕਲ 'ਭੇਜੇ (Sent)' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:604
+#: ../libemail-engine/mail-ops.c:772
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ਲੋਕਲ 'ਭੇਜੇ (Sent)' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਫੇਲ੍ਹ: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:834
+#: ../libemail-engine/mail-ops.c:904 ../libemail-engine/mail-ops.c:1005
 msgid "Sending message"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "ਫੋਲਡਰ '%s' ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../libemail-engine/e-mail-store-utils.c:169
+#: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ਨਾਲੋਂ ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../libemail-engine/e-mail-store-utils.c:260
+#: ../libemail-engine/e-mail-store-utils.c:263
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' ਨਾਲ ਮੁੜ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/e-mail-store-utils.c:335
+#: ../libemail-engine/e-mail-store-utils.c:340
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ਆਫਲਾਈਨ ਲਈ ਅਕਾਊਂਟ '%s' ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:884
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ਪਿੰਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਫਿਲਟਰ"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:915
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
@@ -11211,182 +10691,597 @@ 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.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:966
 #, c-format
-#| msgid "Failed to send %d of %d messages"
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 msgstr[1] "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹੇ ਭੇਜਣ ਵਿੱਚ ਫੇਲ੍ਹ"
 
-#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:972
 msgid "Canceled."
 msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:974
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1086
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ਸੁਨੇਹੇ '%s' ਵਿੱਚ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1087
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ਸੁਨੇਹੇ '%s' ਵਿੱਚ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1204
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1277
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੁੰਘੜਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1278
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-ops.c:1257
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "'%s' ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../libemail-engine/mail-ops.c:1475
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "'%s' ਨਿਕਾਲਾ ਫੋਲਡਰ"
-
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1352
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libemail-engine/mail-ops.c:1664
-#, c-format
-msgid "Disconnecting %s"
-msgstr "%s ਨਾਲੋਂ ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
-
 #: ../libemail-engine/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ਸਪੂਲ ਡਾਇਰੈਕਟਰੀ '%s' ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ: %s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "ਇੱਕ non-mbox ਸਰੋਤ `%s' ਤੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਜਾਰੀ"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ"
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "ਸਵੈ-ਨਿਰਮਤ"
+#: ../libemail-engine/mail-vfolder.c:129
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "ਖੋਜ ਫੋਲਡਰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
+
+#: ../libemail-engine/mail-vfolder.c:282
+#, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "'' %s - %s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/e-mail-account-manager.c:405
-#| msgid "Use _Default"
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:647
+#, 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\"."
+msgstr[0] ""
+"ਅਕਾਊਂਟ ਲਈ ਹਟਾਏ ਫੋਲਡਰ \"%2$s\" ਵਾਸਤੇ ਖੋਜ ਫੋਲਡਰ \"%1$s\"\n"
+"ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ"
+msgstr[1] ""
+"ਹਟਾਏ ਗਏ ਫੋਲਡਰ \"%2$s\"\n"
+"ਲਈ ਅਕਾਊਂਟ ਦੇ ਅੱਗੇ ਦਿੱਤੇ ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਸੋਧਿਆ ਗਿਆ ਹੈ\n"
+"%1$s"
+
+#: ../mail/e-mail-account-manager.c:446
 msgid "_Restore Default"
 msgstr "ਡਿਫਾਲਟ ਮੁੜ-ਸਟੋਰ(_R)"
 
-#: ../mail/e-mail-account-manager.c:418
+#: ../mail/e-mail-account-manager.c:459
 msgid "You can drag and drop account names to reorder them."
 msgstr "ਤੁਸੀਂ ਅਕਾਊਂਟ ਨਾਂ ਨੂੰ ਅੱਗੇ-ਪਿੱਛੇ ਕਰਨ ਲਈ ਡਰੈਗ ਡਰੋਪ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/e-mail-account-manager.c:463
+#: ../mail/e-mail-account-manager.c:504
 msgid "De_fault"
 msgstr "ਮੂਲ(_f)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:855
+#: ../plugins/publish-calendar/publish-calendar.c:864
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
 msgid "Account Name"
 msgstr "ਅਕਾਊਂਟ ਨਾਂ"
 
 #  default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
-#: ../mail/mail-config.ui.h:51
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:558
-#: ../plugins/google-account-setup/google-source.c:695
+#: ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3648
+#: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ਅਟੈਚਮੈਂਟ"
-msgstr[1] "ਅਟੈਚਮੈਂਟ"
+#: ../mail/e-mail-autoconfig.c:194
+#, c-format
+msgid "No mail exchanger record for '%s'"
+msgstr "'%s' ਲਈ ਕੋਈ ਮੇਲ ਐਕਸਚੇਜ਼ਰ ਰਿਕਾਰਡ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../mail/e-mail-attachment-bar.c:619
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "ਆਈਕਾਨ ਝਲਕ"
+#: ../mail/e-mail-autoconfig.c:201
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "'%s' ਲੱਭਣ ਲਈ ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਅਸਮਰੱਥ"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "ਲਿਸਟ ਝਲਕ"
+#: ../mail/e-mail-autoconfig.c:208
+#, c-format
+#| msgid "Error removing list"
+msgid "Error resolving '%s'"
+msgstr "'%s' ਹੱਲ ਕਰਨ ਲਈ ਗਲਤੀ"
+
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr "'%s' ਲਈ ਕੋਈ ਪਰਸ਼ਾਸ਼ਕੀ ਨਾਂ ਸਰਵਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../mail/e-mail-backend.c:661
-#| msgid "Unknown action to be performed"
+#: ../mail/e-mail-autoconfig.c:661
+#| msgid "No password was provided"
+msgid "No email address provided"
+msgstr "ਕੋਈ ਈਮੇਲ ਐਡਰੈਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
+
+#: ../mail/e-mail-autoconfig.c:670
+#| msgid "Using email address"
+msgid "Missing domain in email address"
+msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚ ਗੁੰਮ ਡੋਮੇਨ ਵਰਤੋਂ"
+
+#: ../mail/e-mail-backend.c:734
 msgid "Unknown background operation"
 msgstr "ਅਣਜਾਣ ਬੈਕਗਰਾਊਂਡ ਕਾਰਵਾਈ"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
+#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
 msgid "Close this window"
 msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:284
 msgid "(No Subject)"
 msgstr "(ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-config-assistant.c:501
+msgid "Evolution Account Assistant"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
+
+#: ../mail/e-mail-config-auth-check.c:348
+#| msgid "Ch_eck for Supported Types"
+msgid "Check for Supported Types"
+msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ ਕਰੋ"
+
+#: ../mail/e-mail-config-confirm-page.c:157
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ਵਧਾਈਆਂ, ਤੁਸੀਂ ਪੱਤਰ ਸੰਰਚਨਾ ਸੰਪੂਰਨ ਕਰ ਲਈ ਹੈ।\n"
+"\n"
+"ਹੁਣ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਰਾਹੀ ਪੱਤਰ ਭੇਜ ਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ।\n"
+"\n"
+"ਆਪਣਾ ਸੈਟਿੰਗ ਲਾਗੂ ਕਰਨ ਲਈ \"ਲਾਗੂ ਕਰੋ\" ਦਬਾਓ।"
+
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "ਸਮਾਪਤ"
+
+#: ../mail/e-mail-config-defaults-page.c:539
+msgid "Special Folders"
+msgstr "ਖਾਸ ਫੋਲਡਰ"
+
+#: ../mail/e-mail-config-defaults-page.c:548
+#| msgid "Sent _Messages Folder:"
+msgid "Draft Messages _Folder:"
+msgstr "ਡਰਾਫਟ ਸੁਨੇਹੇ ਫੋਲਡਰ(_F):"
+
+#: ../mail/e-mail-config-defaults-page.c:558
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for saving draft messages."
+msgstr "ਡਰਾਫਟ ਸੁਨੇਹੇ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../mail/e-mail-config-defaults-page.c:572
+msgid "Sent _Messages Folder:"
+msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਫੋਲਡਰ(_M):"
+
+#: ../mail/e-mail-config-defaults-page.c:582
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for saving sent messages."
+msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ।"
+
+#: ../mail/e-mail-config-defaults-page.c:596
+#| msgid "_Restore Default"
+msgid "_Restore Defaults"
+msgstr "ਡਿਫਾਲਟ ਮੁੜ-ਸਟੋਰ(_R)"
+
+#: ../mail/e-mail-config-defaults-page.c:610
+msgid "Use a Real Folder for _Trash:"
+msgstr "ਰੱਦੀ ਲਈ ਅਸਲੀ ਫੋਲਡਰ ਨਾਂ ਵਰਤੋਂ(_T):"
+
+#: ../mail/e-mail-config-defaults-page.c:611
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for deleted messages."
+msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
+
+#: ../mail/e-mail-config-defaults-page.c:620
+msgid "Use a Real Folder for _Junk:"
+msgstr "ਜੰਕ ਲਈ ਅਸਲੀ ਫੋਲਡਰ ਨਾਂ ਵਰਤੋਂ(_J):"
+
+#: ../mail/e-mail-config-defaults-page.c:621
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for junk messages."
+msgstr "ਜੰਕ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ।"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+msgid "Composing Messages"
+msgstr "ਸੁਨੇਹੇ ਲਿਖਣੇ"
+
+#: ../mail/e-mail-config-defaults-page.c:647
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਕਾਰਬਨ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(CC):"
+
+#: ../mail/e-mail-config-defaults-page.c:672
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਲੁਕਵੀਂ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(_BCC):"
+
+#: ../mail/e-mail-config-defaults-page.c:707
+msgid "Message Receipts"
+msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤਕਰਤਾ"
+
+#: ../mail/e-mail-config-defaults-page.c:716
+msgid "S_end message receipts:"
+msgstr "ਸੁਨੇਹਾ ਰਸੀਦ ਭੇਜੋ(_e):"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "ਕਦੇ ਨਹੀਂ"
+
+#: ../mail/e-mail-config-defaults-page.c:747
+msgid "Always"
+msgstr "ਹਮੇਸ਼ਾ"
+
+#: ../mail/e-mail-config-defaults-page.c:753
+msgid "Ask for each message"
+msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
+
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "ਮੂਲ"
+
+#: ../mail/e-mail-config-identity-page.c:254
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ "
+"ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ "
+"ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
+
+#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-summary-page.c:324
+msgid "Account Information"
+msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-summary-page.c:333
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example: \"Work\" or \"Personal\""
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
+"ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\"."
+
+#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-summary-page.c:341
+#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-mail-signature-script-dialog.c:417
+msgid "_Name:"
+msgstr "ਨਾਂ(_N):"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+msgstr "ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ"
+
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "ਪੂਰਾ ਨਾਂ(_E):"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_A):"
+
+#: ../mail/e-mail-config-identity-page.c:409
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ"
+
+#: ../mail/e-mail-config-identity-page.c:417
+msgid "Re_ply-To:"
+msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
+
+#: ../mail/e-mail-config-identity-page.c:444
+msgid "Or_ganization:"
+msgstr "ਸੰਗਠਨ(_g):"
+
+#: ../mail/e-mail-config-identity-page.c:499
+msgid "Add Ne_w Signature..."
+msgstr "ਨਵੇਂ ਦਸਤਖਤ ਸ਼ਾਮਿਲ ਕਰੋ(_w)..."
+
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "ਪਛਾਣ"
+
+#: ../mail/e-mail-config-lookup-page.c:68
+#| msgid "Loading accounts..."
+msgid "Looking up account details..."
+msgstr "...ਅਕਾਊਂਟ ਵੇਰਵਾ ਲੱਭਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../mail/e-mail-config-provider-page.c:485
+#| msgid "Checking for new mail"
+msgid "Checking for New Mail"
+msgstr "ਨਵੇਂ ਮੇਲ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
+
+#: ../mail/e-mail-config-provider-page.c:700
+msgid "Receiving Options"
+msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
+
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "ਈਮੇਲ ਪ੍ਰਾਪਤੀ"
+
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ) (_D)"
+
+#: ../mail/e-mail-config-security-page.c:290
+#| msgid "Pretty Good Privacy (PGP/GPG)"
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "ਪ੍ਰਿੱਟੀ ਗੁੱਡ ਪਰਾਈਵੇਸੀ (OpenPGP)"
+
+#: ../mail/e-mail-config-security-page.c:298
+#| msgid "PGP/GPG _Key ID:"
+msgid "OpenPGP _Key ID:"
+msgstr "OpenPGP ਕੁੰਜੀ I_D:"
+
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "ਸਾਈਨਿੰਗ ਐਲੋਗਰਿਥਮ(_g):"
+
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "ਇਸ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਭੇਜਣ ਵਾਲੇ ਸੁਨਹਿਆਂ ਤੇ ਹਮੇਸ਼ਾ ਦਸਤਖਤ ਕਰੋ(_w)"
+
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਮੈਨੂੰ ਹਮੇਸ਼ਾ ਇੰਕ੍ਰਿਪਟ ਕਰੋ(_m)"
+
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਕਰਨ ਸਮੇਂ ਮੇਰੇ ਕੀ-ਰਿੰਗ ਉੱਤੇ ਭਰੋਸਾ ਰੱਖੋ(_t)"
+
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "ਸੁਰੱਖਿਅਤ MIME (S/MIME)"
+
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
+
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+#| msgid "Selected"
+msgid "Select"
+msgstr "ਚੁਣੋ"
+
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "ਸਾਈਨਿੰਗ ਐਲੋਗਰਿਥਮ(_a):"
+
+#: ../mail/e-mail-config-security-page.c:500
+#| msgid "Al_ways sign outgoing messages when using this account"
+msgid "Always sign outgoing messages when using this account"
+msgstr "ਇਸ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਭੇਜਣ ਵਾਲੇ ਸੁਨਹਿਆਂ ਤੇ ਹਮੇਸ਼ਾ ਦਸਤਖਤ ਕਰੋ"
+
+#: ../mail/e-mail-config-security-page.c:523
+#| msgid "Encry_ption certificate:"
+msgid "Encryption certificate:"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ:"
+
+#: ../mail/e-mail-config-security-page.c:565
+#| msgid "Al_ways sign outgoing messages when using this account"
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "ਇਸ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਭੇਜਣ ਵਾਲੇ ਸੁਨਹਿਆਂ ਤੇ ਹਮੇਸ਼ਾ ਇੰਕ੍ਰਿਪਟ ਕਰੋ"
+
+#: ../mail/e-mail-config-security-page.c:585
+#| msgid "Always encrypt to _myself when sending encrypted messages"
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਮੈਨੂੰ ਹਮੇਸ਼ਾ ਇੰਕ੍ਰਿਪਟ ਕਰੋ"
+
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "ਈਮੇਲ ਭੇਜਣੀ"
+
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "ਸਰਵਰ ਟਾਈਪ(_T): "
+
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr "ਇਹ ਸੈਟਿੰਗ ਦੀ ਸਾਰ ਸੈਟਿੰਗ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਵਰਤੀ ਜਾਵੇਗੀ।"
+
+#: ../mail/e-mail-config-summary-page.c:372
+#| msgid "Personal Details:"
+msgid "Personal Details"
+msgstr "ਨਿੱਜੀ ਵੇਰਵਾ"
+
+#: ../mail/e-mail-config-summary-page.c:381
+#| msgid "Full Nam_e:"
+msgid "Full Name:"
+msgstr "ਪੂਰਾ ਨਾਂ:"
+
+#: ../mail/e-mail-config-summary-page.c:395
+#| msgid "Email _Address:"
+msgid "Email Address:"
+msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ:"
+
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "ਪ੍ਰਾਪਤੀ"
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "ਭੇਜਣਾ"
+
+#: ../mail/e-mail-config-summary-page.c:433
+#| msgid "Server _Type:"
+msgid "Server Type:"
+msgstr "ਸਰਵਰ ਟਾਈਪ: "
+
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
+#| msgid "_Server:"
+msgid "Server:"
+msgstr "ਸਰਵਰ:"
+
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+msgid "Username:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
+
+#: ../mail/e-mail-config-summary-page.c:496
+#| msgctxt "email-custom-header-Security"
+#| msgid "Security:"
+msgid "Security:"
+msgstr "ਸੁਰੱਖਿਆ:"
+
+#: ../mail/e-mail-config-summary-page.c:787
+msgid "Account Summary"
+msgstr "ਅਕਾਊਂਟ ਸਾਰ"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਸੰਰਚਨਾ ਸਹਾਇਕ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ\n"
+"\n"
+"ਸ਼ੁਰੂ ਕਰਨ ਲਈ \"ਜਾਰੀ ਰੱਖੋ\" ਨੂੰ ਦਬਾਓ।"
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "ਜੀ ਆਇਆ ਨੂੰ"
+
+#: ../mail/e-mail-config-window.c:329
+msgid "Account Editor"
+msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
+
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਲ(_A)..."
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "ਇਹ ਐਡਰੈੱਸ ਨੂੰ(_T)"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "ਇਹ ਐਡਰੈੱਸ ਤੋਂ(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "...ਨੂੰ ਜਵਾਬ ਭੇਜੋ(_R)"
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਨੂੰ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_F)"
 
+#: ../mail/e-mail-display.c:159
+msgid "Save _Image..."
+msgstr "ਚਿੱਤਰ ਇੰਝ ਸੰਭਾਲੋ(_I)..."
+
+#: ../mail/e-mail-display.c:161
+msgid "Save the image to a file"
+msgstr "ਚਿੱਤਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
+
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11423,7 +11318,7 @@ msgid "_Later"
 msgstr "ਬਾਅਦ 'ਚ(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
 msgstr "ਲੇਬਲ ਸ਼ਾਮਲ"
 
@@ -11443,642 +11338,685 @@ msgstr ""
 msgid "Color"
 msgstr "ਰੰਗ"
 
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1359
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "ਨਾਂ"
-
-#: ../mail/e-mail-migrate.c:1269
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s' ਉੱਤੇ ਮੇਲ ਲੋਕਲ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ: %s"
 
 #  FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:268
 msgid "Please select a folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ ਜੀ"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:124
+#, c-format
+msgid "Page %d of %d"
+msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸਫ਼ਾ"
+
+#: ../mail/e-mail-printer.c:536
+#: ../modules/calendar/e-cal-shell-view-actions.c:217
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+msgid "Print"
+msgstr "ਪਰਿੰਟ ਕਰੋ"
+
+#: ../mail/e-mail-printer.c:542
+#| msgid "Header name"
+msgid "Header Name"
+msgstr "ਹੈੱਡਰ ਨਾਂ"
+
+#: ../mail/e-mail-printer.c:548
+#| msgid "Header name"
+msgid "Header Value"
+msgstr "ਹੈੱਡਰ ਮੁੱਲ"
+
+#: ../mail/e-mail-printer.c:596 ../mail/mail-config.ui.h:102
+msgid "Headers"
+msgstr "ਹੈੱਡਰ"
+
+#: ../mail/e-mail-reader.c:349
+msgid "Save Image"
+msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
+
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "ਕਾਪੀ ਕਰੋ(_o)"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1535
 msgid "_Do not ask me again."
 msgstr "ਮੈਨੂੰ ਫੇਰ ਨਾ ਪੁੱਛੋ(_D)।"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਜਵਾਬ ਦਿਓ: ਹਮੇਸ਼ਾ ਅਣਡਿੱਠਾ(_A)"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1725
+#| msgid "Failed to retrieve messages."
+msgid "Failed to retrieve message:"
+msgstr "ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ:"
+
+#: ../mail/e-mail-reader.c:1771 ../mail/e-mail-reader.c:2860
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "ਸੁਨੇਹਾ '%s' ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../mail/e-mail-reader.c:1947
 msgid "A_dd Sender to Address Book"
 msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ(_d)"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1949
 msgid "Add sender to address book"
 msgstr "ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1954
 msgid "Check for _Junk"
 msgstr "ਜੰਕ ਲਈ ਜਾਂਚ(_J)"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1956
 msgid "Filter the selected messages for junk status"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਬੇਕਾਰ ਸਥਿਤੀ ਲਈ ਜਾਂਚੋ"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1961
 msgid "_Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ(_C)..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1963
 msgid "Copy selected messages to another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1968
 msgid "_Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1970
 msgid "Mark the selected messages for deletion"
 msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਚੁਣੋ"
 
-#: ../mail/e-mail-reader.c:1823
-msgid "Filter on Mailing _List..."
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ(_L)..."
+#: ../mail/e-mail-reader.c:1975
+#| msgid "Filter on Mailing _List..."
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "...ਮੇਲਿੰਗ ਲਿਸਟ ਉੱਤੇ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_L)"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1977
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:1830
-msgid "Filter on _Recipients..."
-msgstr "ਸੁਨੇਹੀਆਂ ਤੇ ਫਿਲਟਰ(_R)..."
+#: ../mail/e-mail-reader.c:1982
+#| msgid "Filter on _Recipients..."
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "...ਸੁਨੇਹੀਆਂ ਲਈ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_R)"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1984
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ਇਹਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:1837
-msgid "Filter on Se_nder..."
-msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਤੇ ਫਿਲਟਰ(_n)..."
+#: ../mail/e-mail-reader.c:1989
+#| msgid "Filter on Se_nder..."
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "...ਭੇਜਣ ਵਾਲਿਆਂ ਲਈ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_n)"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1991
 msgid "Create a rule to filter messages from this sender"
 msgstr "ਇਹਨਾਂ ਭੇਜਣ ਵਾਲੇ ਦੇ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:1844
-msgid "Filter on _Subject..."
-msgstr "ਵਿਸ਼ੇ 'ਤੇ ਫਿਲਟਰ(_S)..."
+#: ../mail/e-mail-reader.c:1996
+#| msgid "Filter on _Subject..."
+msgid "Create a Filter Rule for _Subject..."
+msgstr "...ਵਿਸ਼ੇ 'ਤੇ ਫਿਲਟਰ ਨਿਯਮ ਬਣਾਓ(_S)"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages with this subject"
 msgstr "ਇਸ ਵਿਸ਼ੇ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2003
 msgid "A_pply Filters"
 msgstr "ਫਿਲਟਰ ਲਗਾਓ(_p)"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:2005
 msgid "Apply filter rules to the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਤੇ ਫਿਲਟਰ ਨਿਯਮ ਲਾਗੂ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2010
 msgid "_Find in Message..."
 msgstr "ਸੁਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:2012
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:2017
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:2019
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਤੋਂ ਧਿਆਨ-ਰੱਖੋ ਨਿਸ਼ਾਨ ਹਟਾਓ"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2024
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:2026
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਪੂਰਾ ਹੋਣ ਲਈ ਧਿਆਨ-ਰੱਖੋ ਨਿਸ਼ਾਨ ਸੈੱਟ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2031
 msgid "Follow _Up..."
 msgstr "ਅੱਗੇ ਖੋਲ੍ਹੋ(_U)..."
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:2033
 msgid "Flag the selected messages for follow-up"
 msgstr "ਧਿਆਨ ਰੱਖਣ ਲਈ ਚੁਣੇ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2038
 msgid "_Attached"
 msgstr "ਅਟੈਚ(_A)"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2040 ../mail/e-mail-reader.c:2047
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਅਟੈਚ ਕਰਕੇ ਕਿਸੇ ਨੂੰ ਅੱਗੇ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2045
 msgid "Forward As _Attached"
 msgstr "ਅਟੈਚ ਕਰਕੇ ਅੱਗੇ ਭੇਜੋ(_A)"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2052
 msgid "_Inline"
 msgstr "ਲਾਈਨ ਵਿੱਚ(_I)"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2054 ../mail/e-mail-reader.c:2061
 msgid "Forward the selected message in the body of a new message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਨਵੇਂ ਸੁਨੇਹੇ ਦੇ ਵਿੱਚ ਮੁੱਖ ਭਾਗ ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2059
 msgid "Forward As _Inline"
 msgstr "ਇਨਲਾਈਨ ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_I)"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2066
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
 msgid "Forward the selected message quoted like a reply"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਹਵਾਲਾ ਇੱਕ ਜਵਾਬ ਦੀ ਤਰ੍ਹਾਂ ਕਰਕੇ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2073
 msgid "Forward As _Quoted"
 msgstr "ਹਵਾਲੇ ਵਾਂਗ ਭੇਜੋ(_Q)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2080
 msgid "_Load Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ(_L)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2082
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ਮੇਲ ਵਿੱਚ ਸੁਨੇਹੇ ਲੋਡ ਕਰਨ ਲਈ ਮਜਬੂਰ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2087
 msgid "_Important"
 msgstr "ਖਾਸ(_I)"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2089
 msgid "Mark the selected messages as important"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2094
 msgid "_Junk"
 msgstr "ਜੰਕ(_J)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2096
 msgid "Mark the selected messages as junk"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਜੰਕ ਵਜੋਂ ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2101
 msgid "_Not Junk"
 msgstr "ਜੰਕ ਨਹੀਂ(_N)"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2103
 msgid "Mark the selected messages as not being junk"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਜੰਕ-ਨਹੀਂ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2108
 msgid "_Read"
 msgstr "ਪੜ੍ਹੇ(_R)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2110
 msgid "Mark the selected messages as having been read"
 msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2115
 msgid "Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ(_m)"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2117
 msgid "Mark the selected messages as unimportant"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਨਾ-ਜ਼ਰੂਰੀ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2122
 msgid "_Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ(_U)"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as not having been read"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਾ-ਪੜ੍ਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2129
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2131
 msgid "Open the selected messages in the composer for editing"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਸੋਧ ਲਈ ਰਚੇਤਾ (ਕੰਪੋਜ਼ਰ) ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2136
 msgid "Compose _New Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਲਿਖੋ(_N)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2138
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖਣ ਲਈ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2143
 msgid "_Open in New Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ 'ਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2145
 msgid "Open the selected messages in a new window"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਵੀਂ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2150
 msgid "_Move to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2152
 msgid "Move selected messages to another folder"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2157
 msgid "_Switch to Folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ(_S)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2159
 msgid "Display the parent folder"
 msgstr "ਮੁੱਢਲਾ ਫੋਲਡਰ ਵੇਖੋ"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2164
 msgid "Switch to _next tab"
 msgstr "ਅਗਲੀ ਟੈਬ ਉੱਤੇ ਜਾਓ(_n)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to the next tab"
 msgstr "ਅਗਲੀ ਟੈਬ ਉੱਤੇ ਜਾਓ"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2171
 msgid "Switch to _previous tab"
 msgstr "ਪਿਛਲੀ ਟੈਬ ਉੱਤੇ ਜਾਓ(_p)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to the previous tab"
 msgstr "ਪਿਛਲੀ ਟੈਬ ਉੱਤੇ ਜਾਓ"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2178
 msgid "Cl_ose current tab"
 msgstr "ਮੌਜੂਦਾ ਟੈਬ ਬੰਦ ਕਰੋ(_o)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2180
 msgid "Close current tab"
 msgstr "ਮੌਜੂਦਾ ਟੈਬ ਬੰਦ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2185
 msgid "_Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(_N)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2187
 msgid "Display the next message"
 msgstr "ਅਗਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2192
 msgid "Next _Important Message"
 msgstr "ਨਵਾਂ ਖਾਸ ਸੁਨੇਹਾ(_I)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2194
 msgid "Display the next important message"
 msgstr "ਅਗਲਾ ਜਰੂਰੀ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2199
 msgid "Next _Thread"
 msgstr "ਅੱਗੇ ਮਸਲਾ(_T)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2201
 msgid "Display the next thread"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਮਸਲਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2206
 msgid "Next _Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next unread message"
 msgstr "ਅਗਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2213
 msgid "_Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(_P)"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the previous message"
 msgstr "ਪਿਛਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2220
 msgid "Pr_evious Important Message"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਵੇਖਾਓ(_e)"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the previous important message"
 msgstr "ਪਿਛਲਾ ਜਰੂਰੀ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2227
 msgid "Previous T_hread"
 msgstr "ਪਿਛਲਾ ਮਾਮਲਾ(_h)"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the previous thread"
 msgstr "ਪਿਛਲਾ ਮਾਮਲਾ ਵੇਖਾਉਪਿਛਲਾ ਮਾਪਿਛਲਾ ਥਰਿੱਡ ਵ"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2234
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱਛੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(_r)"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous unread message"
 msgstr "ਪਿਛਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2243
 msgid "Print this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2250
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਦੀ ਝਲਕ"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2255
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2257
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਰੀ-ਡਿਰੈਕਟ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2262
 msgid "Remo_ve Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਓ(_v)ਅਟੈਚਮੈਂਟ ਹਟਾਓ(_ve Attachment"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2264
 msgid "Remove attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਹਟਾਓਅਟ"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2269
 msgid "Remove Du_plicate Messages"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਹਟਾਓ(_p)"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2271
 msgid "Checks selected messages for duplicates"
 msgstr "ਡੁਪਲੀਕੇਟ ਲਈ ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਚੈੱਕ ਕਰੋ"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2276 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2278
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਲਈ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2283 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ(_L)"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2285
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../mail/e-mail-reader.c:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2290
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2292
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਭੇਜਣ ਵਾਲੇ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2297
 msgid "_Save as mbox..."
 msgstr "mbox ਵਾਂਗ ਸੰਭਾਲੋ(_S)..."
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2299
 msgid "Save selected messages as an mbox file"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ mbox ਫਾਇਲ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2304
 msgid "_Message Source"
 msgstr "ਸੁਨੇਹਾ ਸਰੋਤ(_M)"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2306
 msgid "Show the raw email source of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਅਣ-ਸੋਧੇ ਈ-ਮੇਲ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2318
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹਟਾਇਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2320
 msgid "Undelete the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2325
 msgid "_Normal Size"
 msgstr "ਆਮ ਅਕਾਰ(_N)"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2327
 msgid "Reset the text to its original size"
 msgstr "ਟੈਕਸਟ ਨੂੰ ਅਸਲੀ ਆਕਾਰ ਮੁਤਾਬਕ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2332
 msgid "_Zoom In"
 msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2334
 msgid "Increase the text size"
 msgstr "ਟੈਕਸਟ ਆਕਾਰ ਵਧਾਓ"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2339
 msgid "Zoom _Out"
 msgstr "ਜ਼ੂਮ ਬਾਹਰ(_O)"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2341
 msgid "Decrease the text size"
 msgstr "ਟੈਕਸਟ ਆਕਾਰ ਘਟਾਓ"
 
-#: ../mail/e-mail-reader.c:2196
-msgid "Create R_ule"
-msgstr "ਨਿਯਮ ਬਣਾਓ(_u)"
+#: ../mail/e-mail-reader.c:2348
+msgid "Cre_ate"
+msgstr "ਬਣਾਓ(_a)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2355
 msgid "Ch_aracter Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2362
 msgid "F_orward As"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਇਸ ਵਾਂਗ(_O)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2369
 msgid "_Group Reply"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ(_G)"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2376
 msgid "_Go To"
 msgstr "ਜਾਓ(_G)"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2383
 msgid "Mar_k As"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2390
 msgid "_Message"
 msgstr "ਸੁਨੇਹਾ(_M)"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2397
 msgid "_Zoom"
 msgstr "ਜ਼ੂਮ(_Z)"
 
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Mailing _List..."
-msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_L)..."
+#: ../mail/e-mail-reader.c:2407
+#| msgid "Search Folder from Mailing _List..."
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "...ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_L)"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2409
 msgid "Create a search folder for this mailing list"
 msgstr "ਇਸ ਮੇਲਿੰਗ ਲਿਸਟ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Recipien_ts..."
-msgstr "ਪਰਾਪਤ ਕਰਤਾ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_t)..."
+#: ../mail/e-mail-reader.c:2414
+#| msgid "Search Folder from Recipien_ts..."
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "....ਸੁਨੇਹੀਆਂ ਲਈ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_t)"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2416
 msgid "Create a search folder for these recipients"
 msgstr "ਇਹਨਾਂ ਸੁਨੇਹੀਆਂ ਤੋਂ ਇੱਕ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from Sen_der..."
-msgstr "ਭੇਜਣ ਵਾਲੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_d)..."
+#: ../mail/e-mail-reader.c:2421
+#| msgid "Search Folder from Sen_der..."
+msgid "Create a Search Folder from Sen_der..."
+msgstr "...ਭੇਜਣ ਵਾਲੇ ਲਈ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_d)"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2423
 msgid "Create a search folder for this sender"
 msgstr "ਇਸ ਭੇਜਣ ਵਾਲੇ ਤੋਂ ਇੱਕ ਖੋਜ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:2276
-msgid "Search Folder from S_ubject..."
-msgstr "ਵਿਸ਼ੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_u)..."
+#: ../mail/e-mail-reader.c:2428
+#| msgid "Search Folder from S_ubject..."
+msgid "Create a Search Folder from S_ubject..."
+msgstr "...ਵਿਸ਼ੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_u)"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this subject"
 msgstr "ਇਸ ਵਿਸ਼ੇ ਲਈ ਇੱਕ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2453
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2461
 msgid "Mark as _Important"
 msgstr "ਖਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_I)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2465
 msgid "Mark as _Junk"
 msgstr "ਰੱਦੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_J)"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2469
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2473
 msgid "Mar_k as Read"
 msgstr "ਪੜ੍ਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_k)"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2477
 msgid "Mark as Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾਓ(_m)"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2481
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2525
 msgid "_Caret Mode"
 msgstr "ਗੁਪਤ-ਲੇਖਣ ਢੰਗ(_C)"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2527
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਕਰਸਰ ਝਪਕਦੀ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2533
 msgid "All Message _Headers"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਹੈੱਡਰ(_H)"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2535
 msgid "Show messages with all email headers"
 msgstr "ਸੁਨੇਹੇ ਸਭ ਈ-ਮੇਲ ਹੈੱਡਰਾਂ ਨਾਲ ਵੇਖਾਓ"
 
-#: ../mail/e-mail-reader.c:2712
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "ਸੁਨੇਹਾ '%s' ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+#: ../mail/e-mail-reader.c:2866
+#| msgid "Retrieving %d message"
+#| msgid_plural "Retrieving %d messages"
+msgid "Retrieving message"
+msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:3844
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3845
 msgid "Forward the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਅੱਗੇ ਭੇਜੋ"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3864
 msgid "Group Reply"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3865
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਜਵਾਬ ਜਾਂ ਸਭ ਪ੍ਰਾਪਤ-ਕਰਤਾਵਾਂ ਨੂੰ"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3922 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3955
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3968 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4698
 #, c-format
 msgid "Folder '%s'"
 msgstr "'%s' ਫੋਲਡਰ"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr "ਮੈਨੂੰ ਚੇਤਾਵਨੀ ਨਾ ਵੇਖਾਓ"
 
+#: ../mail/e-mail-reader-utils.c:949
+#| msgid "Print"
+msgid "Printing"
+msgstr "ਪਰਿੰਟ ਕਰੋ"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:1130
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12091,7 +12029,7 @@ msgstr[0] ""
 msgstr[1] ""
 "ਫੋਲਡਰ '%s' ਵਿੱਚ %u ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਉਨ੍ਹਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1534
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ਸੁਨੇਹਾ ਸੰਭਾਲੋ"
@@ -12102,162 +12040,33 @@ 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".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1555
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ਸੁਨੇਹਾ"
 msgstr[1] "ਸੁਨੇਹੇ"
 
+#: ../mail/e-mail-reader-utils.c:2010
+#| msgid "Saving %d message"
+#| msgid_plural "Saving %d messages"
+msgid "Parsing message"
+msgstr "ਸੁਨੇਹਾ ਪਾਰਸ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../mail/e-mail-request.c:152
+#, c-format
+#| msgid "Failed to load the calendar '%s' (%s)"
+msgid "Failed to load part '%s'"
+msgstr "ਭਾਗ '%s' ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦੇ ਪਿੱਛੇ"
 
-#: ../mail/e-mail-ui-session.c:534 ../mail/mail-vfolder.c:1115
-msgid "Search Folders"
-msgstr "ਖੋਜ ਫੋਲਡਰ"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
-
-#: ../mail/em-account-editor.c:1753
-msgid "Always"
-msgstr "ਹਮੇਸ਼ਾ"
-
-#: ../mail/em-account-editor.c:1754
-msgid "Ask for each message"
-msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
-
-#: ../mail/em-account-editor.c:2905 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "ਮਾਰਗ(_P):"
-
-#: ../mail/em-account-editor.c:2908
-msgid "Fil_e:"
-msgstr "ਫਾਇਲ(_e):"
-
-#: ../mail/em-account-editor.c:2945
-msgid "Mail Configuration"
-msgstr "ਮੇਲ ਸੰਰਚਨਾ"
-
-#: ../mail/em-account-editor.c:2946
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਸੰਰਚਨਾ ਸਹਾਇਕ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ\n"
-"\n"
-"ਸ਼ੁਰੂ ਕਰਨ ਲਈ \"ਜਾਰੀ ਰੱਖੋ\" ਨੂੰ ਦਬਾਓ।"
-
-#: ../mail/em-account-editor.c:2949
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ "
-"ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ "
-"ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
-
-#: ../mail/em-account-editor.c:2951 ../mail/em-account-editor.c:3160
-msgid "Receiving Email"
-msgstr "ਈਮੇਲ ਪ੍ਰਾਪਤੀ"
-
-#: ../mail/em-account-editor.c:2952
-msgid "Please configure the following account settings."
-msgstr "ਹੇਠ ਦਿੱਤੀ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰੋ ਜੀ।"
-
-#: ../mail/em-account-editor.c:2954 ../mail/em-account-editor.c:3779
-msgid "Sending Email"
-msgstr "ਈਮੇਲ ਭੇਜਣੀ"
-
-#: ../mail/em-account-editor.c:2955
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ "
-"ਯਕੀਨੀ ਨਹੀਂ ਹੋ "
-"ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਸਰਵਿਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
-
-#: ../mail/em-account-editor.c:2957
-#| msgid "Account Search"
-msgid "Account Summary"
-msgstr "ਅਕਾਊਂਟ ਸਾਰ"
-
-#: ../mail/em-account-editor.c:2958
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr "ਇਹ ਸੈਟਿੰਗ ਦੀ ਸਾਰ ਸੈਟਿੰਗ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਮੇਲ ਨੂੰ ਵਰਤਣ ਲਈ ਵਰਤੀ ਜਾਵੇਗੀ।"
-
-#: ../mail/em-account-editor.c:2962
-msgid "Done"
-msgstr "ਸਮਾਪਤ"
-
-#: ../mail/em-account-editor.c:2963
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ਵਧਾਈਆਂ, ਤੁਸੀਂ ਪੱਤਰ ਸੰਰਚਨਾ ਸੰਪੂਰਨ ਕਰ ਲਈ ਹੈ।\n"
-"\n"
-"ਹੁਣ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਰਾਹੀ ਪੱਤਰ ਭੇਜ ਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ।\n"
-"\n"
-"ਆਪਣਾ ਸੈਟਿੰਗ ਲਾਗੂ ਕਰਨ ਲਈ \"ਲਾਗੂ ਕਰੋ\" ਦਬਾਓ।"
-
-#: ../mail/em-account-editor.c:3526
-msgid "Check for _new messages every"
-msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
-
-#: ../mail/em-account-editor.c:3534
-msgid "minu_tes"
-msgstr "ਮਿੰਟ(_t)"
-
-#: ../mail/em-account-editor.c:4252 ../mail/mail-config.ui.h:166
-msgid "Security"
-msgstr "ਸੁਰੱਖਿਆ"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4307 ../mail/em-account-editor.c:4409
-msgid "Receiving Options"
-msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
-
-#: ../mail/em-account-editor.c:4308 ../mail/em-account-editor.c:4410
-msgid "Checking for New Messages"
-msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../mail/em-account-editor.c:4913
-#| msgid "Setup Google contacts with Evolution"
-msgid "Setup Google con_tacts with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ _ਸੰਪਰਕ ਸੈਟਅੱਪ"
-
-#: ../mail/em-account-editor.c:4920
-#| msgid "Setup Google calendar with Evolution"
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ _ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
-
-#: ../mail/em-account-editor.c:4968
-#| msgid "Setup Yahoo calendar with Evolution"
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ _ਯਾਹੂ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
-
-#: ../mail/em-account-editor.c:4993
-#| msgid "Yahoo Calendar name:"
-msgid "Yahoo Calen_dar name:"
-msgstr "ਯਾਹੂ ਕੈਲੰ_ਡਰ ਨਾਂ:"
-
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1215
+#: ../mail/em-composer-utils.c:1287
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12265,23 +12074,27 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ਵਜੇ "
 "${TimeZone}, ${Sender} ਨੇ ਲਿਖਿਆ:"
 
-#: ../mail/em-composer-utils.c:1226
+#: ../mail/em-composer-utils.c:1293
+msgid "-------- Forwarded Message --------"
+msgstr "-------- ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ --------"
+
+#: ../mail/em-composer-utils.c:1298
 msgid "-----Original Message-----"
 msgstr "--------ਅਸਲੀ ਸੁਨੇਹਾ--------"
 
-#: ../mail/em-composer-utils.c:2453
+#: ../mail/em-composer-utils.c:2578
 msgid "an unknown sender"
 msgstr "ਅਣਜਾਣ ਭੇਜਣ ਵਾਲਾ"
 
-#: ../mail/em-composer-utils.c:2848
+#: ../mail/em-composer-utils.c:2996
 msgid "Posting destination"
 msgstr "ਭੇਜਣ ਟਿਕਾਣਾ"
 
-#: ../mail/em-composer-utils.c:2849
+#: ../mail/em-composer-utils.c:2997
 msgid "Choose folders to post the message to."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-filter-folder-element.c:243
+#: ../mail/em-filter-editor-folder-element.c:156
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
@@ -12336,7 +12149,6 @@ msgid "does not exist"
 msgstr "ਮੌਜੂਦ ਨਾ ਹੋਵੇ"
 
 #: ../mail/em-filter-i18n.h:19
-#| msgid "does not end with"
 msgid "does not have words"
 msgstr "ਨਾਲ ਸਮਾਪਤ ਨਾ ਹੋਵੇ"
 
@@ -12377,7 +12189,6 @@ msgid "Forward to"
 msgstr "ਅੱਗੇ"
 
 #: ../mail/em-filter-i18n.h:31
-#| msgid "Password:"
 msgid "has words"
 msgstr "ਸ਼ਬਦ"
 
@@ -12409,7 +12220,7 @@ msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
 msgid "is set"
 msgstr "ਸੈੱਟ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "ਜੰਕ"
 
@@ -12458,7 +12269,7 @@ msgid "Play Sound"
 msgstr "ਆਵਾਜ਼ ਚਲਾਓ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "ਪੜ੍ਹੋ"
 
@@ -12534,21 +12345,20 @@ msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ"
 msgid "Stop Processing"
 msgstr "ਕਾਰਵਾਈ ਰੋਕੋ"
 
-#: ../mail/em-filter-i18n.h:77
-#| msgid "Unselected Column"
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Color"
 msgstr "ਰੰਗ ਨਾ-ਸੈੱਟ"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Status"
 msgstr "ਹਾਲਤ ਅਣ-ਸੈੱਟ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:527
+#: ../mail/em-filter-rule.c:581
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:558
+#: ../mail/em-filter-rule.c:646
 msgid "Add Ac_tion"
 msgstr "ਐਕਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
@@ -12582,60 +12392,60 @@ msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
 msgid "<click here to select a folder>"
 msgstr "<ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../mail/em-folder-selector.c:389
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: ../mail/em-folder-selector.c:395
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:780
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%Iu%s)"
 
-#: ../mail/em-folder-tree.c:1606
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2131 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2134 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2141 ../mail/message-list.c:2293
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2145 ../mail/message-list.c:2295
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2164
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸੁਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
 msgid "Loading..."
 msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
@@ -12647,337 +12457,91 @@ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 msgid "Copy Folder To"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../mail/em-folder-utils.c:601
+#: ../mail/em-folder-utils.c:586
 msgid "Create Folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:602
+#: ../mail/em-folder-utils.c:587
 msgid "Specify where to create the folder:"
 msgstr "ਦੱਸੋ ਕਿ ਫੋਲਡਰ ਕਿੱਥੇ ਬਣਾਇਆ ਜਾਵੇ:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../mail/em-format-html.c:1640 ../mail/em-format-html.c:1654
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "'%s' ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "ਨਾ-ਦਸਤਖਤ"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "ਜਾਇਜ ਦਸਤਖਤ"
-
-#: ../mail/em-format-html.c:1807 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "ਗਲਤ ਦਸਤਖਤ"
-
-#: ../mail/em-format-html.c:1808 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
-
-#: ../mail/em-format-html.c:1809 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "ਦਸਤਖਤ ਮੌਜੂਦ ਹਨ, ਪਰ ਪਬਲਿਕ ਕੁੰਜੀ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ"
-
-#: ../mail/em-format-html.c:1816 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "ਇੰਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
-
-#: ../mail/em-format-html.c:1817 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "ਇੰਕ੍ਰਿਪਟਡ"
-
-#: ../mail/em-format-html.c:1818 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "ਇੰਕ੍ਰਿਪਟ, ਸਖਤ"
-
-#: ../mail/em-format-html.c:2211
-msgid "Unknown external-body part."
-msgstr "ਅਣਜਾਣ ਬਾਹਰੀ-ਮੁੱਖ ਭਾਗ।"
-
-#: ../mail/em-format-html.c:2221
-msgid "Malformed external-body part."
-msgstr "ਨਿਕਾਰਾ ਬਾਹਰੀ-ਭਾਗ"
-
-#: ../mail/em-format-html.c:2252
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਪੁਆਇੰਟਰ"
-
-#: ../mail/em-format-html.c:2263
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਪੁਆਇੰਟਰ"
-
-#: ../mail/em-format-html.c:2265
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਪੁਆਇੰਟਰ"
-
-#: ../mail/em-format-html.c:2286
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ਰਿਮੋਟ ਡਾਟੇ (%s) ਲਈ ਪੁਆਇੰਟਰ"
-
-#: ../mail/em-format-html.c:2301
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟੇ (\"%s\" ਕਿਸਮ) ਲਈ ਪੁਆਇੰਟਰ"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3009
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "ਵਲੋਂ: %s"
-
-#: ../mail/em-format-html.c:3031
-msgid "(no subject)"
-msgstr "(ਵਿਸ਼ਾ ਨਹੀਂ)"
-
-#: ../mail/em-format-html.c:3107
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ਇਹ ਸੁਨੇਹਾ %s ਵਲੋਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
-
-#: ../mail/em-format-html-display.c:97
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
-
-#: ../mail/em-format-html-display.c:98
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਹੈ ਅਤੇ ਜਾਇਜ ਮਤਲਬ ਵੀ ਹੈ, ਪਰ ਇਹ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਲੱਗਦਾ ਹੈ।"
-
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
-
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਜਾਇਜ ਹਨ, ਪਰ ਇਸ ਦੇ ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਾਂਚਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
-
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
-
-#: ../mail/em-format-html-display.c:108
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ "
-"ਸਕਦੇ ਹਨ।"
-
-#: ../mail/em-format-html-display.c:109
-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 "
-"message in a practical amount of time."
-msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ "
-"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
-"ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
-
-#: ../mail/em-format-html-display.c:110
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਹੈ, ਇਸ ਸੁਨੇਹੇ ਦੇ ਕਿਸੇ ਭਾਗ ਨੂੰ ਬਾਹਰੋਂ ਵੇਖਣਾ ਸੰਭਵ ਨਹੀਂ "
-"ਹੋਵੇਗਾ।"
-
-#: ../mail/em-format-html-display.c:111
-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 "
-"practical amount of time."
-msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ "
-"ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
-"ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
-
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
-msgid "_View Certificate"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
-
-#: ../mail/em-format-html-display.c:274
-msgid "This certificate is not viewable"
-msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
-
-#: ../mail/em-format-html-display.c:589
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ "
-"ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ "
-"ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਐਡੀਟਰ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
-
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "ਚਿੱਤਰ ਇੰਝ ਸੰਭਾਲੋ(_I)..."
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "ਚਿੱਤਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
-
-#: ../mail/em-format-html-display.c:1024
-msgid "Completed on"
-msgstr "ਸਮਾਪਤ "
-
-#: ../mail/em-format-html-display.c:1036
-msgid "Overdue:"
-msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
-
-#: ../mail/em-format-html-display.c:1044
-msgid "by"
-msgstr "ਨੂੰ"
-
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
-msgid "View _Unformatted"
-msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
-
-#: ../mail/em-format-html-display.c:1327
-msgid "Hide _Unformatted"
-msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਓਹਲੇ(_U)"
-
-#: ../mail/em-format-html-display.c:1398
-msgid "O_pen With"
-msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(_p)"
-
-#. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
-msgctxt "Button"
-msgid "Attachment"
-msgstr "ਅਟੈਚਮੈਂਟ"
-
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸਫ਼ਾ"
-
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "ਕੋਈ HTML ਸਟਰੀਮ ਉਪਲੱਬਧ ਨਹੀਂ"
-
-#: ../mail/em-subscription-editor.c:870
-#| msgid "Su_bscribe"
+#: ../mail/em-subscription-editor.c:869
 msgid "_Subscribe"
 msgstr "ਮੈਂਬਰ ਬਣੋ(_S)"
 
-#: ../mail/em-subscription-editor.c:879
-#| msgid "Su_bscribe"
+#: ../mail/em-subscription-editor.c:878
 msgid "Su_bscribe To Shown"
 msgstr "ਵੇਖਾਣਉ ਲਈ ਮੈਂਬਰ ਬਣੋ(_b)"
 
-#: ../mail/em-subscription-editor.c:887
-#| msgid "_Subscribe to list"
+#: ../mail/em-subscription-editor.c:886
 msgid "Subscribe To _All"
 msgstr "ਸਭ ਲਈ ਮੈਂਬਰ ਬਣੋ(_A)"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../mail/em-subscription-editor.c:996
-#| msgid "Unsubscribe Folders"
+#: ../mail/em-subscription-editor.c:995
 msgid "Unsu_bscribe From Hidden"
 msgstr "ਲੁਕਵੇਂ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_b)"
 
-#: ../mail/em-subscription-editor.c:1004
-#| msgid "Unsubscribe from \"%s\""
+#: ../mail/em-subscription-editor.c:1003
 msgid "Unsubscribe From _All"
 msgstr "ਸਭ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_A)"
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1682
 msgid "Folder Subscriptions"
 msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ"
 
-#: ../mail/em-subscription-editor.c:1715
+#: ../mail/em-subscription-editor.c:1722
 msgid "_Account:"
 msgstr "ਅਕਾਊਂਟ(_A):"
 
-#: ../mail/em-subscription-editor.c:1730
+#: ../mail/em-subscription-editor.c:1737
 msgid "Clear Search"
 msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
 
-#: ../mail/em-subscription-editor.c:1748
+#: ../mail/em-subscription-editor.c:1755
 msgid "Sho_w items that contain:"
 msgstr "ਆਈਟਮਾਂ ਰੱਖਣ ਵਾਲੇ ਵੇਖੋ(_w):"
 
-#: ../mail/em-subscription-editor.c:1793
+#: ../mail/em-subscription-editor.c:1800
 msgid "Subscribe to the selected folder"
 msgstr ""
 "ਚੁਣੇ ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਬਣੋਚੁਣੇ ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਬਣਾਚੁਣੇ ਫੋਲਡਰ ਚੁਣੇ ਫੋਲਡਰ ਤੋਂ "
 "ਮੈਂਬਰੀ "
 
-#: ../mail/em-subscription-editor.c:1794
+#: ../mail/em-subscription-editor.c:1801
 msgid "Su_bscribe"
 msgstr "ਮੈਂਬਰ ਬਣੋ(_b)"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../mail/em-subscription-editor.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Unsubscribe from the selected folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰ ਹਟਾਓ"
 
-#: ../mail/em-subscription-editor.c:1879
+#: ../mail/em-subscription-editor.c:1886
 msgid "Collapse all folders"
 msgstr "ਸਭ ਫੋਲਡਰ ਸਮੇਟੋ"
 
-#: ../mail/em-subscription-editor.c:1880
+#: ../mail/em-subscription-editor.c:1887
 msgid "C_ollapse All"
 msgstr "ਸਭ ਸਮੇਟੋ(_o)"
 
-#: ../mail/em-subscription-editor.c:1890
+#: ../mail/em-subscription-editor.c:1897
 msgid "Expand all folders"
 msgstr "ਸਭ ਫੋਲਡਰ ਫੈਲਾਉ"
 
-#: ../mail/em-subscription-editor.c:1891
+#: ../mail/em-subscription-editor.c:1898
 msgid "E_xpand All"
 msgstr "ਸਭ ਫੈਲਾਉ(_x)"
 
-#: ../mail/em-subscription-editor.c:1901
+#: ../mail/em-subscription-editor.c:1908
 msgid "Refresh the folder list"
 msgstr "ਫੋਲਡਰ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋਘ"
 
-#: ../mail/em-subscription-editor.c:1913
+#: ../mail/em-subscription-editor.c:1920
 msgid "Stop the current operation"
 msgstr "ਮੌਜੂਦਾ ਕਾਰਵਾਈ ਰੋਕੋਮੌਜੂਦਾ ਕਾਰਵ"
 
@@ -12985,23 +12549,23 @@ msgstr "ਮੌਜੂਦਾ ਕਾਰਵਾਈ ਰੋਕੋਮੌਜੂਦਾ ਕ
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:110
+#: ../mail/em-utils.c:106
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "ਕੀ ਤੁਸੀਂ %d ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲ੍ਹਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 msgstr[1] "ਕੀ ਤੁਸੀਂ %d ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲ੍ਹਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/em-utils.c:166
+#: ../mail/em-utils.c:162
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)।"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:978
+#: ../mail/em-utils.c:1064
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹੇ"
@@ -13010,429 +12574,71 @@ msgstr "%s ਤੋਂ ਸੁਨੇਹੇ"
 msgid "Search _Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:601
+#: ../mail/em-vfolder-editor-rule.c:388
 msgid "Add Folder"
 msgstr "ਫੋਲਡਰ ਸ਼ਾਮਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr ""
-"ਜਦੋਂ ਅਸਲੀ ਸੁਨੇਹੇ ਨੂੰ ਸਾਇਨ ਕੀਤਾ ਹੋਵੇ (PGP ਜਾਂ S/MIME) ਤਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਜ਼ਿਟਲ "
-"ਰੂਪ ਵਿੱਚ ਸਾਇਨ ਕਰੋ"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Composer Window default width"
-msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਚੌੜਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default width of the Composer Window."
-msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Composer Window default height"
-msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default height of the Composer Window."
-msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid "Attribute message."
-msgstr "ਗੁਣ ਸੁਨੇਹਾ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-"ਟੈਕਸਟ, ਜੋ ਕਿ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ, ਜਦੋਂ ਸੁਨੇਹੇ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਜਿਸ 'ਚ "
-"ਅਸਲੀ ਲੇਖਕ ਲਈ "
-"ਸੁਨੇਹਾ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Forward message."
-msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ।"
-
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"ਟੈਸਕਟ, ਜੋ ਕਿ ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ ਹੈ, ਦਰਸਾਉਂਦਾ ਹੈ ਕਿ ਅੱਗੇ "
-"ਭੇਜਿਆ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Original message."
-msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"ਟੈਕਸਟ, ਜੋ ਕਿ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ, ਜਦੋਂ ਸੁਨੇਹੇ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਉੱਤੇ "
-"ਲਿਖਣਾ), ਜਿਸ 'ਚ "
-"ਲਿਖਿਆ ਹੈ ਕਿ ਅਸਲੀ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:52
-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."
-msgstr ""
-"ਇਹ ਮੁੱਲ ਖਾਲੀ ਲਾਈਨ ਹੋ ਸਕਦੀ ਹੈ, ਜਿਸ ਦਾ ਮਤਲਬ ਕੈ ਸਿਸਟਮ ਤਸਵੀਰ ਫੋਲਡਰ, ਜੋ ਕਿ ਅਕਸਰ ~/"
-"Pictures (~/ਤਸਵੀਰਾਂ) ਸੈਟ ਹੁੰਦਾ ਹੈ। ਇਹ ਫੋਲਡਰ ਨੂੰ ਤਾਂ ਵੀ ਵਰਤਿਆ ਜਾਵੇਗਾ, ਜਦੋਂ ਪਾਥ "
-"ਨਾ-ਮੌਜੂਦ "
-"ਫੋਲਡਰ ਲਈ ਪੁਆਇੰਟ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਲੋਕਲ ਫੋਲਡਰ ਵੇਖਾਉਣਾ (ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ) ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ (ਮਾਮਲਾ) ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ "
-"ਹੋਇਆ। ਲਾਗੂ "
-"ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-"ਦਰਸਾਉਂਦਾ ਹੈ ਕਿ ਕੀ ਸੁਨੇਹਾ ਹੈੱਡਰ ਨੂੰ ਪੈਨ ਝਲਕ ਵਿੱਚ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਸਮੇਟਿਆ ਹੋਵੇ "
-"ਜਾਂ ਫੈਲਾਇਆ। \"0\" "
-"= ਫੈਲਾਇਆ \"1\" = ਸਮੇਟਿਆ"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
-"ਮੇਲ ਝਲਕ ਵਿੱਚ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਅਕਾਊਂਟ ਨੂੰ ਕਿਵੇਂ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ ਦੱਸੋ। ਜਦੋਂ ਸਹੀਂ "
-"ਸੈੱਟ ਕੀਤਾ ਤਾਂ "
-"ਅਕਾਊਂਟ ਨੂੰ ਵਰਤਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਅਤੇ ਖੋਜ "
-"ਫੋਲਡਰ ਨੂੰ "
-"ਛੱਡ ਕੇ, ਨਹੀਂ ਤਾਂ ਅਕਾਊਂਟ ਨੂੰ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mail browser width"
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਚੌੜਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Default width of the mail browser window."
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mail browser height"
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Default height of the mail browser window."
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Mail browser maximized"
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵੱਧੋ-ਵੱਧ"
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Default maximized state of the mail browser window."
-msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ।"
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "\"Folder Subscriptions\" window height"
-msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ ਮੁੱਲ "
-"ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ "
-"ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ "
-"ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ "
-"ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ "
-"\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ "
-"ਮੌਜੂਦ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "\"Folder Subscriptions\" window width"
-msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਚੌੜਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ ਮੁੱਲ "
-"ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Default reply style"
-msgstr "ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"ਸੰਭ ਮੁੱਲ ਹਨ: never (ਕਦੇ ਨਹੀਂ) - ਹਮੇਸ਼ਾ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਕਦੇ ਨਾ ਬੰਦ ਕਰਨ ਲਈ, "
-"always (ਹਮੇਸ਼ਾ) - "
-"ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਹਮੇਸ਼ਾ ਬੰਦ ਕਰਨ ਲਈ, ask (ਪੁੱਛੋ)  - (ਜਾਂ ਕੋਈ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ"
-
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid "List of accounts"
-msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
-
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਸੂਚੀ ਵਿੱਚ ਲਾਈਨਾਂ "
-"ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /apps/"
-"evolution/mail/accounts ਦੇ ਅਨੁਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "List of accepted licenses"
-msgstr "ਮਨਜ਼ੂਰ ਲਾਈਸੈਂਸਾਂ ਦੀ ਲਿਸਟ"
-
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "List of protocol names whose license has been accepted."
-msgstr "ਪਰੋਟੋਕੋਲਾਂ ਨਾਂ ਦੀ ਲਿਸਟ, ਜਿਹਨਾਂ ਦਾ ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "\"Filter Editor\" window height"
-msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "\"Filter Editor\" window maximize state"
-msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ "
-"ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਵਿੰਡੋ "
-"ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ "
-"ਨਹੀਂ ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ "
-"\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ "
-"ਮੌਜੂਦ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "\"Filter Editor\" window width"
-msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਚੌੜਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"ਕੀ ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਨਵੇਂ ਸੁਨੇਹੇ ਖੋਜਣੇ ਹਨ। ਇਸ ਵਿੱਚ ਆਉਟਬਾਕਸ ਤੋਂ "
-"ਭੇਜੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਸ਼ਾਮਲ "
-"ਹਨ।"
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਜਾਂਚ ਕਰਨੀ "
-"ਹੈ, \"ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ "
-"ਹਰੇਕ X ਮਿੰਟ ਬਾਅਦ ਚੈੱਕ ਕਰੋ\" ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋਏ। ਇਹ ਚੋਣ ਨੂੰ ਕੇਵਲ "
-"'send_recv_on_start' ਚੋਣ "
-"ਨਾਲ ਜੋੜ ਕੇ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "\"Send and Receive Mail\" window height"
-msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਪੱਤਰ\" ਵਿੰਡੋ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
-
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ "
-"ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਵਿੰਡੋ "
-"ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ "
-"ਨਹੀਂ ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ "
-"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ "
-"ਹੀ ਮੌਜੂਦ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "\"Send and Receive Mail\" window width"
-msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਮੇਲ\" ਵਿੰਡੋ ਚੌੜਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "\"Search Folder Editor\" window height"
-msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਉਚਾਈ"
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ "
-"ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ "
-"ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ "
-"ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾਂਦਾ, "
-"ਜਦੋਂ \"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ "
-"ਵਜੋਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+#: ../mail/em-vfolder-editor-rule.c:514
+msgid "Search Folder Sources"
+msgstr "ਖੋਜ ਫੋਲਡਰ ਸਰੋਤ"
 
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "\"Search Folder Editor\" window width"
-msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਚੌੜਾਈ"
+#: ../mail/em-vfolder-editor-rule.c:544
+msgid "Automatically update on any _source folder change"
+msgstr "ਕਿਸੇ ਵੀ ਸਰੋਤ ਫੋਲਡਰ ਬਦਲਾਅ ਲਈ ਆਪਣੇ-ਆਪ ਹੀ ਅੱਪਡੇਟ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ "
-"ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
-"ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+#: ../mail/em-vfolder-editor-rule.c:556
+msgid "All local folders"
+msgstr "ਸਭ ਲੋਕਲ ਫੋਲਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Drag'n'drop export format"
-msgstr "ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਐਕਸਪੋਰਟ ਫਾਰਮੈਟ"
+#: ../mail/em-vfolder-editor-rule.c:557
+msgid "All active remote folders"
+msgstr "ਸਭ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are "
-"mbox or pdf"
-msgstr ""
-"ਜਦੋਂ ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਕਰਨ ਲਈ ਈਮੇਲ ਐਕਸਪੋਰਟ ਫਾਰਮੈਟ ਦਿਉ। ਸੰਭਵ ਮੁੱਲ ਹਨ ਜਾਂ mbox ਜਾਂ "
-"pdf ਹੈ।"
+#: ../mail/em-vfolder-editor-rule.c:558
+msgid "All local and active remote folders"
+msgstr "ਸਭ ਲੋਕਲ ਅਤੇ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid "Format of the drag'n'drop export filename"
-msgstr "ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਐਕਸਪੋਰਟ ਫਾਇਲ-ਨਾਂ ਦਾ ਫਾਰਮੈਟ"
+#: ../mail/em-vfolder-editor-rule.c:559
+msgid "Specific folders"
+msgstr "ਖਾਸ ਫੋਲਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid ""
-"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
-"email sent date), 2 (: drag'n'drop date)"
-msgstr ""
-"ਐਕਸਪੋਰਟ ਕੀਤੀਆਂ ਫਾਇਲ-ਨਾਂ YYYYmmDDHHMMSS_email_title ਹੋਵੇਗਾ, ਸੰਭਵ ਮੁੱਲ: 1 "
-"(:ਈਮੇਲ ਭੇਜਣ "
-"ਮਿਤੀ), 2(:ਡਰੈਗ-ਡਰੋਪ ਮਿਤੀ)।"
+#: ../mail/em-vfolder-editor-rule.c:594
+#| msgid "Create subfolders"
+msgid "include subfolders"
+msgstr "ਸਬ-ਫੋਲਡਰਾਂ ਸਮੇਤ"
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "ਈਲਮ ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1042
+#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
+#: ../modules/mail/e-mail-shell-view.c:1073
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: ../mail/importers/elm-importer.c:400
+#: ../mail/importers/elm-importer.c:379
 msgid "Evolution Elm importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਈਲਮ ਇੰਪੋਰਟਰ"
 
-#: ../mail/importers/elm-importer.c:401
+#: ../mail/importers/elm-importer.c:380
 msgid "Import mail from Elm."
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਇੰਪੋਰਟ ਹੈ।"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/dbx-import/dbx-importer.c:255
 msgid "_Destination folder:"
 msgstr "ਟਿਕਾਣਾ ਫੋਲਡਰ(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:557
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "Select folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
 #: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../plugins/dbx-import/dbx-importer.c:262
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "Select folder to import into"
 msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
@@ -13461,8 +12667,8 @@ msgstr "ਪੱਤਰ-ਬਕਸਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿ�
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:621
-#: ../plugins/pst-import/pst-importer.c:770
+#: ../plugins/dbx-import/dbx-importer.c:616
+#: ../plugins/pst-import/pst-importer.c:784
 #, c-format
 msgid "Importing '%s'"
 msgstr "`%s' ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
@@ -13472,20 +12678,19 @@ msgstr "`%s' ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Scanning %s"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ %s"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:251
 msgid "Importing Pine data"
 msgstr "ਪਾਈਨ ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
+#: ../mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਾਈਨ ਇੰਪੋਟਰ"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Pine ਤੋਂ ਪੱਤਰ ਇੰਪੋਰਟ ਹੈ।"
 
@@ -13556,127 +12761,104 @@ msgid "Header content"
 msgstr "ਹੈੱਡਰ ਸਮੱਗਰੀ"
 
 #: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "ਦਸਤਖਤ ਸ਼ਾਮਿਲ(_A)"
-
-#: ../mail/mail-config.ui.h:6
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ ਵਿੱਚ ਵਰਤੀ\n"
-"ਜਾਵੇਗੀ।ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ ਵੇਖਾਉਣ ਦੇ ਕੰਮ\n"
-" ਆਵੇਗੀ।"
-
-#: ../mail/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "ਸਕ੍ਰਿਪਟ(_S):"
-
-#: ../mail/mail-config.ui.h:11
 msgid "Default Behavior"
 msgstr "ਡਿਫਾਲਟ ਰਵੱਈਆ"
 
-#: ../mail/mail-config.ui.h:12
-#| msgid "Format messages in _HTML"
+#: ../mail/mail-config.ui.h:6
 msgid "For_mat messages in HTML"
 msgstr "HT_ML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "ਈਮੋਸ਼ਨ ਚਿੱਤਰ ਆਟੋਮੈਟਿਕ ਸ਼ਾਮਿਲ ਕਰੋ(_e)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "ਪੜ੍ਹਨ ਰਸੀਦ ਹਮੇਸ਼ਾ ਮੰਗੋ(_d)"
 
-#: ../mail/mail-config.ui.h:15
-#| msgid "Encode file names in an Outlook/GMail way"
+#: ../mail/mail-config.ui.h:9
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "ਆਉਟਲੁੱਕ/ਜੀਮੇਲ ਢੰਗ ਨਾਲ ਫਾਇਲ ਨਾਂ ਇੰਕੋਡ ਕਰੋ(_O)"
 
-#: ../mail/mail-config.ui.h:16
-#| msgid "Ch_aracter Encoding"
+#: ../mail/mail-config.ui.h:10
 msgid "Ch_aracter encoding:"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_a):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
 msgstr "ਜਵਾਬ ਅਤੇ ਅੱਗੇ ਭੇਜੇਜਵਾਬ ਅਤੇ ਅੱਗੇ ਭੇਜਜਵਾਬ ਅਤੇ ਅੱਗ"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "ਜਵਾਬ ਸਟਾਈਲ(_R):"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਈਲ(_F):"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "ਜਦੋਂ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ ਤਾਂ ਹੇਠਾਂ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ(_t)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:15
 msgid "_Keep signature above the original message on replying"
 msgstr "ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਦਸਤਖਤ ਅਸਲੀ ਸੁਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖੋ(_K)"
 
-#: ../mail/mail-config.ui.h:22
-#| msgid "Ignore Reply-To: for mailing lists"
+#: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟਾਂ ਲਈ ਜਵਾਬ-ਦਿਓ: ਅਣਡਿੱਠਾ(_n)"
 
-#: ../mail/mail-config.ui.h:23
-#| msgid "Group Reply goes only to mailing list, if possible"
+#: ../mail/mail-config.ui.h:17
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "ਗਰੁੱਪ ਜਵਾਬ ਕੇਵਲ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਜਵਾਬ ਦਿਓ, ਜੇ ਸੰਭਵ ਹੋਵੇ(_u)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:18
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "ਜਦੋਂ ਅਸਲੀ ਸੁਨੇਹੇ ਨੂੰ ਸਾਇਨ ਕੀਤਾ ਹੋਵੇ (PGP ਜਾਂ S/MIME) ਤਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਜ਼ਿਟਲ "
 "ਰੂਪ ਵਿੱਚ ਸਾਇਨ ਕਰੋ"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:20
 msgid "Sig_natures"
 msgstr "ਦਸਤਖਤ(_n)"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:21
 msgid "Signatures"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:22
 msgid "_Languages"
 msgstr "ਭਾਸ਼ਾ(_L)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:23
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ, ਸਿਰਫ ਉਹਨਾਂ ਨੂੰ ਵੇਖਾਉਦੀ ਹੈ, ਜਿਨਾਂ ਲਈ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:24
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ਟੇਬਲ"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "ਜਿਵੇਂ ਮੈਂ ਲਿਖਾਂ, ਨਾਲ ਦੀ ਨਾਲ ਹੀ ਸਪੈੱਲ ਚੈੱਕ ਕਰੋ"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:27
 msgid "Color for _misspelled words:"
 msgstr "ਗਲਤ ਸ਼ਬਦ-ਜੋੜ ਅੱਖਰਾਂ ਦਾ ਰੰਗ(_m):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:29
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:30
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -13685,588 +12867,293 @@ msgstr ""
 "ਤੋਂ ਪਹਿਲਾਂ ਪੁੱਛੋ:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:32
 msgid "Sending a message with an _empty subject line"
 msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸੁਨੇਹਾ ਭੇਜਣ(_e)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:34
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "ਜਦੋਂ ਵੀ ਸੁਨੇਹੇ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ, ਜੋ ਕਿ _Bcc ਪ੍ਰਾਪਤਕਰਨ ਵਾਲੇ ਹੋਣ"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:36
 msgid "Sending a _private reply to a mailing list message"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਸੁਨੇਹੇ ਲਈ ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ ਭੇਜਣ ਦੌਰਾਨ ਪੁੱਛੋ(_p)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:38
 msgid "Sending a reply to a large _number of recipients"
 msgstr "ਵੱਡੀ ਗਿਣਤੀ ਵਿੱਚ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਜਵਾਬ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ(_n)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:40
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ ਨੂੰ ਲਿਸਟ ਉੱਤੇ ਭੇਜਣ ਲਈ ਮਨਜ਼ੂਰੀ(_m)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "ਪ੍ਰਾਪਤ ਕਰਤਾਵਾਂ ਨੂੰ ਇੱਕ ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ, ਜਦੋਂ ਮੇਲ ਐਡਰੈਸ ਨਹੀਂ ਦਿੱਤਾ "
 "ਗਿਆ(_r)"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:43
 msgid "Confirmations"
 msgstr "ਪੁਸ਼ਟੀ"
 
-#: ../mail/mail-config.ui.h:52
-msgid "SHA1"
-msgstr "SHA1"
-
-#: ../mail/mail-config.ui.h:53
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:54
-msgid "SHA384"
-msgstr "SHA384"
-
-#: ../mail/mail-config.ui.h:55
-msgid "SHA512"
-msgstr "SHA512"
-
-#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:58
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
+#: ../mail/mail-config.ui.h:51
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "ਅਟੈਚਮੈਂਟ"
 
-#: ../mail/mail-config.ui.h:59
-#| msgid "Inline (Outlook style)"
+#: ../mail/mail-config.ui.h:52
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "ਇਨਲਾਈਨ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)"
 
-#: ../mail/mail-config.ui.h:60
-#| msgid "Quoted"
+#: ../mail/mail-config.ui.h:53
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.ui.h:61
-#| msgid "Do not quote"
+#: ../mail/mail-config.ui.h:54
 msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "ਕੋਟ ਨਾ ਕਰੋ"
 
-#: ../mail/mail-config.ui.h:62
-#| msgid "Inline"
+#: ../mail/mail-config.ui.h:55
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "ਲਾਈਨ 'ਚ"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "ਪਰਾਕਸੀ ਸੈਟਿੰਗ"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "ਸਿਸਟਮ ਡਿਫਾਲਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:58
 msgid "_Direct connection to the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਲਈ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:59
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤੀ ਪਰਾਕਸੀ ਸੰਰਚਨਾ(_M):"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:60
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾਕਸੀ:"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:61
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ(_S):"
 
-#: ../mail/mail-config.ui.h:69
-#| msgid "SOCKS proxy port"
+#: ../mail/mail-config.ui.h:62
 msgid "SOC_KS Proxy:"
 msgstr "SOC_KS ਪਰਾਕਸੀ ਪੋਰਟ"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "No _Proxy for:"
 msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ(_P):"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "ਪੋਰਟ:"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Use Authe_ntication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਵਰਤੋਂ(_n)"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Us_ername:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_e):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:69
 msgid "Check for new _messages on start"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕਰੋ(_m)"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:70
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਕਰੋ(_g)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਵਾਂਗ ਉਹੀ ਫੋਂਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "ਸਟੈਂਡਰਡ ਫੋਂਟ(_t):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Fix_ed Width Font:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ(_e):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:77
+msgid "_Mark messages as read after"
+msgstr "ਇਸ ਦੇ ਬਾਅਦ ਵਿੱਚ ਸੁਨੇਹੇ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਓ(_M)"
+
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ(_q)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "ਰੰਗ"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:81
 msgid "Default character e_ncoding:"
 msgstr "ਮੂਲ ਅੱਖਰ ਇਕੋਡਿੰਗ(_n):"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:82
 msgid "Apply the same _view settings to all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਲਈ ਇਹੀ ਝਲਕ ਸੈਟਿੰਗ ਲਾਗੂ ਕਰੋ(_v)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:83
 msgid "F_all back to threading messages by subject"
 msgstr "ਥਰਿੱਡ ਸੁਨੇਹਿਆਂ ਵਾਸਤੇ ਫਾਲਬੈਕ ਲਈ ਵਿਸ਼ਾ(_a)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "ਮੇਲ ਹਟਾਓ"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਫੋਲਡਰ ਬੰਦ ਕਰ ਦਿਓ(_x)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
 msgstr "ਫੋਲਡਰ ਦੇ ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰੋ(_w)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:88
 msgid "_Show animated images"
 msgstr "ਐਨੀਮੇਟ ਹੋਏ ਚਿੱਤਰ ਵੇਖੋ(_S)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:89
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸੁਨੇਹਾ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ, ਜੋ ਕਿ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹਨ (_P)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਕਦੇ ਵੀ ਲੋਡ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:92
 msgid "_Load images only in messages from contacts"
 msgstr "ਕੇਵਲ ਸੰਪਰਕਾਂ ਤੋਂ ਆਏ ਸੁਨੇਹਿਆਂ 'ਚ ਚਿੱਤਰ ਲੋਡ ਕਰੋ(_L)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਹਮੇਸ਼ਾ ਪ੍ਰਾਪਤ ਕਰੋ(_A)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML ਸੁਨੇਹੇ"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "ਲੇਬਲ"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:97
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਤਸਵੀਰ ਦੀ ਖੋਜ ਸਿਰਫ਼ ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੀ ਕਰੋ(_e)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "ਸੁਨੇਹਾ ਹੈੱਡਰ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:100
 msgid "Mail Headers Table"
 msgstr "ਮੇਲ ਹੈੱਡਰ ਟੇਬਲ"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
+#: ../mail/mail-config.ui.h:101
+#: ../modules/addressbook/autocompletion-config.c:90
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "ਮਿਤੀ/ਸਮਾਂ ਫਾਰਮੈਟ"
 
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "ਹੈੱਡਰ"
-
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:103
 msgid "Check incoming _messages for junk"
 msgstr "ਜੰਕ ਲਈ ਆ ਰਹੇ ਸੁਨੇਹੇ ਚੈੱਕ ਕਰੋ(_m)"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:104
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਮੇਲ ਹਟਾਓ(_x)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
 msgstr "ਜੰਕ ਲਈ ਕਸਟਮ ਹੈੱਡਰ ਚੈੱਕ ਕਰੋ(_s)"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:106
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ਜੇ ਭੇਜਣ ਵਾਲਾ ਮੇਰੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ ਜੰਕ ਨਾ ਬਣਾਓ(_k)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:107
 msgid "_Lookup in local address book only"
 msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਹੀ ਵੇਖੋ(_L)"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:108
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ਚੋਣ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਜੇ ਰਲਦਾ ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਖੋਜਿਆ ਜਾਵੇ।"
 
-#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
 
-#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "TLS ਇੰਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "SSL ਇੰਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Special Folders"
-msgstr "ਖਾਸ ਫੋਲਡਰਖਾਲਸ"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(_F):"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਫੋਲਡਰ(_M):"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "ਰੱਦੀ ਫੋਲਡਰ(_T):"
-
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "ਜੰਕ ਫੋਲਡਰ(_J):"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "ਸੁਨੇਹੇ ਲਿਖਣੇ"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਲੁਕਵੀਂ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(_BCC):"
-
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ਇਸ ਨੂੰ ਹਮੇਸ਼ਾ ਕਾਰਬਨ ਕਾਪੀ ਭੇਜੀ ਜਾਵੇ(CC):"
-
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤਕਰਤਾ"
-
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "ਸੁਨੇਹਾ ਰਸੀਦ ਭੇਜੋ(_e):"
-
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ"
-
-#: ../mail/mail-config.ui.h:129
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
-"ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\""
-
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ"
-
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_A):"
-
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "ਪੂਰਾ ਨਾਂ(_E):"
-
-#: ../mail/mail-config.ui.h:134
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "ਚੋਣਵੀਂ ਜਾਣਕਾਰੀ"
-
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "ਦਸਤਖਤ(_u):"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "ਨਵੇਂ ਦਸਤਖਤ ਸ਼ਾਮਿਲ ਕਰੋ(_w)..."
-
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "ਸੰਗਠਨ(_g):"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Re_ply-To:"
-msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
-
-#: ../mail/mail-config.ui.h:139
-msgid "_Make this my default account"
-msgstr "ਮੇਰੇ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਮੂਲ ਬਣਾਓ(_M)"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ) (_D)"
-
-#: ../mail/mail-config.ui.h:141
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "ਪ੍ਰਿੱਟੀ ਗੁੱਡ ਪਰਾਈਵੇਸੀ (PGP/GPG)"
-
-#: ../mail/mail-config.ui.h:142
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG _Key ID:"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "ਸਾਈਨਿੰਗ ਐਲੋਗਰਿਥਮ(_g):"
-
-#: ../mail/mail-config.ui.h:144
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "ਇਸ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਭੇਜਣ ਵਾਲੇ ਸੁਨਹਿਆਂ ਤੇ ਹਮੇਸ਼ਾ ਦਸਤਖਤ ਕਰੋ(_w)"
-
-#: ../mail/mail-config.ui.h:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਮੈਨੂੰ ਹਮੇਸ਼ਾ ਇੰਕ੍ਰਿਪਟ ਕਰੋ(_m)"
-
-#: ../mail/mail-config.ui.h:146
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਕਰਨ ਸਮੇਂ ਮੇਰੇ ਕੀ-ਰਿੰਗ ਉੱਤੇ ਭਰੋਸਾ ਰੱਖੋ(_t)"
-
-#: ../mail/mail-config.ui.h:147
-msgid "Secure MIME (S/MIME)"
-msgstr "ਸੁਰੱਖਿਅਤ MIME (S/MIME)"
-
-#: ../mail/mail-config.ui.h:148
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਖੁਦ ਇੰਕ੍ਰਿਪਟ ਕਰੋ(_f)"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "ਬਾਹਰੀ ਜਾਣ ਵਾਲੇ ਪੱਤਰਾਂ ਨੂੰ ਇਕ੍ਰਿਪਸ਼ਨ (ਮੂਲ ਹੀ)(_g)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਡਿਜ਼ੀਟਲ ਸਾਈਨ ਕਰੋ (ਡਿਫਾਲਟ)(_s)"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Encry_ption certificate:"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ(_p):"
-
-#: ../mail/mail-config.ui.h:152
-msgid "Sig_ning certificate:"
-msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "ਚੁਣੋ(_e)..."
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "ਸਾਫ਼ ਕਰੋ(_r)"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "ਸਾਈਨਿੰਗ ਐਲੋਗਰਿਥਮ(_a):"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "ਸਾਫ਼ ਕਰੋ(_a)"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "ਸਰਵਰ ਟਾਈਪ(_T): "
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "ਵੇਰਵਾ"
-
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ਸੰਰਚਨਾ"
-
-#: ../mail/mail-config.ui.h:162
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "ਸਰਵਰ(_S):"
-
-#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:660
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:272
-msgid "User_name:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "ਮੇਲ-ਬਾਕਸ ਟਿਕਾਣਾ"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
-
-#: ../mail/mail-config.ui.h:168
-msgid "SSL is not supported in this build of Evolution"
-msgstr " SSL ਸਹਿਯੋਗ ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਲਈ ਸਹਿਯੋਗ ਨਹੀਂ"
-
-#: ../mail/mail-config.ui.h:169
-msgid "_Authentication Type"
-msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
-
-#: ../mail/mail-config.ui.h:170
-msgid "Ch_eck for Supported Types"
-msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_m)"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "ਸਰਵਰ ਸੰਰਚਨਾ"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "ਪੋਰਟ(_P):"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "ਸਰਵਰ ਲਈ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../mail/mail-config.ui.h:175
-#: ../modules/addressbook/addressbook-config.c:1122
-msgid "Authentication"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
-
-#: ../mail/mail-config.ui.h:176
-msgid "T_ype:"
-msgstr "ਕਿਸਮ(_y):"
-
-#: ../mail/mail-config.ui.h:177
-msgid "User _Name:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_N):"
-
-#: ../mail/mail-config.ui.h:178
-msgid "Remember _password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_p)"
-
-#: ../mail/mail-config.ui.h:179
-#| msgid "Personal details:"
-msgid "Personal Details:"
-msgstr "ਨਿੱਜੀ ਵੇਰਵਾ:"
-
-#: ../mail/mail-config.ui.h:188
-#| msgid "Encryption"
-msgid "Encryption:"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ:"
-
-#: ../mail/mail-config.ui.h:189
-#| msgid "None"
-msgid "none"
-msgstr "ਕੋਈ ਨਹੀਂ"
-
-#: ../mail/mail-config.ui.h:190
-#| msgid "Label"
-msgid "label"
-msgstr "ਲੇਬਲ"
-
 #: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "ਖੋਜ ਫੋਲਡਰ ਸਰੋਤ"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "ਸਭ ਲੋਕਲ ਫੋਲਡਰ"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "ਸਭ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "ਸਭ ਲੋਕਲ ਅਤੇ ਸਰਗਰਮ ਰਿਮੋਟ ਫੋਲਡਰ"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "ਖਾਸ ਫੋਲਡਰ"
-
-#: ../mail/mail-dialogs.ui.h:6
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14274,72 +13161,72 @@ msgstr ""
 "ਸੁਨੇਹੇ, ਜੋ ਕਿ ਤੁਸੀਂ ਪਿੱਛਾ ਕਰਨ ਲਈ ਚੁਣੇ ਸਨ, ਹੇਠਾਂ ਦਿੱਤੇ ਜਾ ਰਹੇ ਹਨ।\n"
 "\"ਫਲੈਗ\" ਮੇਨੂੰ ਵਿੱਚੋਂ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਚੁਣ।"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "ਦੇਣਯੋਗ(_D):"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ਮੁਕੰਮਲ(_m)"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Call"
 msgstr "ਕਾਲ"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "ਅੱਗੇ ਨਾ ਭੇਜੋ"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "ਸਹਾਇਕ"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਲਈ"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "ਅੱਗੇ"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "ਕੋਈ ਜਵਾਬ ਲੋੜੀਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
 msgstr "ਮੁੜ-ਜਾਂਚ"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "ਲਾਈਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾਈਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਚੁਣੋ(_T)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "ਡਿਜ਼ਟਲ ਦਸਤਖਤ"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ"
 
@@ -14554,7 +13441,7 @@ msgstr ""
 "ਹੋ?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(_E)"
 
@@ -14643,14 +13530,24 @@ msgstr ""
 "ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/mail.error.xml.h:60
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਖਾਲੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../mail/mail.error.xml.h:62
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ \"{0}\"; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ \"{0}\" ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -14658,21 +13555,21 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਫੋਲਡਰ ਹਟਾ ਦਿੱਤਾ ਤਾਂ, ਇਸ ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰਾਂ ਦੇ ਸਾਰੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ "
 "ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਫੋਲਡਰ ਹਟਾ ਦਿੱਤਾ ਤਾਂ, ਇਸ ਦੀ ਸਾਰੀ ਸਮੱਗਰੀ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "ਇਹ ਸੁਨੇਹੇ ਕਾਪੀ ਨਹੀਂ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -14684,66 +13581,66 @@ msgstr ""
 "ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ "
 "ਇਹ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਦਾ ਨਾਂ \"{1}\" ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ \"{1}\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਇੱਕ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ ਜੀ।"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ਫੋਲਡਰ \"{0}\" ਨੂੰ \"{1}\" ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "ਸਰੋਤ\"{2}\" ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "ਨਿਯਤ \"{2}\" ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਫੋਲਡਰ ਨੂੰ \"{1}\" ਵਿੱਚ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "ਫੋਲਡਰ \"{0}\" ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "ਸਰੋਤ \"{1}\" ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "ਅਕਾਊਂਟ ਲਈ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "ਤੁਸੀਂ ਸਾਰੀ ਲਾਜ਼ਮੀ ਜਾਣਕਾਰੀ ਭਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਮੇਂ ਦੋ ਅਕਾਊਂਟ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "ਕੀ ਤੁਸੀਂ ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਅਕਾਊਂਟ ਅਤੇ ਇਸ ਦੇ ਸਭ ਪਰਾਕਸੀਆਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14751,58 +13648,33 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਅਤੇ ਸਭ ਪਰਾਕਸੀ ਜਾਣਕਾਰੀ ਨੂੰ\n"
 "ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "ਕੀ ਤੁਸੀਂ ਇਹ ਅਕਾਊਂਟ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ ਅਤੇ ਇਸ ਦੇ ਸਭ ਪਰਾਕਸੀਆਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ "
 "ਹੋ?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਸਭ ਪਰਾਕਸੀ ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "ਬੰਦ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:626
 msgid "_Disable"
 msgstr "ਆਯੋਗ(_D)"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Could not save signature file."
-msgstr "ਦਸਤਖਤੀ ਫਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ \"{0}\" ਸੈਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
-
-#  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਅਤੇ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
-
 #: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "ਖੋਜ ਫੋਲਡਰ \"{0}\" ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14810,41 +13682,41 @@ msgstr ""
 "ਇਹ ਫੋਲਡਰ ਲੁਪਤ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਖੋਜ\n"
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ਖੋਜ ਫੋਲਡਰ \"{0}\" ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "ਫੋਲਡਰ ਨਾਂ \"{0}\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਦਿਓ ਜੀ।"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਹੀ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲਟਰ ਆਟੋਮੈਟਿਕ ਹੀ ਅੱਪਡੇਟ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "ਫੋਲਡਰ ਗੁੰਮ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਖੋਜ ਫੋਲਡਰ ਦਾ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਚੁਣਿਆ।"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14854,12 +13726,12 @@ msgstr ""
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚੁਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਲੋਕਲ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ "
 "ਚੁਣ ਕੇ।"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ਪੁਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ \"{0}\" ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
 #  mail:ask-migrate-existing secondary
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14872,23 +13744,23 @@ msgstr ""
 "ਹੋ ਜਾਂ ਬੰਦ ਕਰ "
 "ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "ਉੱਤੇ ਲਿਖੋ(_O)"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "ਨਾਲ ਜੋੜ੍ਹੋ(_A)"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਦਾ ਲੋਕਲ ਮੇਲ ਫਾਰਮੈਟ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 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 "
@@ -14910,19 +13782,19 @@ msgstr ""
 "ਹੈ। ਜੇ ਤੁਸੀਂ "
 "ਮਾਈਗਰੇਟ ਕਰਨਾ ਚਾਹੁੰਦੋ ਹੇ ਤਾਂ ਪੱਕਾ ਕਰਨ ਲਵੋ ਕਿ ਲੋੜੀਦੀ ਮਾਤਰਾ 'ਚ ਥਾਂ ਤੁਹਾਡੇ ਕੋਲ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ(_E)"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "ਹੁਣੇ ਮਾਈਗਰੇਟ ਕਰੋ(_M)"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "ਲਾਈਸੈਂਸ ਫਾਇਲ ਪੜ੍ਹਨ ਵਿੱਚ ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 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."
@@ -14932,32 +13804,24 @@ msgstr ""
 "ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ "
 "ਹੁੰਦੇ।"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "ਉਡੀਕੋ ਜੀ।"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨਾਲ ਕਿਊਰੀ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:126
-msgid "Unable to connect to the GroupWise server."
-msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
-
-#: ../mail/mail.error.xml.h:127
-msgid "Please check your account settings and try again."
-msgstr "ਆਪਣੀ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ਕੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਫੋਲਡਰ ਲੋਕਲੀ ਸੈਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14965,75 +13829,74 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਲੋਕਲ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ "
 "ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
 msgstr "ਸਿੰਕਰੋਨਾਈਜ਼ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:126
 msgid "_Synchronize"
 msgstr "ਸਿੰਕਰੋਨਾਈਜ਼(_S)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:127
 msgid "Do you want to mark all messages as read?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:128
 msgid "This will mark all messages as read in the selected folder."
 msgstr "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:130
 msgid "Close message window."
 msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਬੰਦ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:131
 msgid "Would you like to close the message window?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਬੰਦ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:132
 msgid "_Yes"
 msgstr "ਹਾਂ(_Y)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:133
 msgid "_No"
 msgstr "ਨਹੀਂ(_N) "
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:134
 msgid "_Always"
 msgstr "ਹਮੇਸ਼ਾ(_A)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:135
 msgid "N_ever"
 msgstr "ਕਦੇ ਨਹੀਂ(_e)"
 
-#  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:141
-msgid "Signature Already Exists"
-msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
+#: ../mail/mail.error.xml.h:136
+#| msgid "Copying folder %s"
+msgid "Copy folder in folder tree."
+msgstr "ਫੋਲਡਰ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਕਾਪੀ ਕਰੋ।"
 
-#  mail:no-rename-folder-exists secondary
-#  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:142
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "ਨਾਂ \"{1}\" ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ ਜੀ।"
+#: ../mail/mail.error.xml.h:137
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਫੋਲਡਰ ਨੂੰ '{1}' ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:143
-msgid "Blank Signature"
-msgstr "ਖਾਲੀ ਦਸਤਖਤ"
+#: ../mail/mail.error.xml.h:138
+#| msgid "Moving folder %s"
+msgid "Move folder in folder tree."
+msgstr "ਫੋਲਡਰ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../mail/mail.error.xml.h:144
-msgid "Please provide an unique name to identify this signature."
-msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ ਜੀ।"
+#: ../mail/mail.error.xml.h:139
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "ਕੀ ਤੁਸੀਂ '{0}' ਫੋਲਡਰ ਨੂੰ '{1}' ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:140
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -15042,49 +13905,55 @@ msgstr ""
 "ਹੈ, ਉਹ ਤਾਂ "
 "ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:141
 msgid "Please enable the account or send using another account."
 msgstr "ਅਕਾਊਂਟ ਚਾਲੂ ਕਰੋ ਜਾਂ ਹੋਰ ਵੱਖਰੇ ਅਕਾਊਂਟ ਨਾਲ ਭੇਜੋ ਜੀ।"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:142
 msgid "Mail Deletion Failed"
 msgstr "ਮੇਲ ਹਟਾਉਣਾ ਫੇਲ੍ਹ"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:143
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:144
 msgid "\"Check Junk\" Failed"
 msgstr "\"ਜੰਕ ਚੈੱਕ ਕਰੋ\" ਫੇਲ੍ਹ ਹੈ"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Junk\" Failed"
 msgstr "\"ਜੰਕ ਰਿਪੋਰਟ ਕਰੋ\" ਫੇਲ੍ਹ ਹੈ"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:146
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"ਜੰਕ ਨਹੀਂ ਰਿਪੋਰਟ ਕਰੋ\" ਫੇਲ੍ਹ ਹੈ"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:147
 msgid "Remove duplicate messages?"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਹਨ?"
 
 #  mail-composer:recover-autosave title
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:148
 msgid "No duplicate messages found."
 msgstr "ਕੋਈ ਡੁਪਲੀਕੇਟ ਸੁਨੇਹਾ ਨਹੀਂ ਲੱਭਾ।"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:150
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ਫੋਲਡਰ '{0}' ਵਿੱਚ ਕੋਈ ਵੀ ਡੁਪਲੀਕੇਟ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:156
-msgid "Failed to unsubscribe from folder."
-msgstr "ਮੈਂਬਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+#: ../mail/mail.error.xml.h:151
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; ਅਕਾਊਂਟ ਨਾਲ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:153
+#| msgid "Failed to unsubscribe from folder."
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../mail/mail.error.xml.h:154
 msgid "Unable to retrieve message."
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
@@ -15100,207 +13969,196 @@ msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਮਰੱ�
 #  mail:session-message-error-cancel secondary
 #  mail:ask-session-password secondary
 #  mail:filter-load-error secondary
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:155
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to open folder."
 msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to find duplicate messages."
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹੇ ਲੱਭਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
 msgstr "ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
 msgstr "ਸੁਨੇਹਿਆਂ ਤੋਂ ਅਟੈਚਮੈਂਟ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to download messages for offline viewing."
 msgstr "ਆਫਲਾਈਨ ਵੇਖਣ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to save messages to disk."
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:162
 msgid "Hidden file is attached."
 msgstr "ਲੁਕਵੀਂ ਫਾਇਲ ਅਟੈਚ ਕੀਤੀ ਗਈ।"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:163
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr ""
 "{0} ਨਾਂ ਦੀ ਅਟੈਚਮੈਂਟ ਲੁਕਵੀਂ ਫਾਇਲ ਹੈ ਅਤੇ ਇਸ ਵਿੱਚ ਸੰਵੇਦਨਸ਼ੀਲ ਡਾਟਾ ਹੋ ਸਕਦਾ ਹੈ। "
-"ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ "
-"ਦੀ ਪੜਤਾਲ ਕਰੋ।"
+"ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਦੀ "
+"ਪੜਤਾਲ ਕਰੋ।"
+
+#: ../mail/mail.error.xml.h:164
+#| msgid "Print this calendar"
+msgid "Printing failed."
+msgstr "ਪਰਿੰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ।"
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:165
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "ਪਰਿੰਟਰ ਨੇ &quot;{0}&quot; ਜਵਾਬ ਦਿੱਤਾ।"
+
+#: ../mail/mail.error.xml.h:166
+#| msgid "Could not open destination"
+msgid "Could not perform this operation on {0}."
+msgstr "{0} ਉੱਤੇ ਇਹ ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
+
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭੇਜਣੇ ਅਤੇ ਲੈਣੇ"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ ਕਰੋ(_A)"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/mail-vfolder.c:82
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "ਖੋਜ ਫੋਲਡਰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
-
-#: ../mail/mail-vfolder.c:219
-#, c-format
-#| msgid "Updating Search Folders for '%s' : %s"
-msgid "Updating Search Folders for '%s' - %s"
-msgstr "'' %s - %s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
-
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:562
-#, 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\"."
-msgstr[0] ""
-"ਅਕਾਊਂਟ ਲਈ ਹਟਾਏ ਫੋਲਡਰ \"%2$s\" ਵਾਸਤੇ ਖੋਜ ਫੋਲਡਰ \"%1$s\"\n"
-"ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ"
-msgstr[1] ""
-"ਹਟਾਏ ਗਏ ਫੋਲਡਰ \"%2$s\"\n"
-"ਲਈ ਅਕਾਊਂਟ ਦੇ ਅੱਗੇ ਦਿੱਤੇ ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਸੋਧਿਆ ਗਿਆ ਹੈ\n"
-"%1$s"
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "ਖੋਜ ਫੋਲਡਰ"
 
-#: ../mail/mail-vfolder.c:1195
+#: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸੋਧ"
 
-#: ../mail/mail-vfolder.c:1306
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "ਨਵਾਂ ਖੋਜ ਫੋਲਡਰ"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "ਅੱਗੇ ਭੇਜੇ"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹੁ ਨਾ-ਵੇਖੇ ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "ਬਹੁ-ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "ਸਭ ਤੋਂ ਘੱਟ"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "ਘੱਟ"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1898 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1905 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "ਅੱਜ %l:%M %p"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1914
 msgid "Yesterday %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1926
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1934
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1936
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2761
 msgid "Select all visible messages"
 msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਚੁਣੋ"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2897 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "ਸੁਨੇਹੇ"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4124
 msgid "Follow-up"
 msgstr "ਧਿਆਨ ਰੱਖੋ"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4638 ../mail/message-list.c:5058
+#: ../mail/message-list.c:4626 ../mail/message-list.c:5030
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/message-list.c:4875
+#: ../mail/message-list.c:4860
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"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."
 msgstr ""
-"ਕੋਈ ਸੁਨੇਹਾ ਤੁਹਾਡੀ ਖੋਜ ਮੁਤਾਬਕ ਨਹੀਂ ਹੈ। ਜਾਂ ਤਾਂ ਖੋਜ -> ਖੋਜ ਮੇਨੂ ਆਈਟਮ ਰਾਹੀਂ ਸਾਫ਼ "
-"ਕਰੋ ਜਾਂ ਬਦਲੋ ਜੀ।"
+"ਤੁਹਾਡੀਆਂ ਖੋਜ ਸ਼ਰਤਾਂ ਨੂੰ ਪੂਰਾ ਕਰਦਾ ਕੋਈ ਵੀ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ। ਉੱਤੇ ਦਿੱਤੀ ਲਟਕਦੀ ਲਿਸਟ "
+"ਤੋਂ ਨਵੇਂ ਖੋਜ ਸੁਨੇਹਾ "
+"ਫਿਲਟਰ ਚਣਨ ਕੇ ਖੋਜ ਸ਼ਰਤ ਦਿਉ ਜਾਂ ਇਸ ਨੂੰ ਖੋਜ->ਮੇਨੂ ਆਈਟਮ ਸਾਫ਼ ਕਰੋ ਜਾਂ ਉੱਤੇ ਕਿਊਰੀ "
+"ਨੂੰ ਬਦਲੋ।"
 
-#: ../mail/message-list.c:4877
+#: ../mail/message-list.c:4865
 msgid "There are no messages in this folder."
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
 
@@ -15312,11 +14170,6 @@ msgstr "ਨਿਸ਼ਾਨਬੱਧ"
 msgid "Received"
 msgstr "ਮਿਲੇ"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "ਅਕਾਰ"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "ਨਿਸ਼ਾਨ ਹਾਲਤ"
@@ -15342,506 +14195,383 @@ msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Recipients contain"
 msgstr "ਸੁਨੇਹੀਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Message contains"
 msgstr "ਸੁਨੇਹੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Subject contains"
 msgstr "ਵਿਸ਼ੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Sender contains"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Body contains"
 msgstr "ਪੱਤਰ 'ਚ ਹੈ"
 
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ "
-"LDAP ਸਰਵਰ "
-"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ "
-"LDAP ਸਰਵਰ "
-"TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ "
-"ਤੁਹਾਡਾ "
-"ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਕੈਲੰਡਰ 'ਚ ਵਰਤੋਂ(_s)"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr "ਆਫਲਾਈਨ ਓਪਰੇਸ਼ਨ ਲਈ ਬੁੱਕ ਸਮੱਗਰੀ ਕਾਪੀ ਕਰੋ(_b)"
-
-#: ../modules/addressbook/addressbook-config.c:812
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ "
-"ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ "
-"ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ "
-"ਹੈ।"
-
-#: ../modules/addressbook/addressbook-config.c:898
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"ਈਮੇਲ "
-"ਐਡਰੈੱਸ\" ਨਿਰਧਾਰਿਤ "
-"ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹੁੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
-
-#: ../modules/addressbook/addressbook-config.c:987
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ "
-"ਜਾਵੇ। "
-"\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" "
-"ਨਾਲ "
-"ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "ਵੇਰਵਾ"
-
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
-
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML ਹੈ।"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-"\"ਸੰਪਰਕ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਐਡਰੈੱਸ ਬੁੱਕ ਦੀ UID ਹੈ।"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show maps in preview pane."
-msgstr "ਕੀ ਝਲਕ ਪੱਟੀ ਵਿੱਚ ਨਕਸ਼ੇ ਵੇਖਾਉਣੇ ਹਨ।"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-msgstr "ਕੀ ਐਡਰੈਸ ਨੂੰ ਟਿਕਾਣਾ ਦੇਸ਼ਨ ਦੇ ਮਿਆਰ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕਰਨਾ ਹੈ।"
-
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1125
 msgid "_Table column:"
 msgstr "ਟੇਬਲ ਕਾਲਮ(_ T):"
 
-#: ../modules/addressbook/autocompletion-config.c:197
-#| msgid "Free/Busy information"
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "ਐਡਰੈਸ ਫਾਰਮੈਟ"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:102
 msgid "_Format address according to standard of its destination country"
 msgstr "ਐਡਰੈਸ ਨੂੰ ਇਸ ਦੇ ਟਿਕਾਣਾ ਦੇਸ਼ ਦੇ ਮਿਆਰ ਮੁਤਾਬਕ ਫਾਰਮੈਟ(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
 msgstr "ਸਵੈ-ਪੂਰਤੀ"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "ਆਟੋ-ਪੂਰਾ ਕੀਤੇ ਸੰਪਰਕ ਦਾ ਐਡਰੈੱਸ ਹਮੇਸ਼ਾ ਵੇਖੋ"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "ਕਈ vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ਲਈ vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
 #, c-format
 msgid "Contact information"
 msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:197
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
+#: ../modules/addressbook/e-book-shell-backend.c:229
+#: ../modules/addressbook/e-book-shell-view-actions.c:131
+msgid "New Address Book"
+msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰਕ(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-backend.c:240
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "Create a new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-backend.c:247
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Create a new contact list"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-backend.c:257
+#: ../modules/addressbook/e-book-shell-view-actions.c:834
 msgid "Create a new address book"
 msgstr "ਇੱਕ ਸੁਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-view.c:356
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgid "Certificates"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:204
+msgid "Address Book Properties"
+msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:386
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Save as vCard"
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "Co_py All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਕਾਪੀ (_p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:813
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੇ ਸੰਪਰਕ ਦੀ ਕਾਪੀ ਹੋਰ ਨੂੰ ਭੇਜੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "D_elete Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਹਟਾਓ(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "Delete the selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਹਟਾਓ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Mo_ve All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜੋ(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Move the contacts of the selected address book to another"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰਾਂ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "_New Address Book"
 msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Address _Book Properties"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show properties of the selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Address Book _Map"
 msgstr "ਐਡਰੈਸ ਬੁੱਕ ਨਕਸ਼ਾ(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/addressbook/e-book-shell-view-actions.c:848
 msgid "Show map with all contacts from selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈਸ ਬੁੱਕ ਤੋਂ ਸਭ ਸੰਪਰਕ ਨਾਲ ਨਕਸ਼ਾ ਵੇਖਾਓ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "_Rename..."
 msgstr "ਨਾਂ ਬਦਲੋ(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "Rename the selected address book"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Stop loading"
 msgstr "ਲੋਡ ਕਰਨਾ ਰੋਕੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "_Copy Contact To..."
 msgstr "ਸੰਪਰਕਾਂ ਇੱਥੇ ਕਾਪੀ ਕਰੋ(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Copy selected contacts to another address book"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਹੋਰ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "_Delete Contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਓ(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "_Find in Contact..."
 msgstr "ਸੰਪਰਕ ਵਿੱਚ ਖੋਜ(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Search for text in the displayed contact"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੰਪਰਕ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "_Forward Contact..."
 msgstr "ਸੰਪਰਕ ਨੂੰ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Send selected contacts to another person"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਭੇਜੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "_Move Contact To..."
 msgstr "ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
 msgid "Move selected contacts to another address book"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਹੋਰ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "_New Contact..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "New Contact _List..."
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "_Open Contact"
 msgstr "ਸੰਪਰਕ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "View the current contact"
 msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "_Send Message to Contact..."
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Send a message to the selected contacts"
 msgstr "ਸੁਨੇਹਾ ਚੁਣੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-task-shell-view-actions.c:847
 msgid "_Actions"
 msgstr "ਕਾਰਵਾਈ(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/calendar/e-memo-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:854
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
 msgid "_Preview"
 msgstr "ਝਲਕ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/calendar/e-cal-shell-view-actions.c:1621
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:867
 msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Address Book Map"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਨਕਸ਼ਾ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Contact _Preview"
 msgstr "ਸੰਪਰਕ ਝਲਕ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show contact preview window"
 msgstr "ਸੰਪਰਕ ਝਲਕ ਵਿੰਡੋ ਵੇਖੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Show _Maps"
 msgstr "ਨਕਸ਼ੇ ਵੇਖਾਓ(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Show maps in contact preview window"
 msgstr "ਸੰਪਰਕ ਝਲਕ ਵਿੰਡੋ ਵਿੱਚ ਨਕਸ਼ੇ ਵੇਖਾਓ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "_Classic View"
 msgstr "ਟਕਸਾਲੀ ਝਲਕ(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "Show contact preview below the contact list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਸੰਪਰਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Vertical View"
 msgstr "ਲੰਬਕਾਰੀ ਝਲਕ(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਦੇ ਨਾਲ ਸੰਪਰਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:960
 msgid "Any Category"
 msgstr "ਕੋਈ ਕੈਟਾਗਰੀ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1041
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1791
+#: ../modules/calendar/e-memo-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:1005
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "ਤਕਨੀਕੀ ਖੋਜ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1084
 msgid "Print all shown contacts"
 msgstr "ਸਭ ਦਿਖਾਈ ਦਿੰਦੇ ਸੰਪਰਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1091
 msgid "Preview the contacts to be printed"
 msgstr "ਪਰਿੰਟ ਜਾਣ ਵਾਲੇ ਸੰਪਰਕਾਂ ਦੀ ਝਲਕ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1098
 msgid "Print selected contacts"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "S_ave Address Book as vCard"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ vC_ard ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "ਚੁਣੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ vCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1131
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)...."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
 msgid "Save selected contacts as a vCard"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ VCard ਵਜੋਂ ਸੰਭਾਲੋ"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:300
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:302
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:333
 msgid "_Send Message to Contacts"
 msgstr "ਸੰਪਰਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:335
 msgid "_Send Message to List"
 msgstr "ਲਿਸਟ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:337
 msgid "_Send Message to Contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
@@ -15850,10 +14580,12 @@ msgid "Anonymously"
 msgstr "ਅਣਜਾਣ"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "ਵਿੱਲਣ ਨਾਂ (DN) ਵਰਤੋਂ"
 
@@ -15871,13 +14603,17 @@ msgstr "ਅਧੀਨ"
 msgid "Supported Search Bases"
 msgstr "ਸਹਾਇਕ ਖੋਜ ਆਧਾਰ"
 
+#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
+msgid "_Port:"
+msgstr "ਪੋਰਟ(_P):"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
-#| msgid "_Server:"
 msgid "Ser_ver:"
 msgstr "ਸਰਵਰ(_v):"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
-#| msgid "_Use secure connection:"
 msgid "Use secure _connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_c):"
 
@@ -15902,7 +14638,6 @@ msgid "_Find Possible Search Bases"
 msgstr "ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਲੱਭੋ(_F)"
 
 #: ../modules/addressbook/ldap-config.ui.h:21
-#| msgid "Search _filter:"
 msgid "S_earch filter:"
 msgstr "ਫਿਲਟਰ ਖੋਜ(_e):"
 
@@ -15930,8 +14665,7 @@ msgid "5"
 msgstr "੫"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-#| msgid "contact"
-#| msgid_plural "contacts"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "contacts"
 msgstr "ਸੰਪਰਕ"
 
@@ -15948,368 +14682,565 @@ msgstr "ਡਾਊਨਲੋਡ ਸੀਮਾ(_D):"
 msgid "B_rowse this book until limit reached"
 msgstr "ਇਹ ਕਿਤਾਬ ਸੀਮਾ ਅੱਪੜ ਤੱਕ ਵੇਖੋ(_r)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "ਬੋਗੋਫਿਲਟਰ ਸਵੈਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ (%s): "
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#| msgid "Audio Inline"
+msgid "Audio Player"
+msgstr "ਆਡੀਓ ਪਲੇਅਰ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
-msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "ਬੋਗੋਫਿਲਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇਹੇ ਸਟਰੀਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+msgid "Play the attachment in embedded audio player"
+msgstr "ਇੰਬੈਡ ਕੀਤੇ ਆਡੀਓ ਪਲੇਅਰ ਵਿੱਚ ਅਟੈਚਮੈਂਟ ਚਲਾਉ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
-msgid "Bogofilter either crashed or failed to process a mail message"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+#| "settings, mail filters etc."
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 msgstr ""
-"ਬੋਗੋਫਿਲਟਰ ਜਾਂ ਤਾਂ ਕਰੈਸ਼ ਹੋ ਗਿਆ ਹੈ ਜਾਂ ਮੇਲ ਸੁਨੇਹੇ ਨੂੰ ਪ੍ਰੋਸੈਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+"ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰ ਸਕਦੇ ਹੋ।\n"
+"\n"
+"ਇਹ ਤੁਹਾਡੀ ਨਿੱਜੀ ਡਾਟਾ, ਸੈਟਿੰਗ, ਮੇਲ ਫਿਲਟਰ ਆਦਿ ਰੀਸਟੋਰ ਕਰੇਗੀ।"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+#| msgid "Restore from backup"
+msgid "_Restore from a backup file:"
+msgstr "ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ(_R):"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+#| msgid "Choose a file to restore"
+msgid "Choose a backup file to restore"
+msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਬੈਕਅੱਪ ਫਾਇਲ ਚੁਣੋ"
+
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#| msgid "Restore from backup"
+msgid "Restore from Backup"
+msgstr "ਬੈਕ-ਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
-msgid "Bogofilter Options"
-msgstr "Bogofilter ਚੋਣਾਂ"
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "ਈਵੂਲੇਸਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
-msgid "Convert message text to _Unicode"
-msgstr "ਮੇਲ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ(_U)"
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "ਬੈਕ ਅੱਪ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ(_R)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
-msgid "Bogofilter"
-msgstr "ਬੋਗੋਲਫਿਲਟਰ"
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
+msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"'ਕੈਲੰਡਰ' ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਕੈਲੰਡਰੀ ਲਿਸਟ ਦੀ UID ਹੈ।"
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "ਰੀ-ਸਟੋਰ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ ਚਾਲੂ(_R)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ "
-"ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
-"ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕਰੋ(_B)..."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਚੁਣੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਸਮਾਂ-ਖੇਤਰ ਵਰਤੋਂ"
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਅਕਾਇਵ ਫਾਇਲ ਵਿੱਚ ਬੈਕਅੱਪ ਕਰੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ ਵੇਖਣਾ ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ। ਮੁੱਲ 'timezone' ਕੁੰਜੀ "
-"ਵਿੱਚ ਵਰਤੇ ਵਾਂਗ ਹੈ"
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰੋ(_e)..."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤੇ ਦੂਜੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਲਿਸਟ"
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਅਕਾਇਵ ਫਾਇਲ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr "ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "Back up Evolution directory"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ ਬੈਕਅੱਪ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"'day_second_zones' ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
+#: ../modules/backup-restore/evolution-backup-tool.c:85
+msgid "Restore Evolution directory"
+msgstr "ਰੀ-ਸਟੋਰ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "ਕੀ ਸਮਾਂ ਸਵੇਰੇ/ਸ਼ਾਮ ਦੀ ਬਜਾਏ ੪ ਘੰਟਿਆਂ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਵੇ।"
+#: ../modules/backup-restore/evolution-backup-tool.c:87
+msgid "Check Evolution Back up"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਚੈੱਕ ਕਰੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "ਹਫਤਾ ਸ਼ੁਰੂ ਹੋਣ ਦਾ ਦਿਨ, ਐਤਵਾਰ (੦) ਤੋਂ ਸ਼ਨਿਚੱਰਵਾਰ (੬)।"
+#: ../modules/backup-restore/evolution-backup-tool.c:89
+msgid "Restart Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
+#: ../modules/backup-restore/evolution-backup-tool.c:91
+msgid "With Graphical User Interface"
+msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ।"
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:469
+msgid "Shutting down Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ "
-"ਹੁੰਦੀ ਹੈ, ਜੋ "
-"ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
+#: ../modules/backup-restore/evolution-backup-tool.c:324
+msgid "Backing Evolution accounts and settings"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Vertical pane position"
-msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
+#: ../modules/backup-restore/evolution-backup-tool.c:341
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ "
-"ਵਿੱਚ ਹੁੰਦੀ ਹੈ, "
-"ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
+#: ../modules/backup-restore/evolution-backup-tool.c:357
+msgid "Back up complete"
+msgstr "ਬੈਕਅੱਪ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ "
-"ਹੁੰਦੀ ਹੈ, ਜੋ "
-"ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
+msgid "Restarting Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:475
+msgid "Back up current Evolution data"
+msgstr "ਮੌਜੂਦਾ ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕਰੋ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:483
+msgid "Extracting files from back up"
+msgstr "ਬੈਕਅੱਪ ਤੋਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:570
+msgid "Loading Evolution settings"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈਟਿੰਗ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:624
+msgid "Removing temporary back up files"
+msgstr "ਆਰਜ਼ੀ ਬੈਕਅੱਪ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:636
+msgid "Reloading registry service"
+msgstr "ਰਜਿਸਟਰੀ ਸੇਵਾ ਫੇਰ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:861
+msgid "Evolution Back Up"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕ-ਅੱਪ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:862
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "ਫੋਲਡਰ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:866
+msgid "Evolution Restore"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:867
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "ਫੋਲਡਰ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:935
+msgid "Backing up Evolution Data"
+msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:936
+msgid "Please wait while Evolution is backing up your data."
+msgstr "ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲੈ ਰਹੀ ਹੈ ਤਾਂ ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/backup-restore/evolution-backup-tool.c:938
+msgid "Restoring Evolution Data"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:939
+msgid "Please wait while Evolution is restoring your data."
+msgstr "ਈਵੈਲੂਸ਼ਨ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਡਾਟੇ ਨੂੰ ਰੀ-ਸਟੋਰ ਕਰਦੀ ਹੈ, ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:957
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "ਇਹ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਡਾਟੇ ਦੀ ਮਾਤਰਾ ਮੁਤਾਬਕ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "ਗਲਤ ਈਵੇਲੂਸ਼ਨ ਬੈਕ-ਅੱਪ ਫਾਇਲ"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਠੀਕ ਬੈਕ-ਅੱਪ ਫਾਇਲ ਚੁਣੋ ਜੀ।"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "ਕੀ ਤੁਸੀਂ ਈਵੂਲੇਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ "
-"ਵਿੱਚ ਹੁੰਦੀ ਹੈ, "
-"ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+"ਆਪਣੇ ਡਾਟੇ ਤੇ ਸੈਟਿੰਗ ਦਾ ਬੈਕ-ਅੱਪ ਲੈਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨਾ "
+"ਪਵੇਗਾ। ਯਕੀਨੀ ਬਣਾਉ "
+"ਕਿ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਨਾ-ਸੰਭਾਲੇ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲ ਲਿਆ ਹੈ।"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ ਤੇ ਬੈਕਅੱਪ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਸੂਚੀ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ "
-"ਵਿੱਚ ਹੈ।"
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "ਕੀ ਤੁਸੀਂ ਚੁਣੀ ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਈਵੇਲੂਸ਼ਨ ਰੀ-ਸਟੋਰ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
 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."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
-"ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਮੀਮੋ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। \"0"
-"\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
-"ਝਲਕ "
-"ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
+"ਆਪਣੇ ਡਾਟੇ ਜਾਂ ਸੈਟਿੰਗ ਨੂੰ ਰੀਸਟੋਰ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨੀ "
+"ਪਵੇਗੀ। ਯਕੀਨੀ ਬਣਾਓ "
+"ਕਿ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਨਾ-ਸੰਭਾਲਿਆ ਡਾਟਾ ਸੰਭਾਲ ਚੁੱਕੇ ਹੋ। ਇਸ ਨਾਲ ਤੁਹਾਡਾ "
+"ਮੌਜੂਦਾ ਸਭ ਈਵੇਲੂਸ਼ਨ "
+"ਡਾਟਾ ਤੇ ਸੈਟਿੰਗ ਨੂੰ ਹਟਾਇਆ ਜਾਵੇਗਾ ਤੇ ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਤੋਂ ਉਨ੍ਹਾਂ ਨੂੰ ਮੁੜ-ਸਟੋਰ ਕੀਤਾ "
+"ਜਾਵੇਗਾ।"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ ਤੇ ਰੀਸਟੋਰ ਕਰੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਹਰੀਜੱਟਲ ਹੋਵੇ।"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "ਅਧੂਰੇ ਅਧਿਕਾਰ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ।"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "ਚੁਣਿਆ ਫੋਲਡਰ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ।"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-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."
+#: ../modules/bogofilter/evolution-bogofilter.c:149
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "ਬੋਗੋਫਿਲਟਰ ਸਵੈਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:167
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "ਬੋਗੋਫਿਲਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇਹੇ ਸਟਰੀਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:216
+msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
-"ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਟਾਸਕ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। \"0"
-"\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
-"ਝਲਕ "
-"ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
+"ਬੋਗੋਫਿਲਟਰ ਜਾਂ ਤਾਂ ਕਰੈਸ਼ ਹੋ ਗਿਆ ਹੈ ਜਾਂ ਮੇਲ ਸੁਨੇਹੇ ਨੂੰ ਪ੍ਰੋਸੈਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+#: ../modules/bogofilter/evolution-bogofilter.c:318
+msgid "Bogofilter Options"
+msgstr "Bogofilter ਚੋਣਾਂ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ।"
+#: ../modules/bogofilter/evolution-bogofilter.c:327
+msgid "Convert message text to _Unicode"
+msgstr "ਮੇਲ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ(_U)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ ਐਤਵਾਰ ਨੂੰ "
-"ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ "
-"ਵੇਖਾਇਆ ਜਾਵੇ।"
+#: ../modules/bogofilter/evolution-bogofilter.c:483
+msgid "Bogofilter"
+msgstr "ਬੋਗੋਲਫਿਲਟਰ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#| msgid "S_tandard Font:"
+msgid "Standard LDAP Port"
+msgstr "ਸਟੈਂਡਰਡ LDAP ਪੋਰਟ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "ਦਿਨ, ਜਿੰਨਾ ਤੋਂ ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਸ਼ੁਰੂ ਅਤੇ ਅੰਤ ਹੁੰਦੇ ਹਨ, ਵੇਖਾਉਣ ਲ਼ਈ"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+msgid "LDAP over SSL (deprecated)"
+msgstr "SSL ਉੱਤੇ LDAP (ਬਰਤਰਫ਼ ਕੀਤਾ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "ਕੀ ਕੈਲੰਡਰ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ (ਮੌਜੂਦਾ ਸਮੇਂ ਦੀ ਰੇਖਾ) ਖਿੱਚਣੀ ਹੈ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr "ਮਾਈਕਰੋਸਾਫਟ ਗਲੋਬਲ ਕੈਟਾਲਾਗ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr "SSL ਉੱਤੇ ਮਾਈਕਰੋਸਾਫਟ ਗਲੋਬਲ ਕੈਟਾਲਾਗ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "ਸਮਾਂ ਰੇਖਾ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਖਿੱਚਣ ਲਈ ਰੰਗ (ਮੂਲ ਖਾਲੀ ਹੈ)।"
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#| msgid "Reconnecting to '%s'"
+msgid "Connecting to LDAP"
+msgstr "LDAP ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr ""
-"ਖੱਬੇ ਪਾਸੇ ਹੇਠਾਂ ਕੈਲੰਡਰ ਵਿੱਚ ਮੁੜ ਵਾਪਰਨ ਵਾਲੇ ਈਵੈਂਟ ਲਈ ਦਿਨ ਤਿਰਛੇ ਰੂਪ 'ਚ ਵੇਖਾਉ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
-msgstr "\"ਮੀਮੋ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਮੀਮੋ ਲਿਸਟ ਦੀ UID ਹੈ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#| msgid "(Not Recommended)"
+msgid "StartTLS (recommended)"
+msgstr "startTLS (ਸਿਫਾਰਸ਼ੀ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+msgid "Encryption:"
+msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+msgid "Authentication"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#| msgid "Anonymously"
+msgid "Anonymous"
+msgstr "ਅਣਜਾਣ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#| msgid "Input Methods"
+msgid "Method:"
+msgstr "ਢੰਗ:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#| msgid ""
+#| "This is the method Evolution will use to authenticate you.  Note that "
+#| "setting this to \"Email Address\" requires anonymous access to your LDAP "
+#| "server."
 msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
-msgstr "\"ਟਾਸਕ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਟਾਸਕ ਲਿਸਟ ਦੀ UID ਹੈ।"
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
+msgstr ""
+"ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਦੀ ਵਰਤੋਂ\" "
+"ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹੁੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ।"
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr "LDAP ਦੀ ਵਰਤੋਂ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:116
+msgid "Searching"
+msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#| msgid "Search _base:"
+msgid "Search Base:"
+msgstr "ਖੋਜ ਬੇਸ:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "ਸਭ ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਵਰਤੋਂ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#| msgid "Log Level"
+msgid "One Level"
+msgstr "ਇੱਕ ਲੈਵਲ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+msgid "Subtree"
+msgstr "ਸਬ-ਟਰੀ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#| msgid "_Search scope:"
+msgid "Search Scope:"
+msgstr "ਖੋਜ ਹੱਦ:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#| msgid ""
+#| "The search scope defines how deep you would like the search to extend "
+#| "down the directory tree. A search scope of \"sub\" will include all "
+#| "entries below your search base. A search scope of \"one\" will only "
+#| "include the entries one level beneath your base."
 msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਟਾਸਟ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+"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."
+msgstr ""
+"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ "
+"ਜਾਵੇ। "
+"\"Subtree\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ "
+"\"One Level\" ਨਾਲ "
+"ਤੁਹਾਡੇ ਖੋਜ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
-msgid "Number of units for determining when to hide tasks."
-msgstr "ਕੰਮ ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#| msgid "Search Filter"
+msgid "Search Filter:"
+msgstr "ਖੋਜ ਫਿਲਟਰ:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ਕੰਮ ਦਾ ਰੰਗ, ਜਿਨਾਂ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀ ਹੈ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+msgid "Limit:"
+msgstr "ਹੱਦ:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#| msgid "B_rowse this book until limit reached"
+msgid "Browse until limit is reached"
+msgstr "ਹੱਦ ਅੱਪੜਨ ਤੱਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:133
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Whether to set a default reminder for appointments."
-msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "ifMatch ਅਣਡਿੱਠਾ (Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Number of units for determining a default reminder."
-msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
+#, c-format
+#| msgid "GConf error: %s"
+msgid "HTTP Error: %s"
+msgstr "HTTP ਗਲਤੀ: %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
+#| msgid "Could not parse PGP message: "
+msgid "Could not parse response"
+msgstr "ਜਵਾਬ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "ਕੀ ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
+#| msgid "Empty message"
+msgid "Empty response"
+msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇਗੰਢ ਰੀਮਾਈਡਰ ਜਾਣਨ ਲਈ ਇਕਾਈਆਂ ਦੀ ਗਿਣਤੀ"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#| msgid "Send _reply to sender"
+msgid "Unexpected reply from server"
+msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
-"ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇ-ਗੰਢ ਰੀਮਾਈਡਰ ਲਈ ਯੂਨਿਟ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+#  FIXME: domain/code
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
+#| msgid "Could not find any user calendar."
+msgid "Could not locate user's calendars"
+msgstr "ਯੂਜ਼ਰ ਕੈਲੰਡਰ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
+#| msgid "_Path:"
+msgid "Path"
+msgstr "ਮਾਰਗ"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#| msgid "Choose calendar file"
+msgid "Choose a Calendar"
+msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "ਕੀ ਕੈਲੰਡਰ 'ਚ ਕਈ ਥਾਵਾਂ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਉਣਾ ਹੈ।"
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#| msgid "New Memo List"
+msgid "Choose a Memo List"
+msgstr "ਮੀਮੋ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Scroll Month View by a week"
-msgstr "ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਅੱਗੇ ਪਿੱਛੇ ਕਰੋ"
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#| msgid "Select a Task List"
+msgid "Choose a Task List"
+msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ।"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+#| msgid "_Calendars"
+msgid "Find Calendars"
+msgstr "ਕੈਲੰਡਰ ਲੱਭੋ"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+#| msgid "Memo List"
+msgid "Find Memo Lists"
+msgstr "ਮੀਮੋ ਲਿਸਟ ਲੱਭੋ"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+#| msgid "Task List"
+msgid "Find Task Lists"
+msgstr "ਕੰਮ ਲਿਸਟ ਲੱਭੋ"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
+#| msgid "_Path:"
+msgid "Path:"
+msgstr "ਮਾਰਗ:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+msgid "Email:"
+msgstr "ਈਮੇਲ:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+#| msgid "Server _handles meeting invitations"
+msgid "Server handles meeting invitations"
+msgstr "ਸਰਵਰ ਮੀਟਿੰਗ ਸੱਦੇ ਹੈਂਡਲ ਕਰਦਾ ਹੈ"
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+#| msgid "Look up in address books"
+msgid "Choose which address books to use."
+msgstr "ਵਰਤਣ ਲਈ ਐਡਰੈਸ ਬੁੱਕ ਚੁਣੋ।"
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#| msgid "U_se in Birthday & Anniversaries calendar"
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਕੈਲੰਡਰ 'ਚ ਵਰਤੋਂ(_s)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Time the last reminder ran, in time_t."
-msgstr "ਸਮਾਂ ਜਦੋਂ ਰੀਮਾਈਡਰ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)।"
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#| msgid "D_elete Calendar"
+msgid "Default User Calendar"
+msgstr "ਮੂਲ ਯੂਜ਼ਰ ਕੈਲੰਡਰ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Calendars to run reminders for"
-msgstr "ਰੀਮਾਈਡਰ ਚਲਾਉਣ ਲਈ ਕੈਲੰਡਰ"
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, c-format
+#| msgid "Enter the password for '%s'"
+msgid "Enter Google password for user '%s'."
+msgstr "ਯੂਜ਼ਰ '%s' ਲਈ ਗੂਗਲ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Programs that are allowed to be run by reminders."
-msgstr "ਪ੍ਰੋਗਰਾਮ, ਜੋ ਕਿ ਰੀਮਾਈਡਰ ਵਲੋਂ ਚਲਾਉਣ ਦੀ ਇਜ਼ਾਜ਼ਤ ਹੈ।"
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "ਯੂਜ਼ਰ ਨੇ ਪਾਸਵਰਡ ਦੇਣ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "ਰੀਮਾਈਡਰ ਵੇਖਾਉਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr "ਮੌਜੂਦਾ iCalendar (ics) ਫਾਇਲ ਵਰਤੋਂ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Free/busy server URLs"
-msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ URL"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+#| msgid "iCalendar (.ics)"
+msgid "iCalendar File"
+msgstr "iCalendar ਫਾਇਲ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "List of server URLs for free/busy publishing."
-msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਬਲੀਕੇਸ਼ਨ ਲਈ ਸਰਵਰ URL ਦੀ ਸੂਚੀ ਹੈ।"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#| msgid "Choose calendar file"
+msgid "Choose an iCalendar file"
+msgstr "iCalendar ਫਾਇਲ ਚੁਣੋ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, 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 ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ "
-"ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ "
-"ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+#| msgid "_File:"
+msgid "File:"
+msgstr "ਫਾਇਲ:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ 0। ਚੇਤਾਵਨੀ ਲਈ 1। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ 2।"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+#| msgid "Allows Evolution to display text part of limited size"
+msgid "Allow Evolution to update the file"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਫਾਇਲ ਅੱਪਡੇਟ ਕਰਨ ਦਿਉ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "ਇੰਪੋਰਟ(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "ਕੰਮ ਇੰਪੋਰਟ(_m)"
 
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
-msgstr "ਰੀਮਾਈਡਰ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ"
+#: ../modules/calendar/e-calendar-preferences.c:406
+#| msgid "Selected Calendars for Reminders"
+msgid "Selected Calendars for Alarms"
+msgstr "ਅਲਾਰਮ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:828
 msgid "Ti_me and date:"
 msgstr "ਸਮਾਂ ਤੇ ਮਿਤੀ(_m):"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "_Date only:"
 msgstr "ਕੇਵਲ ਮਿਤੀ(_D):"
 
@@ -16375,7 +15306,7 @@ msgid "_24 hour"
 msgstr "_੨੪ ਘੰਟੇ"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Work Week"
 msgstr "ਕੰਮ ਹਫਤਾ"
 
@@ -16468,13 +15399,15 @@ msgstr "ਮਹੀਨੇ ਨੂੰ ਹਫ਼ਤੇ ਨਾਲ ਹਿਲਾਉ(_r)"
 msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "ਕੰਮ ਲਿਸਟ"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-#| msgid "T_asks due today:"
 msgid "Highlight t_asks due today"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਨੂੰ ਉਭਾਰੋ(_a)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
-#| msgid "_Overdue tasks:"
 msgid "Highlight _overdue tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਉਭਾਰੋ(_o)"
 
@@ -16528,92 +15461,72 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "ਪਬਲਿਸ਼ਿੰਗ ਜਾਣਕਾਰੀ"
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:114
-#: ../modules/calendar/e-memo-shell-migrate.c:155
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "ਵੈੱਬ ਤੇ"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "ਮੌਸਮ"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
-
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:192
+msgid "New Calendar"
+msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
+
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮੁਲਾਕਾਤ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-backend.c:289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
 msgid "Create a new appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੀਂ ਸਾਰਾ-ਦਿਨ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:475
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:800
+#: ../modules/calendar/e-cal-shell-backend.c:597
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:209
 msgid "Loading calendars"
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-msgid "_New Calendar..."
-msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)..."
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
+#: ../modules/calendar/e-cal-shell-sidebar.c:715
 msgid "Calendar Selector"
 msgstr "ਕੈਲੰਡਰ ਚੋਣਕਾਰ "
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1114
+#: ../modules/calendar/e-cal-shell-sidebar.c:1074
 #, c-format
-msgid "Opening calendar at %s"
-msgstr "%s ਤੋਂ ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+#| msgid "Opening calendar at %s"
+msgid "Opening calendar '%s'"
+msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-msgid "Print"
-msgstr "ਪਰਿੰਟ ਕਰੋ"
+#: ../modules/calendar/e-cal-shell-view-actions.c:292
+msgid "Calendar Properties"
+msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -16625,543 +15538,615 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:340
 msgid "Purge events older than"
 msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:591
 msgid "Copying Items"
 msgstr "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:885
 msgid "Moving Items"
 msgstr "ਆਈਟਮਾਂ ਭੇਜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1218
 msgid "event"
 msgstr "ਈਵੈਂਟ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:549
+#: ../modules/calendar/e-task-shell-view-actions.c:666
 msgid "Save as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "_Copy..."
 msgstr "ਕਾਪੀ ਕਰੋ(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "D_elete Calendar"
 msgstr "ਕੈਲੰਡਰ ਹਟਾਓ(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete the selected calendar"
 msgstr "ਚੁਣਿਆ ਕੈਲੰਡਰ ਹਟਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Go Back"
 msgstr "ਪਿੱਛੇ ਜਾਉ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Go Forward"
 msgstr "ਅੱਗੇ ਜਾਉ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Select today"
 msgstr "ਅੱਜ ਚੁਣੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "Select _Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Select a specific date"
 msgstr "ਖਾਸ ਮਿਤੀ ਚੁਣੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Purg_e"
 msgstr "ਨਿਚੋੜ(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Purge old appointments and meetings"
 msgstr "ਪੁਰਾਣੀ ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗਾਂ ਵਿੱਚ ਸੋਧ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Re_fresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Refresh the selected calendar"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Rename the selected calendar"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+msgid "Find _next"
+msgstr "ਅੱਗੇ ਖੋਜ(_n)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#| msgid "Find the next occurrence of the phrase"
+msgid "Find next occurrence of the current search string"
+msgstr "ਮੌਜੂਦਾ ਖੋਜ ਵਾਕ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#| msgid "_Previous"
+msgid "Find _previous"
+msgstr "ਪਿੱਛੇ ਖੋਜ(_p)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#| msgid "Find the previous occurrence of the phrase"
+msgid "Find previous occurrence of the current search string"
+msgstr "ਮੌਜੂਦਾ ਖੋਜ ਵਾਕ ਦੀ ਪਿਛਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+msgid "Stop _running search"
+msgstr "ਚੱਲ ਰਹੀ ਖੋਜ ਰੋਕੋ(_r)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+msgid "Stop currently running search"
+msgstr "ਇਸ ਸਮੇਂ ਚੱਲ ਰਹੀ ਖੋਜ ਬੰਦ  ਕਰੋ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Show _Only This Calendar"
 msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖੋ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Cop_y to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "_Delegate Meeting..."
 msgstr "ਡੈਲੀਗੇਟ ਮੀਟਿੰਗ(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "_Delete Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਹਟਾਓ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 msgid "Delete selected appointments"
 msgstr "ਚੁਣੀ ਮੁਲਾਕਾਤ ਹਟਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "Delete This _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Delete this occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Delete All Occ_urrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_u)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Delete all occurrences"
 msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New All Day _Event..."
 msgstr "ਨਵਾਂ ਸਾਰੇ ਦਿਨ ਦਾ ਈਵੈਂਟ(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new all day event"
 msgstr "ਨਵਾਂ ਸਾਰੇ ਦਿਨ ਦਾ ਈਵੈਂਟ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "New _Meeting..."
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "Create a new meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "Mo_ve to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
 msgid "New _Appointment..."
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "_Open Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "View the current appointment"
 msgstr "ਮੌਜੂਦਾ ਮੁਲਾਕਾਤ ਦੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "_Reply"
 msgstr "ਜਵਾਬ(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "_Schedule Meeting..."
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Converts an appointment to a meeting"
 msgstr "ਮੁਲਾਕਾਤ ਨੂੰ ਮੀਟਿੰਗ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Conv_ert to Appointment..."
 msgstr "ਮੁਲਾਕਤ 'ਚ ਬਦਲੋ(_e)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Converts a meeting to an appointment"
 msgstr "ਮੀਟਿੰਗ ਨੂੰ ਮੁਲਾਕਾਤ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Day"
 msgstr "ਦਿਨ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one day"
 msgstr "ਇੱਕ ਦਿਨ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1722
 msgid "List"
 msgstr "ਲਿਸਟ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Show as list"
 msgstr "ਲਿਸਟ ਦੀ ਤਰਾਂ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1729
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Show one month"
 msgstr "ਇੱਕ ਮਹੀਨਾ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1736
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 msgid "Show one week"
 msgstr "ਇੱਕ ਹਫ਼ਤਾ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Show one work week"
 msgstr "ਇੱਕ ਕੰਮ ਹਫ਼ਤਾ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Active Appointments"
 msgstr "ਐਕਟਿਵ ਮੁਲਾਕਾਤ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Next 7 Days' Appointments"
 msgstr "ਅਗਲੇ ੭ ਦਿਨ ਦੀਆਂ ਮੁਲਾਕਾਤਾਂ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1774
 msgid "Occurs Less Than 5 Times"
 msgstr "5 ਵਾਰ ਤੋਂ ਘੱਟ ਵਾਰ ਵਾਪਰਨਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
+#: ../modules/calendar/e-memo-shell-view-actions.c:820
+#: ../modules/calendar/e-task-shell-view-actions.c:1019
 msgid "Description contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1812
+#: ../modules/calendar/e-memo-shell-view-actions.c:827
+#: ../modules/calendar/e-task-shell-view-actions.c:1026
 msgid "Summary contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Print this calendar"
 msgstr "ਇਹ ਕੈਲੰਡਰ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 msgid "Preview the calendar to be printed"
 msgstr "ਪਰਿੰਟ ਹੋਣ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਝਲਕ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:868
+#: ../modules/calendar/e-task-shell-view-actions.c:1067
 msgid "_Save as iCalendar..."
 msgstr "iCalendar ਵਜੋਂ ਸੰਭਾਲੋ(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1930
 msgid "Go To"
 msgstr "ਜਾਓ"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:547
 msgid "memo"
 msgstr "ਮੀਮੋ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 msgid "New _Memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:204
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "_Open Memo"
 msgstr "ਮੀਮੋ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:688
 msgid "View the selected memo"
 msgstr "ਚੁਣਿਆ ਮੀਮੋ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:831
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫ਼ਾ ਖੋਲ੍ਹੋ(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:853
 msgid "Print the selected memo"
 msgstr "ਚੁਣਿਆ ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1456
+#| msgid "Print this event"
+msgid "Searching next matching event"
+msgstr "ਅਗਲੇ ਮਿਲਦੇ ਈਵੈਂਟ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1457
+msgid "Searching previous matching event"
+msgstr "ਪਿਛਲਾ ਮਿਲਦਾ ਈਵੈਂਟ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1475
+#, 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 ਸਾਲਾਂ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
+#, 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 ਸਾਲਾਂ ਵਿੱਚ ਮਿਲਦਾ ਕੋਈ ਈਵੈਂਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
+msgid "Cannot search with no active calendar"
+msgstr "ਐਕਟਿਵ ਕੈਲੰਡਰ ਨਾਲ ਖੋਜ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"
+
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:664
 msgid "task"
 msgstr "ਟਾਸਕ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Mark selected tasks as complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨੂੰ ਲਿਖੋ ਕਿ ਸਮਾਪਤ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪੂਰਾ ਬਣਾਓ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "Mark selected tasks as incomplete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨੂੰ ਲਿਖੋ ਕਿ ਸਮਾਪਤ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:201
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Open Task"
 msgstr "ਕੰਮ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:826
 msgid "View the selected task"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਵੇਖੋ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1052
 msgid "Print the selected task"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:308
+#: ../modules/calendar/e-memo-shell-backend.c:193
+#: ../modules/calendar/e-memo-shell-view-actions.c:217
+msgid "New Memo List"
+msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮੀਮੋ(_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ਸਾਂਝਾ ਮੀਮੋ(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:219
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-backend.c:221
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "Create a new memo list"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:703
+#: ../modules/calendar/e-memo-shell-sidebar.c:647
 msgid "Memo List Selector"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਚੋਣਕਾਰ"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1001
+#: ../modules/calendar/e-memo-shell-sidebar.c:959
 #, c-format
-msgid "Opening memos at %s"
-msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
+#| msgid "Opening memos at %s"
+msgid "Opening memo list '%s'"
+msgstr "'%s' ਮੀਮੋ ਖੋਲ੍ਹੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:248
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:289
+msgid "Memo List Properties"
+msgstr "ਮੀਮੋ ਸੂਚੀ ਵਿਸ਼ੇਸ਼ਤਾ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
 msgid "_Delete Memo"
 msgstr "ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "_Find in Memo..."
 msgstr "ਮੀਮੋ 'ਚ ਖੋਜ(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 msgid "Search for text in the displayed memo"
 msgstr "ਦਿੱਸ ਰਹੇ ਮੀਮੋ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "D_elete Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Delete the selected memo list"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਲਿਸਟ ਹਟਾਓ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
 msgid "Refresh the selected memo list"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
 msgid "Rename the selected memo list"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
 msgid "Show _Only This Memo List"
 msgstr "ਕੇਵਲ ਇਹ ਮੀਮੋ ਲਿਸਟ ਵੇਖੋ(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Memo _Preview"
 msgstr "ਮੀਮੋ ਝਲਕ(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:753
 msgid "Show memo preview pane"
 msgstr "ਮੀਮੋ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
 msgid "Show memo preview below the memo list"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਮੀਮੋ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
 msgid "Show memo preview alongside the memo list"
 msgstr "ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਮੀਮੋ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
 msgid "Print the list of memos"
 msgstr "ਮੀਮੋ ਦੀ ਸੂਚੀ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
 msgid "Preview the list of memos to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਮੀਮੋ ਦੀ ਸੂਚੀ ਦੀ ਝਲਕ"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:236
 msgid "Delete Memos"
 msgstr "ਮੀਮੋ ਹਟਾਓ"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memo"
 msgstr "ਮੀਮੋ ਹਟਾਓ"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:427
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮੀਮੋ"
 msgstr[1] "%d ਮੀਮੋ"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-memo-shell-view-private.c:431
+#: ../modules/calendar/e-task-shell-view-private.c:612
 #, c-format
 msgid "%d selected"
 msgstr "%d ਚੁਣਿਆ"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:190
+#: ../modules/calendar/e-task-shell-view-actions.c:240
+msgid "New Task List"
+msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ"
+
+#: ../modules/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ ਕੰਮ(_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ਟਾਸਕ ਲਿਸਟ(_k)"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Create a new task list"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਸੂਚੀ ਬਣਾਉ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "ਟਾਸਕ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:703
+#: ../modules/calendar/e-task-shell-sidebar.c:647
 msgid "Task List Selector"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਚੋਣਕਾਰ"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1002
+#: ../modules/calendar/e-task-shell-sidebar.c:959
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "%s ਤੇ ਟਾਸਕ ਖੋਲ੍ਹੇ ਜਾ ਰਹੇ ਹਨ"
+#| msgid "Opening tasks at %s"
+msgid "Opening task list '%s'"
+msgstr "'%s' ਟਾਸਕ ਲਿਸਟ ਖੋਲ੍ਹੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:271
 msgid "Print Tasks"
 msgstr "ਟਾਸਕ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:312
+msgid "Task List Properties"
+msgstr "ਕੰਮ ਲਿਸਟ ਗੁਣ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:608
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17174,590 +16159,1475 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਟਾਸਕਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "Do not ask me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "_Delete Task"
 msgstr "ਟਾਸਕ ਹਟਾਓ(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "_Find in Task..."
 msgstr "ਟਾਸਕ 'ਚ ਖੋਜ(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Search for text in the displayed task"
 msgstr "ਦਿੱਸ ਰਹੀ ਟਾਸਕ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Copy..."
 msgstr "ਕਾਪੀ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "D_elete Task List"
 msgstr "ਕੰਮ ਲਿਸਟ ਹਟਾਓ(_e)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Delete the selected task list"
 msgstr "ਚੁਣੀ ਕੰਮ ਲਿਸਟ ਹਟਾਓ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_New Task List"
 msgstr "ਨਵੀਂ ਟਾਸਕ ਲਿਸਟ(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Refresh the selected task list"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "Rename the selected task list"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Show _Only This Task List"
 msgstr "ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖੋ(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 msgid "Mar_k as Incomplete"
 msgstr "ਅਧੂਰੇ ਵਜੋਂ ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:840
 msgid "Delete completed tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ ਹਟਾਓ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Task _Preview"
 msgstr "ਟਾਸਕ ਝਲਕ(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:917
 msgid "Show task preview pane"
 msgstr "ਟਾਸਕ ਝਲਕ ਪੈਨ ਵੇਖੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Show task preview below the task list"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਟਾਸਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Show task preview alongside the task list"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਨਾਲ ਟਾਸਕ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Active Tasks"
 msgstr "ਐਕਟਿਵ ਟਾਸਕ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Next 7 Days' Tasks"
 msgstr "ਅੱਗੇ ੭ ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Overdue Tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Tasks with Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਨਾਲ ਟਾਸਕ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1038
 msgid "Print the list of tasks"
 msgstr "ਟਾਸਕ ਲਿਸਟ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "Preview the list of tasks to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਟਾਸਕ ਲਿਸਟ ਦੀ ਝਲਕ"
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:371
 msgid "Delete Tasks"
 msgstr "ਟਾਸਕ ਹਟਾਓ"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Task"
 msgstr "ਟਾਸਕ ਹਟਾਓ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:498
+#: ../modules/calendar/e-task-shell-view-private.c:501
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:605
+#: ../modules/calendar/e-task-shell-view-private.c:608
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ਟਾਸਕ"
 msgstr[1] "%d ਟਾਸਕ"
 
-#: ../modules/mail/e-mail-attachment-handler.c:389
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
+msgid "IMAP Headers"
+msgstr "IMAP ਹੈੱਡਰ"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
+msgid ""
+"Select a predefined set of IMAP headers to fetch.\n"
+"Note, larger sets of headers take longer to download."
+msgstr ""
+"ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ IMAP ਹੈੱਡਰ ਦਾ ਪਹਿਲਾਂ-ਦਿੱਤਾ ਸਮੂਹ ਚੁਣੋ।\n"
+"ਯਾਦ ਰੱਖੋ, ਵੱਡੇ ਹੈੱਡਰ ਦਾ ਸਮੂਹ ਡਾਊਨਲੋਡ ਹੋਣ ਲਈ ਵੱਧ ਸਮਾਂ ਲੈਂਦਾ ਹੈ।"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_F)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+#| msgid "Mail Headers Table"
+msgid "_Basic Headers (fastest)"
+msgstr "ਬੇਸਿਕ ਹੈੱਡਰ (ਸਭ ਤੋਂ ਤੇਜ਼)(_B)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
+#| msgid ""
+#| "_Basic Headers (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
+msgid "Use this if you are not filtering any mailing lists."
+msgstr "ਇਹ ਵਰਤੋਂ, ਜੇ ਤੁਸੀਂ ਕੋਈ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਫਿਲਟਰ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ।"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
+#| msgid "Basic and _Mailing List Headers (Default)"
+msgid "Basic and _Mailing List Headers (default)"
+msgstr "ਮੁੱਢਲੇ ਅਤੇ ਮੇਲਿੰਗ ਸੂਚੀ ਹੈੱਡਰ (ਮੂਲ)(_M)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+msgid ""
+"Specify any extra headers to fetch in addition to the predefined set of "
+"headers selected above."
+msgstr ""
+"ਉੱਤੇ ਦਿੱਤੇ ਹੋਏ ਪਹਿਲਾਂ-ਦਰਸਾਏ ਹੈੱਡਰ ਦੇ ਸੈੱਟ ਤੋਂ ਬਿਨਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਵਾਧੂ ਹੈੱਡਰ "
+"ਦਿਉ।"
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+msgid "ITIP"
+msgstr "ITIP"
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+msgid "Display part as an invitation"
+msgstr "ਭਾਗ ਨੂੰ ਸੱਦੇ ਵਜੋਂ ਵੇਖਾਓ"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:240
+msgid "Today %H:%M"
+msgstr "ਅੱਜ %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:244
+msgid "Today %H:%M:%S"
+msgstr "ਅੱਜ %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:253
+msgid "Today %l:%M:%S %p"
+msgstr "ਅੱਜ %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:268
+msgid "Tomorrow %H:%M"
+msgstr "ਭਲਕ %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:272
+msgid "Tomorrow %H:%M:%S"
+msgstr "ਭਲਕ %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:277
+msgid "Tomorrow %l:%M %p"
+msgstr "ਭਲਕ %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "ਭਲਕ %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:300
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:305
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:314
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:318
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:327
+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.
+#: ../modules/itip-formatter/itip-view.c:333
+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.
+#: ../modules/itip-formatter/itip-view.c:337
+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.
+#: ../modules/itip-formatter/itip-view.c:342
+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.
+#: ../modules/itip-formatter/itip-view.c:346
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:352
+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.
+#: ../modules/itip-formatter/itip-view.c:357
+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.
+#: ../modules/itip-formatter/itip-view.c:361
+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.
+#: ../modules/itip-formatter/itip-view.c:366
+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.
+#: ../modules/itip-formatter/itip-view.c:370
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
+
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:409
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:499
+#: ../modules/itip-formatter/itip-view.c:588
+msgid "An unknown person"
+msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
+
+#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:592
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਜਵਾਬ ਭੇਜੋ ਜੀ"
+
+#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:594
+#, c-format
+msgid "Received on behalf of %s"
+msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਲਿਆ"
+
+#: ../modules/itip-formatter/itip-view.c:420
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:422
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%s ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:427
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:430
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:432
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:438
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:440
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:444
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s ਰਾਹੀਂ %s ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:446
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s ਤਾਜ਼ੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:450
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤਾ ਮੀਟਿੰਗ ਜਾਵਾਬ ਵਾਪਸ ਭੇਜਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:452
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:456
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:458
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:462
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੇ ਮੀਟਿੰਗ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ।"
+
+#: ../modules/itip-formatter/itip-view.c:464
+#, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:468
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:470
+#, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਅੱਗੇ ਦਿੱਤੀ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%s ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:517
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:520
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:522
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:528
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:530
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "%s ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:534
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%s ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:536
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:540
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਕੰਮ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:542
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:546
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:548
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:552
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ:"
+
+#: ../modules/itip-formatter/itip-view.c:554
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਭੇਜੇ ਹਨ:"
+
+#: ../modules/itip-formatter/itip-view.c:558
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:560
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:599
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:601
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s ਨੇ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:606
+#, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:608
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:612
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:614
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
+
+#: ../modules/itip-formatter/itip-view.c:687
+msgid "All day:"
+msgstr "ਸਾਰਾ ਦਿਨ:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+msgid "Start day:"
+msgstr "ਦਿਨ ਸ਼ੁਰੂ:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:1455
+msgid "Start time:"
+msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+msgid "End day:"
+msgstr "ਦਿਨ ਅੰਤ:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:1456
+msgid "End time:"
+msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
+
+#: ../modules/itip-formatter/itip-view.c:1008
+msgid "_Open Calendar"
+msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ(_O)"
+
+#: ../modules/itip-formatter/itip-view.c:1011
+msgid "_Decline all"
+msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../modules/itip-formatter/itip-view.c:1014
+msgid "_Decline"
+msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../modules/itip-formatter/itip-view.c:1017
+msgid "_Tentative all"
+msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
+
+#: ../modules/itip-formatter/itip-view.c:1020
+msgid "_Tentative"
+msgstr "ਆਰਜ਼ੀ(_T)"
+
+#: ../modules/itip-formatter/itip-view.c:1023
+msgid "A_ccept all"
+msgstr "ਸਭ ਮਨਜ਼ੂਰ(_c)"
+
+#: ../modules/itip-formatter/itip-view.c:1026
+msgid "A_ccept"
+msgstr "ਮਨਜ਼ੂਰ(_c)"
+
+#: ../modules/itip-formatter/itip-view.c:1029
+msgid "_Send Information"
+msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
+
+#: ../modules/itip-formatter/itip-view.c:1032
+msgid "_Update Attendee Status"
+msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
+
+#: ../modules/itip-formatter/itip-view.c:1035
+msgid "_Update"
+msgstr "ਅੱਪਡੇਟ(_U)"
+
+#: ../modules/itip-formatter/itip-view.c:1458
+#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1566
+msgid "Comment:"
+msgstr "ਟਿੱਪਣੀ:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1489
+#| msgid "Send _reply to sender"
+msgid "Send reply to sender"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ ਭੇਜੋ"
+
+#  FIXME: domain/code
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1503
+msgid "Send _updates to attendees"
+msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1506
+msgid "_Apply to all instances"
+msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_A)"
+
+#: ../modules/itip-formatter/itip-view.c:1507
+msgid "Show time as _free"
+msgstr "ਟਾਈਮ ਫਰੀ ਵਾਂਗ ਵੇਖੋ(_f)"
+
+#: ../modules/itip-formatter/itip-view.c:1508
+msgid "_Preserve my reminder"
+msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
+
+#: ../modules/itip-formatter/itip-view.c:1509
+msgid "_Inherit reminder"
+msgstr "ਇੰਹੈਰਿਟ ਰੀਮਾਇਡਰ(_I)"
+
+#: ../modules/itip-formatter/itip-view.c:1830
+msgid "_Tasks:"
+msgstr "ਕੰਮ(_T):"
+
+#: ../modules/itip-formatter/itip-view.c:1833
+msgid "_Memos:"
+msgstr "ਮੀਮੋ(_M):"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../modules/itip-formatter/itip-view.c:3477
+#, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "ਕੈਲੰਡਰ '%s' (%s) ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:3634
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:3658
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
+
+#  FIXME: domain/code
+#: ../modules/itip-formatter/itip-view.c:3753
+msgid "Unable to find any calendars"
+msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:3761
+msgid "Unable to find this meeting in any calendar"
+msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../modules/itip-formatter/itip-view.c:3766
+msgid "Unable to find this task in any task list"
+msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../modules/itip-formatter/itip-view.c:3771
+msgid "Unable to find this memo in any memo list"
+msgstr "ਕਿਸੇ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../modules/itip-formatter/itip-view.c:4111
+msgid "Opening the calendar. Please wait..."
+msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../modules/itip-formatter/itip-view.c:4116
+msgid "Searching for an existing version of this appointment"
+msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:4498
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
+
+#: ../modules/itip-formatter/itip-view.c:4513
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
+
+#: ../modules/itip-formatter/itip-view.c:4518
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
+
+#: ../modules/itip-formatter/itip-view.c:4524
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
+
+#: ../modules/itip-formatter/itip-view.c:4530
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
+
+#: ../modules/itip-formatter/itip-view.c:4600
+#: ../modules/itip-formatter/itip-view.c:5034
+#: ../modules/itip-formatter/itip-view.c:5141
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "ਕੈਲੰਡਰ ਲਈ ਬਦਲਾਅ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../modules/itip-formatter/itip-view.c:4639
+msgid "Unable to parse item"
+msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+
+#: ../modules/itip-formatter/itip-view.c:4828
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
+
+#: ../modules/itip-formatter/itip-view.c:4843
+msgid "Sent a cancelation notice to the delegate"
+msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
+
+#: ../modules/itip-formatter/itip-view.c:4847
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
+
+#  FIXME: domain/code
+#: ../modules/itip-formatter/itip-view.c:4896
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
+
+#: ../modules/itip-formatter/itip-view.c:4903
+msgid "Attendee status updated"
+msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:4926
+msgid "The meeting is invalid and cannot be updated"
+msgstr "ਮੀਟਿੰਗ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+
+#: ../modules/itip-formatter/itip-view.c:4999
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5111
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5174
+msgid "Meeting information sent"
+msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
+
+#: ../modules/itip-formatter/itip-view.c:5179
+msgid "Task information sent"
+msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜੀ"
+
+#: ../modules/itip-formatter/itip-view.c:5184
+msgid "Memo information sent"
+msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
+
+#: ../modules/itip-formatter/itip-view.c:5195
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5200
+msgid "Unable to send task information, the task does not exist"
+msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਕੰਮ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5205
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5270
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../modules/itip-formatter/itip-view.c:5275
+msgid "Save Calendar"
+msgstr "ਕੈਲੰਡਰ ਸੰਭਾਲੋ"
+
+#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5339
+msgid "The calendar attached is not valid"
+msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5340
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar) "
+"ਨਹੀਂ ਹੈ।"
+
+#: ../modules/itip-formatter/itip-view.c:5381
+#: ../modules/itip-formatter/itip-view.c:5410
+#: ../modules/itip-formatter/itip-view.c:5508
+msgid "The item in the calendar is not valid"
+msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਆਈਟਮ ਠੀਕ ਨਹੀਂ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5382
+#: ../modules/itip-formatter/itip-view.c:5411
+#: ../modules/itip-formatter/itip-view.c:5509
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾ, ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ "
+"ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
+
+#: ../modules/itip-formatter/itip-view.c:5425
+msgid "The calendar attached contains multiple items"
+msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
+
+#: ../modules/itip-formatter/itip-view.c:5426
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਇੰਪੋਰਟ "
+"ਕਰਨਾ ਪਵੇਗਾ"
+
+#: ../modules/itip-formatter/itip-view.c:5952
+msgctxt "cal-itip"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../modules/itip-formatter/itip-view.c:5968
+msgid "Tentatively Accepted"
+msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
+
+#: ../modules/itip-formatter/itip-view.c:6111
+msgid "This meeting recurs"
+msgstr "ਇਹ ਮੀਟਿੰਗ ਫੇਰ ਹੋਵੇਗੀ"
+
+#: ../modules/itip-formatter/itip-view.c:6114
+msgid "This task recurs"
+msgstr "ਇਹ ਕੰਮ ਫੇਰ ਹੋਵੇਗੀ"
+
+#: ../modules/itip-formatter/itip-view.c:6117
+msgid "This memo recurs"
+msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਭੇਜਣ ਵਾਲੇ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "ਇਹ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ"
+
+#: ../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}'?"
+msgstr "'{0}' ਮੀਟਿੰਗ ਲਈ ਡੈਲੀਗੇਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੈਲੀਗੇਟ {1} ਨੂੰ ਜੋੜਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+msgid "Meeting Invitations"
+msgstr "ਮੀਟਿੰਗ ਸੱਦਾ"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+msgid "_Delete message after acting"
+msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+msgid "Conflict Search"
+msgstr "ਅਪਵਾਦ ਖੋਜ"
+
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr "Itip ਫਾਰਮੈਟਰ"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "ਪੱਤਰ ਸੁਨੇਹਿਆਂ ਵਿੱਚ \"ਟੈਕਸਟ/ਕੈਲੰਡਰ\" ਮਾਈਮ ਭਾਗ ਵੇਖੋ"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#| msgid "Google sources"
+msgid "Google Features"
+msgstr "ਗੂਗਲ ਫੀਚਰ"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Google Ca_lendar to this account"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਲਈ ਗੂਗਲ ਕੈਲੰਡਰ ਸ਼ਾਮਿਲ(_l)"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Google Con_tacts to this account"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਲਈ ਗੂਗਲ ਸੰਪਰਕ ਸ਼ਾਮਿਲ(_t)"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#| msgid "You may need to enable IMAP access."
+msgid "You may need to enable IMAP access"
+msgstr "ਤੁਹਾਨੂੰ IMAP ਅਸੈੱਸ ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#| msgid "Module Directory"
+msgid "Mail _Directory:"
+msgstr "ਮੇਲ ਡਾਇਰੈਕਟਰੀ(_D):"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#| msgid "Choose a file to restore"
+msgid "Choose a MH mail directory"
+msgstr "MH ਮੇਲ ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "ਲੋਕਲ ਡਿਲਵਰੀ ਫਾਇਲ(_F):"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#| msgid "Choose calendar file"
+msgid "Choose a local delivery file"
+msgstr "ਲੋਕਲ ਡਿਲਵਰੀ ਫਾਇਲ ਚੁਣੋ"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#| msgid "Choose a file to restore"
+msgid "Choose a Maildir mail directory"
+msgstr "Maildir ਮੇਲ ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#| msgid "_File:"
+msgid "Spool _File:"
+msgstr "ਸਪੂਲ ਫਾਇਲ(_F):"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#| msgid "Choose a File"
+msgid "Choose a mbox spool file"
+msgstr "mbox ਸਪੂਲ ਫਾਇਲ ਚੁਣੋ"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#| msgid "Module Directory"
+msgid "Spool _Directory:"
+msgstr "ਸਪੂਲ ਡਾਇਰੈਕਟਰੀ(_D):"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#| msgid "Choose a file to restore"
+msgid "Choose a mbox spool directory"
+msgstr "mbox ਸਪੂਲ ਫਾਇਲ ਚੁਣੋ"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ਸੰਰਚਨਾ"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "ਸਰਵਰ(_S):"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
+msgid "User_name:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
+#| msgid "Encryption:"
+msgid "Encryption _method:"
+msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਢੰਗ(_m):"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
+#| msgid "_Secure connection"
+msgid "STARTTLS after connecting"
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਦੇ ਬਾਅਦ STARTTLS"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
+msgid "SSL on a dedicated port"
+msgstr "ਖਾਸ ਪੋਰਟ ਉੱਤੇ SSL"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
+msgid "Ser_ver requires authentication"
+msgstr "ਸਰਵਰ ਲਈ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+msgid "T_ype:"
+msgstr "ਕਿਸਮ(_y):"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#| msgid "IMAP Features"
+msgid "Yahoo! Features"
+msgstr "Yahoo! ਫੀਚਰ"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "Yahoo! ਕੈਲੰਡਰ ਇਸ ਅਕਾਊਂਟ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ(_l)"
+
+#: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
-#| msgid "%d attached messages"
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d ਸੁਨੇਹਾ ਅਟੈਚ ਕੀਤਾ"
 msgstr[1] "%d ਸੁਨੇਹੇ ਅਟੈਚ ਕੀਤੇ"
 
-#: ../modules/mail/e-mail-shell-backend.c:230
+#: ../modules/mail/e-mail-shell-backend.c:244
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:232
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgid "Compose a new mail message"
 msgstr "ਇੱਕ ਨਵਾਂ ਡਾਕ ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
-#| msgid "Mail Accounts"
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ(_u)"
 
-#: ../modules/mail/e-mail-shell-backend.c:242
-#| msgid "Create a new mail folder"
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail account"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਅਕਾਊਂਟ ਬਣਾਓ"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:261
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgid "Create a new mail folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../modules/mail/e-mail-shell-backend.c:464
+#: ../modules/mail/e-mail-shell-backend.c:561
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
 
-#: ../modules/mail/e-mail-shell-backend.c:473
+#: ../modules/mail/e-mail-shell-backend.c:570
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:482
+#: ../modules/mail/e-mail-shell-backend.c:579
 msgid "Composer Preferences"
 msgstr "ਕੰਪੋਜ਼ਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:491
+#: ../modules/mail/e-mail-shell-backend.c:588
 msgid "Network Preferences"
 msgstr "ਨੈੱਟਵਰਕ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:725
-msgid "Evolution Account Assistant"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
-
-#: ../modules/mail/e-mail-shell-backend.c:771
-msgid "Account Editor"
-msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
+#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:890
+#| msgid "None"
+msgctxt "label"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
-#: ../modules/mail/e-mail-shell-view.c:947
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view.c:974
 msgid "_Disable Account"
 msgstr "ਅਕਾਊਂਟ ਅਯੋਗ(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Disable this account"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਅਯੋਗ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਤੋਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
-#| msgid "Change the properties of this folder"
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Edit properties of this account"
 msgstr "ਇਸ ਅਕਾਊਂਟ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਬਦਲੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "_Download Messages for Offline Usage"
 msgstr "ਆਫਲਾਈਨ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਮਾਰਕ ਕੀਤੇ ਅਕਾਊਂਟ ਅਤੇ ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Fl_ush Outbox"
 msgstr "ਆਉਟਬਾਕਸ ਫਲੱਸ਼(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Copy Folder To..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Copy the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Permanently remove this folder"
 msgstr "ਇਹ ਫੋਲਡਰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "E_xpunge"
 msgstr "ਮਿਟਾਓ(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਇਸ ਫੋਲਡਰ ਵਿੱਚੋਂ ਹਟਾ ਦਿਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Mar_k All Messages as Read"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਓ(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Mark all messages in the folder as read"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਮਾਰਕ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "_Move Folder To..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Move the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "_New..."
 msgstr "ਨਵਾਂ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "Create a new folder for storing mail"
 msgstr "ਸੰਭਾਲੇ ਪੱਤਰਾਂ ਤੋਂ ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Change the properties of this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਬਦਲੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Refresh the folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Change the name of this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Select Message _Thread"
 msgstr "ਸੁਨੇਹਾ ਥਰਿੱਡ ਵੇਖੋ(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ਇੱਕੋ ਮਸਲੇ ਦੇ ਸਾਰੇ ਸੁਨੇਹੇ ਚੁਣੇ ਸੁਨੇਹੇ ਬਣਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Select Message S_ubthread"
 msgstr "ਸੁਨੇਹਾ ਸਬ-ਥਰਿੱਡ ਚੁਣੋ(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Select all replies to the currently selected message"
 msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਲਈ ਸਭ ਜਵਾਬ ਚੁਣੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Empty _Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਤੋਂ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_New Label"
 msgstr "ਨਵਾਂ ਲੇਬਲ(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "N_one"
 msgstr "ਕੋਈ ਨਹੀਂ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
 msgid "_Manage Subscriptions"
 msgstr "ਮੈਂਬਰੀ ਪਰਬੰਧ(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਉੱਤੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣੋ ਜਾਂ ਹਟਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Send / _Receive"
 msgstr "ਭੇਜੋ / ਲਵੋ(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Send queued items and retrieve new items"
 msgstr "ਕਤਾਰਬੱਧ ਆਈਟਮਾਂ ਭੇਜੋ ਅਤੇ ਨਵੀਂ ਆਈਟਮਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "R_eceive All"
 msgstr "ਸਭ ਲਵੋ(_e)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "Receive new items from all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਤੋਂ ਨਵੀਆਂ ਆਈਟਮਾਂ ਲਵੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "_Send All"
 msgstr "ਸਭ ਭੇਜੋ(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "Send queued items in all accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਵਿੱਚ ਕਤਾਰਬੱਧ ਆਈਟਮਾਂ ਭੇਜੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 msgid "Cancel the current mail operation"
 msgstr "ਮੌਜੂਦਾ ਮੇਲ ਕਾਰਵਾਈ ਰੱਦ ਕਰੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "Collapse All _Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਸਮੇਟੋ(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse all message threads"
 msgstr "ਸਭ ਸੁਨੇਹਾ ਥਰਿੱਡ ਸਮੇਟੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "E_xpand All Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਫੈਲਾਓ(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "Expand all message threads"
 msgstr "ਸਭ ਸੁਨੇਹਾ ਥਰਿੱਡ ਫੈਲਾਓ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "_Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Create or edit rules for filtering new mail"
 msgstr "ਨਵੀਂ ਮੇਲ ਨੂੰ ਫਿਲਟਰ ਕਰਨ ਲਈ ਨਿਯਮ ਬਣਾਓ ਜਾਂ ਸੋਧੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Subscriptions..."
 msgstr "ਮੈਂਬਰੀ(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
 msgid "F_older"
 msgstr "ਫੋਲਡਰ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
 msgid "_Label"
 msgstr "ਲੇਬਲ(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "C_reate Search Folder From Search..."
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
 msgid "Search F_olders"
 msgstr "ਫੋਲਡਰ ਖੋਜ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Create or edit search folder definitions"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨੂੰ ਬਣਾਓ ਜਾਂ ਸੋਧੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Show Message _Preview"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਵਿੰਡੋ ਵੇਖੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Show _Deleted Messages"
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹੇ ਵੇਖੋ(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Show deleted messages with a line through them"
 msgstr "ਹਟਾਏ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਉਨ੍ਹਾਂ 'ਚ ਲਾਈਨ ਲਾ ਕੇ ਵੇਖੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ ਗਰੁੱਪ(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸੁਨੇਹਾ ਲਿਸਟ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
+msgid "_Unmatched Folder Enabled"
+msgstr "ਨਾ-ਮਿਲਦੇ ਫੋਲਡਰ ਯੋਗ(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#| msgid "Toggles whether the From chooser is displayed"
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr "ਕੀ ਬੇਮੇਲ ਖੋਜ ਫੋਲਡਰ ਨੂੰ ਯੋਗ ਕਰਨਾ ਹੈ, ਇਸ ਨਾਲ ਬਦਲੋ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Show message preview below the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Show message preview alongside the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਦੇ ਨਾਲ ਸੁਨੇਹਾ ਝਲਕ ਵੇਖੋ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Important Messages"
 msgstr "ਖਾਸ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Last 5 Days' Messages"
 msgstr "ਆਖਰੀ ੫ ਦਿਨਾਂ ਦੇ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Messages Not Junk"
 msgstr "ਨਾ-ਜੰਕ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Messages with Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ ਸਮੇਤ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "No Label"
 msgstr "ਬਿਨ-ਲੇਬਲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Read Messages"
 msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
-msgid "Recent Messages"
-msgstr "ਤਾਜ਼ੇ ਸੁਨੇਹੇ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
 msgid "All Accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
 msgid "Current Account"
 msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Current Folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:613
 msgid "All Account Search"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:710
 msgid "Account Search"
 msgstr "ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:972
 msgid "Proxy _Logout"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਆਉਟ(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ਚੁਣਿਆ, "
 msgstr[1] " %d ਚੁਣੇ, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹਟਾਇਆ"
 msgstr[1] "%d ਹਟਾਏ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ਜੰਕ"
 msgstr[1] "%d ਜੰਕ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫਟ"
 msgstr[1] "%d ਡਰਾਫਟ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭੇਜਿਆ"
 msgstr[1] "%d ਨਾ-ਭੇਜੇ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭੇਜਿਆ"
 msgstr[1] "%d ਭੇਜੇ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1015
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ਨਾ-ਪੜ੍ਹੇ, "
 msgstr[1] "%d ਨਾ-ਪੜ੍ਹੇ, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ਕੁੱਲ"
 msgstr[1] "%d ਕੁੱਲ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 msgid "Trash"
 msgstr "ਰੱਦੀ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1454
 msgid "Send / Receive"
 msgstr "ਭੇਜੋ / ਲਵੋ"
 
-#: ../modules/mail/em-composer-prefs.c:513
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:86
 msgid "Every time"
 msgstr "ਹਰ ਸਮੇਂ"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:87
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:88
 msgid "Once per week"
 msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:318
 msgid "Header"
 msgstr "ਹੈੱਡਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:322
 msgid "Contains Value"
 msgstr "ਮੁੱਲ ਰੱਖਦਾ ਹੈ"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1127
 msgid "_Date header:"
 msgstr "ਮਿਤੀ ਹੈੱਡਰ(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
+#: ../modules/mail/em-mailer-prefs.c:1128
 msgid "Show _original header value"
 msgstr "ਅਸਲੀ ਹੈੱਡਰ ਮੁੱਲ ਵੇਖੋ(_o)"
 
@@ -17767,28 +17637,25 @@ msgstr "ਕੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣਾ �
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:258
+#: ../modules/mdn/evolution-mdn.c:318
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 "ਤੁਹਾਡਾ %s ਵੱਲ ਸੁਨੇਹਾ \"%s\" ਬਾਰੇ, ਜੋ %s ਨੂੰ ਭੇਜਿਆ ਸੀ, ਪੜ੍ਹਿਆ ਜਾ ਚੁੱਕਿਆ ਹੈ।"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:324
+#: ../modules/mdn/evolution-mdn.c:385
 #, c-format
-#| msgid "Delivery Notification for: \"%s\""
 msgid "Delivery Notification for \"%s\""
 msgstr "\"%s\" ਲਈ ਪਹੁੰਚ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../modules/mdn/evolution-mdn.c:449
+#: ../modules/mdn/evolution-mdn.c:540
 #, c-format
-#| msgid "S_end message receipts:"
 msgid "Send a read receipt to '%s'"
 msgstr "'%s' ਨੂੰ ਪੜ੍ਹਨ ਰਸੀਦ ਭੇਜੋ"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:454
-#| msgid "Do _Not Send"
+#: ../modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ/ਵਾਲੇ ਨੂੰ ਸੂਚਨਾ(_N)"
 
@@ -17820,7 +17687,7 @@ msgid ""
 msgstr ""
 "ਜਦੋਂ ਵੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ ਤਾਂ ਈਵੇਲੂਸ਼ਨ ਆਨਲਾਈਨ ਮੋਡ 'ਚ ਵਾਪਸ ਆਵੇਗੀ।"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
+#: ../modules/online-accounts/camel-sasl-xoauth.c:417
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17829,11 +17696,11 @@ msgstr ""
 "ਜਿੱਥੇ "
 "ਕਿ ਪਰਮਾਣਕਿਤਾ ਟੋਕਨ ਲੈਣਾ ਹੈ।"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17869,129 +17736,474 @@ msgstr "ਪਲੱਗ-ਇਨ(_P)"
 msgid "Enable and disable plugins"
 msgstr "ਪਲੱਗ-ਇਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "ਪਾਈਥਨ ਟੈਸਟ ਪਲੱਗਇਨ"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#| msgid "Display the next message"
+msgid "Display plain text version"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ ਵਰਜਨ ਵੇਖਾਓ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "ਪਾਈਥਨ ਈ-ਪਲੱਗਇਨ ਲੋਡਰ ਲਈ ਟੈਸਟ ਪਲੱਗਇਨ।"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
+#| msgid "Display the next important message"
+msgid "Display plain text version of multipart/alternative message"
+msgstr "ਮਲਟੀਪਾਰਟ/ਬਦਲਵੇਂ ਸੁਨੇਹੇ ਦਾ ਪਲੇਨ ਟੈਕਸਟ ਵਰਜਨ ਵੇਖਾਉ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Python Plugin Loader tests"
-msgstr "ਪਾਈਥਨ ਪਲੱਗਇਨ ਲੋਡਰ ਟੈਸਟ"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+msgid "Display HTML version"
+msgstr "HTML ਵਰਜਨ ਵੇਖਾਓ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Hello Python"
-msgstr "ਹੈਲੋ ਪਾਈਥਨ"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#| msgid "Display the previous important message"
+msgid "Display HTML version of multipart/alternative message"
+msgstr "ਮਲਟੀਪਾਰਟ/ਬਦਲਵੇਂ ਸੁਨੇਹੇ ਦਾ HTML ਵਰਜਨ ਵੇਖਾਉ"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:190
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+msgid "Show HTML if present"
+msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Let Evolution choose the best part to show."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਚੁਣਨ ਦਿਓ ਕਿ ਵੇਖਾਉਣ ਲਈ ਕੀ ਸਭ ਤੋਂ ਵਧੀਆ ਹੈ।"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:50
+msgid "Show plain text if present"
+msgstr "ਜੇ ਮੌਜੂਦ ਹੋਵੇ ਤਾਂ ਪਲੇਨ ਟੈਕਸਟ ਵੇਖੋ"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:51
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"ਪਲੇਨ ਟੈਕਸਟ ਭਾਗ ਵੇਖੋ, ਜੇ ਮੌਜੂਦ ਹੋਵੇ, ਨਹੀਂ ਤਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਵਧੀਆ ਢੰਗ "
+"ਚੁਣਨ ਦਿਉ।"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../modules/prefer-plain/plugin/config-ui.c:55
+msgid "Only ever show plain text"
+msgstr "ਹਮੇਸ਼ਾ ਪਲੇਨ ਟੈਕਸਟ ਹੀ ਵੇਖੋ"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../modules/prefer-plain/plugin/config-ui.c:56
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"ਹਮੇਸ਼ਾ ਪਲੇਨ ਟੈਕਸਟ ਭਾਗ ਵੇਖਾਓ ਅਤੇ ਹੋਰ ਭਾਗ ਤੋਂ ਅਟੈਚਮੈਂਟ ਬਣਾਓ, ਜੇ ਮੰਗਿਆ ਹੋਵੇ ਤਾਂ।"
+
+#: ../modules/prefer-plain/plugin/config-ui.c:107
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "ਦਬਾਏ ਗਏ HTML ਭਾਗ ਅਟੈਚਮੈਂਟ ਵਜੋਂ ਵੇਖੋ(_u)"
+
+#: ../modules/prefer-plain/plugin/config-ui.c:129
+msgid "HTML _Mode"
+msgstr "HT_ML ਮੋਡ"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਸੰਦ"
+
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ਪੱਤਰ ਸੁਨੇਹੇ ਨੂੰ ਪਲੇਟ-ਟੈਕਸਟ ਵੇਖੋ, ਜੇ ਇਹ HTML ਸਮੱਗਰੀ ਵੀ ਰੱਖਦੀ ਹੋਵੇ।"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "SpamAssassin (%s) ਸਵੈਪ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
+#: ../modules/spamassassin/evolution-spamassassin.c:215
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਮੇਲ ਸੁਨੇਹੇ ਸਟਰੀਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:232
+#: ../modules/spamassassin/evolution-spamassassin.c:234
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "'%s' ਨੂੰ SpamAssassin ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
+#: ../modules/spamassassin/evolution-spamassassin.c:262
 msgid "Failed to read output from SpamAssassin: "
 msgstr "SpamAssassin ਤੋਂ ਆਉਟਪੁੱਟ ਪੜ੍ਹਨ ਲਈ ਫੇਲ੍ਹ ਹੈ: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
+#: ../modules/spamassassin/evolution-spamassassin.c:317
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 "SpamAssassin ਜਾਂ ਤਾਂ ਕਰੈਸ਼ ਹੋ ਗਿਆ ਹੈ ਜਾਂ ਮੇਲ ਸੁਨੇਹੇ ਨੂੰ ਪ੍ਰੋਸੈਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ "
 "ਹੈ"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:885
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin ਚੋਣਾਂ"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:900
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮੋਟ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ(_n)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
+#: ../modules/spamassassin/evolution-spamassassin.c:914
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "ਇਹ SpamAssasin ਨੂੰ ਹੋਰ ਵੀ ਭਰੋਸੇਯੋਗ ਬਣਾਉਦਾ ਹੈ, ਪਰ ਹੌਲੀ ਕਰਦਾ ਹੈ।"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../modules/startup-wizard/e-mail-config-import-page.c:204
 #: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ ਜੀ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:315
+#: ../modules/startup-wizard/e-mail-config-import-page.c:233
 #: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "%s ਤੋਂ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:326
-#: ../modules/startup-wizard/evolution-startup-wizard.c:424
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "ਫਾਇਲਾਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:402
-#| msgid "I_mportance: "
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
 msgid "Import cancelled."
 msgstr "ਇੰਪੋਰਟ ਕਰਨਾ ਰੱਦ ਕੀਤਾ।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
-#| msgid "Update complete\n"
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
 msgid "Import complete."
 msgstr "ਇੰਪੋਰਟ ਪੂਰਾ ਹੋਇਆ।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:494
-msgid "Evolution Setup Assistant"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈੱਟਅੱਪ ਸਹਾਇਕ "
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:500
-msgid "Welcome"
-msgstr "ਜੀ ਆਇਆ ਨੂੰ"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:505
+#: ../modules/startup-wizard/e-startup-assistant.c:154
 #| msgid ""
 #| "Welcome to Evolution. The next few screens will allow Evolution to "
 #| "connect to your email accounts, and to import files from other "
-#| "applications. \n"
-#| "\n"
-#| "Please click the \"Forward\" button to continue. "
+#| "applications."
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
 msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ। ਅੱਗੇ ਕੁਝ ਸਕਰੀਨਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਤੁਹਾਡੇ ਈ-ਮੇਲ ਅਕਾਊਂਟਾਂ "
-"ਨਾਲ ਜੋੜਨ ਵਿੱਚ "
-"ਸਹਾਇਕ ਹੋਣਗੀਆਂ ਅਤੇ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੋਂ ਫਾਇਲਾਂ ਇੰਪੋਰਟ ਕਰਨ ਵਿੱਚ ਮੱਦਦ ਕਰਨਗੇ।"
+"ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ।\n"
+"\n"
+"ਅੱਗੇ ਕੁਝ ਸਕਰੀਨਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਤੁਹਾਡੇ ਈ-ਮੇਲ ਅਕਾਊਂਟਾਂ ਨਾਲ ਜੋੜਨ ਵਿੱਚ ਸਹਾਇਕ "
+"ਹੋਣਗੀਆਂ ਅਤੇ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੋਂ ਫਾਇਲਾਂ ਇੰਪੋਰਟ ਕਰਨ ਵਿੱਚ ਮੱਦਦ ਕਰਨਗੇ।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
 msgid "Loading accounts..."
 msgstr "ਅਕਾਊਂਟ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ"
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#| msgid "Format Column_s..."
+msgid "_Format as..."
+msgstr "... ਵਜੋਂ ਫਾਰਮੈਟ(_F)"
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#| msgid "_Languages"
+msgid "_Other languages"
+msgstr "ਹੋਰ ਭਾਸ਼ਾ(_O)"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:328
+#| msgid "Text height"
+msgid "Text Highlight"
+msgstr "ਟੈਕਸਟ ਉਚਾਈ"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:334
+msgid "Syntax highlighting of mail parts"
+msgstr "ਮੇਲ ਭਾਗ ਵਿੱਚ ਸੰਟੈਕਸ ਉਭਾਰਨ"
+
+#: ../modules/text-highlight/languages.c:32
+#| msgid "Plain Text Mode"
+msgid "_Plain text"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ(_P)"
+
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr "_Assembler"
+
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr "_Bash"
+
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr "_C/C++"
+
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr "_C#"
+
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr "ਕੇਸਕੇਡਿੰਗ ਸਟਾਇਲ ਸ਼ੀਟ(_CSS)"
+
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr "_Java"
+
+#: ../modules/text-highlight/languages.c:87
+#| msgid "_Script:"
+msgid "_JavaScript"
+msgstr "ਜਾਵਾ-ਸਕ੍ਰਿਪਟ(_J)"
+
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr "ਪੈਚ/ਅੰਤਰ(_P)"
+
+#: ../modules/text-highlight/languages.c:99
+#| msgid "_Personal"
+msgid "_Perl"
+msgstr "ਪਰਲ(_P)"
+
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr "_PHP"
+
+#: ../modules/text-highlight/languages.c:123
+#| msgid "Hello Python"
+msgid "_Python"
+msgstr "ਪਾਈਥਨ(_P)"
+
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr "ਰੂਬੀ(_R)"
+
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
+
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr "_TeX/LaTeX"
+
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr "_Vala"
+
+#: ../modules/text-highlight/languages.c:152
+#| msgid "Visual"
+msgid "_Visual Basic"
+msgstr "ਵਿਜ਼ੁਅਲ ਬੇਸਿਕ(_V)"
+
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr "_XML"
+
+#: ../modules/text-highlight/languages.c:177
+#| msgid "_Actions"
+msgid "_ActionScript"
+msgstr "ਐਕਸਨਸਕ੍ਰਿਪਟ(_A)"
+
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr "_ADA95"
+
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr "_ALGOL 68"
+
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr "(_G)AWK"
+
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr "_COBOL"
+
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr "_DOS ਬੈਚ"
+
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr "_D"
+
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr "_Erlang"
+
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr "_FORTRAN 77"
+
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr "_FORTRAN 90"
+
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr "_F#"
+
+#: ../modules/text-highlight/languages.c:235
+#| msgid "_No"
+msgid "_Go"
+msgstr "ਜਾਓ(_G)"
+
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr "_Haskell"
+
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
+msgstr "_JSP"
+
+#: ../modules/text-highlight/languages.c:250
+#| msgid "_List:"
+msgid "_Lisp"
+msgstr "_Lisp"
+
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr "_Lotus"
+
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
+msgstr "_Lua"
+
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
+msgstr "_Maple"
+
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr "_Matlab"
+
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr "_Maya"
+
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr "_Oberon"
+
+#: ../modules/text-highlight/languages.c:288
+#| msgid "Object Signer"
+msgid "_Objective C"
+msgstr "_Objective C"
+
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr "_OCaml"
+
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr "_Octave"
+
+#: ../modules/text-highlight/languages.c:304
+#| msgid "Object Signer"
+msgid "_Object Script"
+msgstr "ਆਬਜੈਕਟ ਸਕ੍ਰਿਪਟ(_O)"
+
+#: ../modules/text-highlight/languages.c:309
+#| msgid "_Paste"
+msgid "_Pascal"
+msgstr "_Pascal"
+
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr "_POV-Ray"
+
+#: ../modules/text-highlight/languages.c:319
+#| msgid "_Program:"
+msgid "_Prolog"
+msgstr "_Prolog"
+
+#: ../modules/text-highlight/languages.c:324
+#| msgid "_Script:"
+msgid "_PostScript"
+msgstr "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ(_P)"
+
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
+msgstr "_R"
+
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr "_RPM Spec"
+
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr "_Scala"
+
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr "_Smalltalk"
+
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr "_TCSH"
+
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
+msgstr "_VHDL"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+#| msgid "Show Full vCard"
+msgid "Show F_ull vCard"
+msgstr "ਪੂਰਾ vCard ਵੇਖੋ(_u)"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
+#| msgid "Show Compact vCard"
+msgid "Show Com_pact vCard"
+msgstr "ਸੰਖੇਪ vCard ਵੇਖੋ(_p)"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
+#| msgid "Save in Address Book"
+msgid "Save _To Addressbook"
+msgstr "ਐਡਰੈਸ ਬੁੱਕ ਵਿੱਚ ਸੰਭਾਲੋ(_T)"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+msgid "There is one other contact."
+msgstr "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "%d ਹੋਰ ਸੰਪਰਕ ਹੈ।"
+msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
+#| msgid "Address book source"
+msgid "Addressbok Contact"
+msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ ਸੰਪਰਕ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+msgid "Display the part as an addressbook contact"
+msgstr "ਐਡਰੈਸ ਬੁੱਕ ਸੰਪਰਕ ਵਜੋਂ ਭਾਗ ਵੇਖਾਓ"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+#| msgid "_Select..."
+msgid "_Inspect..."
+msgstr "...ਜਾਂਚ(_I)"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "HTML ਸਮੱਗਰੀ ਦੀ ਜਾਂਚ ਕਰੋ (ਡੀਬੱਗ ਫੀਚਰ)"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+#| msgid "Evolution Website"
+msgid "Evolution Web Inspector"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ ਇੰਸਪੈਕਟਰ"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖੋ(_D)।"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:462
+#: ../plugins/attachment-reminder/attachment-reminder.c:590
+#: ../plugins/templates/templates.c:470
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -18026,278 +18238,35 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਯਾਦ ਕਰਵਾਉਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਮੇਲ ਸੁਨੇਹੇ ਵਿੱਚ ਕੁਝ ਅਟੈਚਮੈਂਟ ਕਰਨੀ ਭੁੱਲ ਤਾਂ "
 "ਨਹੀਂ ਗਏ।"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
-msgstr "ਲਾਈਨ 'ਚ ਆਡੀਓ"
-
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
-msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਤੋਂ ਆਡੀਓ ਅਟੈਚਮੈਂਟ ਸਿੱਧੀਆਂ ਚਲਾਓ।"
-
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ ਬੈਕਅੱਪ"
-
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "ਰੀ-ਸਟੋਰ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
-
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਚੈੱਕ ਕਰੋ"
-
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
-
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
-
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
-msgid "Shutting down Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ)"
-
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "ਬੈਕਅੱਪ ਪੂਰਾ ਹੋਇਆ"
-
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "ਮੌਜੂਦਾ ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕਰੋ"
-
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "ਬੈਕਅੱਪ ਤੋਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈਟਿੰਗ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "ਆਰਜ਼ੀ ਬੈਕਅੱਪ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "ਲੋਕਲ ਸਰੋਤ ਯਕੀਨੀ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
-
-#: ../plugins/backup-restore/backup.c:767
-#| msgid "Evolution Back up"
-msgid "Evolution Back Up"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕ-ਅੱਪ"
-
-#: ../plugins/backup-restore/backup.c:768
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "ਫੋਲਡਰ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
-
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "ਫੋਲਡਰ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
-
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲੈ ਰਹੀ ਹੈ ਤਾਂ ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
-
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "ਈਵੈਲੂਸ਼ਨ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਡਾਟੇ ਨੂੰ ਰੀ-ਸਟੋਰ ਕਰਦੀ ਹੈ, ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
-
-#: ../plugins/backup-restore/backup.c:863
-msgid "This may take a while depending on the amount of data in your account."
-msgstr "ਇਹ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਦੇ ਡਾਟੇ ਦੀ ਮਾਤਰਾ ਮੁਤਾਬਕ ਕੁਝ ਸਮਾਂ ਲੈ ਸਕਦਾ ਹੈ।"
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "ਈਵੂਲੇਸਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
-
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "ਬੈਕ ਅੱਪ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ-ਚਾਲੂ(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
-
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "ਰੀ-ਸਟੋਰ ਉਪਰੰਤ ਈਵੂਲੇਸ਼ਨ ਮੁੜ ਚਾਲੂ(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:385
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣੇ ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰ ਸਕਦੇ ਹੋ। ਇਹ ਸਭ ਮੇਲਾਂ, ਕੈਲੰਡਰ, "
-"ਟਾਸਕ, ਮੀਮੋ, ਸੰਪਰਕ ਆਦਿ "
-"ਨੂੰ ਰੀਸਟੋਰ ਕਰ ਸਕਦੈ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਨਿੱਜੀ ਸੈਟਿੰਗ, ਮੇਲ ਫਿਲਟਰ ਆਦਿ ਵੀ ਰੀਸਟੋਰ ਕਰ "
-"ਸਕਦੀ ਹੈ।"
-
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਈਵੂਲੇਸ਼ਨ ਰੀਸਟੋਰ ਕਰੋ(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੂਲੇਸ਼ਨ ਅਕਾਇਵ ਚੁਣੋ ਜੀ:"
-
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
-
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "ਬੈਕ-ਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
-
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕਰੋ(_B)..."
-
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਅਕਾਇਵ ਫਾਇਲ ਵਿੱਚ ਬੈਕਅੱਪ ਕਰੋ"
-
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰੋ(_e)..."
-
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਅਕਾਇਵ ਫਾਇਲ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
-
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "ਬੈਕਅੱਪ ਅਤੇ ਰੀਸਟੋਰ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr "ਆਪਣੀ ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕ ਅੱਪ ਤੇ ਰੀਸਟੋਰ ਕਰੋ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-#| msgid "Invalid Evolution back up file"
-msgid "Invalid Evolution backup file"
-msgstr "ਗਲਤ ਈਵੇਲੂਸ਼ਨ ਬੈਕ-ਅੱਪ ਫਾਇਲ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "Please select a valid back up file to restore."
-msgid "Please select a valid backup file to restore."
-msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਠੀਕ ਬੈਕ-ਅੱਪ ਫਾਇਲ ਚੁਣੋ ਜੀ।"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Are you sure you want to close Evolution?"
-msgstr "ਕੀ ਤੁਸੀਂ ਈਵੂਲੇਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
-msgstr ""
-"ਆਪਣੇ ਡਾਟੇ ਤੇ ਸੈਟਿੰਗ ਦਾ ਬੈਕ-ਅੱਪ ਲੈਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨਾ "
-"ਪਵੇਗਾ। ਯਕੀਨੀ ਬਣਾਉ "
-"ਕਿ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਨਾ-ਸੰਭਾਲੇ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲ ਲਿਆ ਹੈ।"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ ਤੇ ਬੈਕਅੱਪ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected back up file?"
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "ਕੀ ਤੁਸੀਂ ਚੁਣੀ ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਈਵੇਲੂਸ਼ਨ ਰੀ-ਸਟੋਰ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#| msgid ""
-#| "To restore your data and settings, you must first close Evolution. Please "
-#| "make sure that you save any unsaved data before proceeding. This will "
-#| "delete all your current Evolution data and settings and restore them from "
-#| "your back up."
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
-msgstr ""
-"ਆਪਣੇ ਡਾਟੇ ਜਾਂ ਸੈਟਿੰਗ ਨੂੰ ਰੀਸਟੋਰ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕਰਨੀ "
-"ਪਵੇਗੀ। ਯਕੀਨੀ ਬਣਾਓ "
-"ਕਿ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਨਾ-ਸੰਭਾਲਿਆ ਡਾਟਾ ਸੰਭਾਲ ਚੁੱਕੇ ਹੋ। ਇਸ ਨਾਲ ਤੁਹਾਡਾ "
-"ਮੌਜੂਦਾ ਸਭ ਈਵੇਲੂਸ਼ਨ "
-"ਡਾਟਾ ਤੇ ਸੈਟਿੰਗ ਨੂੰ ਹਟਾਇਆ ਜਾਵੇਗਾ ਤੇ ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਤੋਂ ਉਨ੍ਹਾਂ ਨੂੰ ਮੁੜ-ਸਟੋਰ ਕੀਤਾ "
-"ਜਾਵੇਗਾ।"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰੋ ਤੇ ਰੀਸਟੋਰ ਕਰੋ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "ਅਧੂਰੇ ਅਧਿਕਾਰ"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "ਚੁਣਿਆ ਫੋਲਡਰ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ।"
-
-#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
+#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:674
 msgid "Create _address book entries when sending mails"
 msgstr "ਪੱਤਰ ਭੇਜਣ ਸਮੇਂ ਖੁਦ ਹੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
 
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Select Address book for Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
-#: ../plugins/bbdb/bbdb.c:717
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Instant Messaging Contacts"
 msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:732
+#: ../plugins/bbdb/bbdb.c:714
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਲਿਸਟ ਤੋਂ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਤੇ ਚਿੱਤਰ ਸੈਕਰੋਨਾਈਜ਼ ਕਰੋ(_S)"
 
-#: ../plugins/bbdb/bbdb.c:740
+#: ../plugins/bbdb/bbdb.c:722
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:753
+#: ../plugins/bbdb/bbdb.c:735
 msgid "Synchronize with _buddy list now"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
 
@@ -18321,265 +18290,7 @@ msgstr ""
 "ਦਿੱਤੀ "
 "ਜਾਵੇਗੀ।"
 
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ। ਸਰਵਰ ਲਈ ਢੁੱਕਵਾਂ ਲਾਗਇਨ ਚਾਹੀਦਾ ਹੈ।"
-
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "ਦਿੱਤਾ URL ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"
-
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"ਸਰਵਰ ਨੇ ਅਣਜਾਣ ਡਾਟਾ ਭੇਜਿਆ ਹੈ।\n"
-"%d - %s"
-
-#  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "ਸਰਵਰ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "ਈਵੈਂਟ"
-
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "ਯੂਜ਼ਰ ਦਾ ਕੈਲੰਡਰ"
-
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "ਸਰਵਰ URL ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#: ../plugins/caldav/caldav-browse-server.c:762
-#: ../plugins/caldav/caldav-browse-server.c:803
-#: ../plugins/caldav/caldav-browse-server.c:1502
-msgid "Searching for user's calendars..."
-msgstr "ਯੂਜ਼ਰ ਦਾ ਕੈਲੰਡਰ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "ਯੂਜ਼ਰ ਕੈਲੰਡਰ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
-
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "ਪਿਛਲੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੈ: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "ਪਿਛਲੀ ਕੋਸ਼ਿਸ਼ ਕੋਡ %d ਨਾਲ ਫੇਲ੍ਹ ਹੋਈ"
-
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "%2$s ਸਰਵਰ ਉੱਤੇ %1$s ਯੂਜ਼ਰ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
-
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "URL '%s' ਲਈ soup ਸੁਨੇਹਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "ਫੋਲਡਰ ਸਮੱਗਰੀ ਖੋਜੀ ਜਾ ਰਹੀ ਹੈ..."
-
-#: ../plugins/caldav/caldav-browse-server.c:1326
-#: ../plugins/caldav/caldav-source.c:261
-msgid "Server _handles meeting invitations"
-msgstr "ਸਰਵਰ ਵਲੋਂ ਕੰਟਰੋਲ ਮੀਟਿੰਗ ਸੱਦੇ(_h)"
-
-#: ../plugins/caldav/caldav-browse-server.c:1333
-msgid "List of available calendars:"
-msgstr "ਉਪਲੱਬਧ ਕੈਲੰਡਰਾਂ ਦੀ ਲਿਸਟ:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1371
-msgid "Supports"
-msgstr "ਸਹਿਯੋਗ"
-
-#: ../plugins/caldav/caldav-browse-server.c:1402
-#: ../plugins/caldav/caldav-source.c:259
-msgid "User e_mail:"
-msgstr "ਯੂਜ਼ਰ ਈਮੇਲ(_m):"
-
-#: ../plugins/caldav/caldav-browse-server.c:1478
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1599
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "ਸਰਵਰ URL '%s' ਢੁੱਕਵਾਂ URL ਨਹੀਂ ਹੈ"
-
-#: ../plugins/caldav/caldav-browse-server.c:1609
-msgid "Browse for a CalDAV calendar"
-msgstr "CalDAV ਕੈਲੰਡਰ ਲਈ ਝਲਕ"
-
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:149
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_s)"
-
-#: ../plugins/caldav/caldav-source.c:264
-msgid "Brows_e server for a calendar"
-msgstr "ਕੈਲੰਡਰ ਲਈ ਸਰਵਰ ਦੀ ਝਲਕ(_e)"
-
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:207
-#: ../plugins/calendar-http/calendar-http.c:132
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Re_fresh:"
-msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f):"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "CalDAV ਸਹਿਯੋਗ"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ CalDAV ਸਹਿਯੋਗ ਸ਼ਾਮਲ ਕਰੋ।"
-
-#: ../plugins/calendar-file/calendar-file.c:136
-#| msgid "_Customize options"
-msgid "C_ustomize options"
-msgstr "ਚੋਣਾਂ ਲਈ ਪਸੰਦ(_u)"
-
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
-
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "ਕੈਲੰਡਰ ਫਾਇਲ ਚੁਣੋ"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:213
-msgid "On open"
-msgstr "ਖੋਲ੍ਹਣ ਸਮੇਂ"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:215
-msgid "On file change"
-msgstr "ਫਾਇਲ ਬਦਲਣ ਸਮੇਂ"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:217
-msgid "Periodically"
-msgstr "ਨਿਯਮਤ"
-
-#: ../plugins/calendar-file/calendar-file.c:238
-msgid "Force read _only"
-msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਮਜਬੂਰ(_o)"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../plugins/calendar-http/calendar-http.c:214
-msgid "Userna_me:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_m):"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Web Calendars"
-msgstr "ਵੈੱਬ ਕੈਲੰਡਰ"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Add web calendars to Evolution."
-msgstr "ਵੈੱਬ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "ਮੌਸਮ: ਧੁੰਦ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ ਵਾਲੀ ਰਾਤ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "ਮੌਸਮ: ਮੀਂਹ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "ਮੌਸਮ: ਫੁਹਾਰ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "ਮੌਸਮ: ਬਰਫ਼"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "ਮੌਸਮ: ਖੜਿਆ ਦਿਨ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "ਮੌਸਮ: ਸਾਫ਼ ਰਾਤ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "ਮੌਸਮ: ਬਰਫ਼ੀਲਾ ਤੂਫਾਨ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "ਇੱਕ ਟਿਕਾਣਾ ਚੁਣੋ"
-
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
-
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "ਇਕਾਈ(_U):"
-
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "ਮੀਟਰਿਕ (ਸੈਂਲਸੀਅਸ, ਸੈਂਮੀ, ਆਦਿ)"
-
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "ਇੰਪੀਰਿਲ (ਫਾਰਨਹੀਂਟ, ਇੰਚ ਆਦਿ)"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Add weather calendars to Evolution."
-msgstr "ਮੌਸਮ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:287
 msgid "Importing Outlook Express data"
 msgstr "ਆਉਟਲੁੱਕ ਐਕਸਪਰੈਸ ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -18595,80 +18306,52 @@ msgstr "Outlook ਐਕਸਪਰੈਸ 5/6 ਨਿੱਜੀ ਫੋਲਡਰ (.dbx)
 msgid "Import Outlook Express messages from DBX file"
 msgstr "DBX ਫਾਇਲ ਤੋਂ ਆਉਟਲੁੱਕ ਐਕਸਪਰੈਸ ਸੁਨੇਹੇ ਇੰਪੋਰਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "ਡਿਫਾਲਟ ਐਡਰੈੱਸ ਬੁੱਕ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "ਇਸ ਐਡਰੈੱਸ ਬੁੱਕ ਨਾਲ ਆਟੋ-ਪੂਰਨ(_u)"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "ਡਿਫਾਲਟ ਕੈਲੰਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "ਡਿਫਾਲਟ ਟਾਸਕ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "ਡਿਫਾਲਟ ਮੀਮੋ ਲਿਸਟ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "ਡਿਫਾਲਟ ਸਰੋਤ"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr "ਤੁਹਾਡੀ ਪਸੰਦੀਦਾ ਦਾ ਐਡਰੈੱਸ ਬੁੱਕ ਅਤੇ ਕੈਲੰਡਰ ਨੂੰ ਡਿਫਾਲਟ ਬਣਾਓ।"
-
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "ਸੁਰੱਖਿਆ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:305
+#: ../plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:306
+#: ../plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "ਬਿਨਾਂ-ਵਰਗ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:307
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ਸੁਰੱਖਿਅਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:308
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:309
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "ਗੁਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:310
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ਬਹੁਤ ਗੁਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:367
+#: ../plugins/email-custom-header/email-custom-header.c:357
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:530
 msgid "_Custom Header"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:803
+#: ../plugins/email-custom-header/email-custom-header.c:799
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18676,12 +18359,12 @@ msgstr ""
 "ਇੱਕ ਕਸਟਮ ਹੈੱਡਰ ਕੁੰਜੀ ਲਈ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ ਦਿਓ:\n"
 "ਕਸਟਮ ਹੈੱਡਰ ਕੁੰਜੀ ਮੁੱਲਾਂ ਲਈ ਨਾਂ \";\" ਨਾਲ ਵੱਖ ਕਰਕੇ ਦਿਓ।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:851
 msgid "Key"
 msgstr "ਕੀ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
+#: ../plugins/email-custom-header/email-custom-header.c:867
+#: ../plugins/templates/templates.c:478
 msgid "Values"
 msgstr "ਮੁੱਲ"
 
@@ -18698,18 +18381,11 @@ msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਪਸੰ�
 msgid "Email Custom Header"
 msgstr "ਈਮੇਲ ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr "ਜਦੋਂ ਮੇਲ ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਸਵਿੱਚ ਦੱਬੀ ਜਾਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਐਡੀਟਰ ਚਲਾਓ"
-
 #: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "ਐਡੀਟਰ ਚਾਲੂ ਕਰਨ ਲਈ ਚਲਾਉਣ ਵਾਸਤੇ ਕਮਾਂਡ:"
 
 #: ../plugins/external-editor/external-editor.c:115
-#| msgid ""
-#| "For Emacs use \"xemacs\"\n"
-#| "For VI use \"gvim -f\""
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -18816,47 +18492,6 @@ msgstr "ਚਿੱਤਰ ਨਹੀਂ"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "ਫਾਇਲ, ਜੋ ਤੁਸੀਂ ਚੁਣੀ ਹੈ, ਢੁੱਕਵੀਂ .png ਚਿੱਤਰ ਨਹੀਂ ਹੈ। ਗਲਤੀ: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
-msgid "Server"
-msgstr "ਸਰਵਰ"
-
-#: ../plugins/google-account-setup/google-source.c:457
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "ਯੂਜ਼ਰ %s ਨੂੰ ਮੈਂਬਰੀ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਅਸੈਸ ਲਿਸਟ ਲਈ ਪਾਸਵਰਡ ਦਿਓ।"
-
-#: ../plugins/google-account-setup/google-source.c:569
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"ਗੂਗਲ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-msgid "Unknown error."
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਹੈ।"
-
-#: ../plugins/google-account-setup/google-source.c:670
-msgid "Cal_endar:"
-msgstr "ਕੈਲੰਡਰ(_e):"
-
-#: ../plugins/google-account-setup/google-source.c:707
-msgid "Retrieve _List"
-msgstr "ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ(_L)"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Google Calendars"
-msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Add Google Calendars to Evolution."
-msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "ਆਨਲਾਈਨ ਚਿੱਤਰ"
@@ -18865,838 +18500,55 @@ msgstr "ਆਨਲਾਈਨ ਚਿੱਤਰ"
 msgid "View image attachments directly in mail messages."
 msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਸਿੱਧੇ ਚਿੱਤਰ ਅਟੈਚਮੈਂਟ ਵੇਖੋ।"
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
-
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "IMAP ਹੈੱਡਰ"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"ਆਪਣੀ IMAP ਹੈੱਡਰ ਪਸੰਦ ਚੁਣੋ। \n"
-"ਜਿੰਨੇ ਹੈੱਡਰ ਵੱਧ ਉਨ੍ਹਾਂ ਹੀ ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਉੱਤੇ ਸਮਾਂ ਲੱਗੇਗਾ।"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_F)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:4
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-"ਮੂਲ ਹੈੱਡਰ (ਸਭ ਤੋਂ ਤੇਜ਼)(_B) \n"
-"ਇਹ ਚੁਣੋ, ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ ਨਹੀਂ ਹਨ"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "ਮੁੱਢਲੇ ਅਤੇ ਮੇਲਿੰਗ ਸੂਚੀ ਹੈੱਡਰ (ਮੂਲ)(_M)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"ਵਾਧੂ ਹੈੱਡਰ ਦਿੰਦੀ ਹੈ, ਜਿਸ ਦੀ ਤੁਹਾਨੂੰ ਸਟੈਂਡਰਡ ਹੈੱਡਰ ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n"
-"ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋ ਜੇ ਤੁਸੀਂ \"ਸਭ ਹੈੱਡਰ\" ਦੀ ਚੋਣ ਕਰਦੇ ਹੋ।"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "IMAP Features"
-msgstr "IMAP ਫੀਚਰ"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "Fine-tune your IMAP accounts."
-msgstr "ਆਪਣੇ IMAP ਅਕਾਊਂਟ ਵਿੱਚ ਸੁਧਾਰ ਕਰੋ।"
-
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:505
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "ਕੈਲੰਡਰ '%s' (%s) ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:665
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:689
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
-
-#  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:802
-msgid "Unable to find any calendars"
-msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:809
-msgid "Unable to find this meeting in any calendar"
-msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:813
-msgid "Unable to find this task in any task list"
-msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:817
-msgid "Unable to find this memo in any memo list"
-msgstr "ਕਿਸੇ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1119
-msgid "Opening the calendar. Please wait..."
-msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1122
-msgid "Searching for an existing version of this appointment"
-msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1484
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1502
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1507
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1512
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
-#| msgid "Opening the calendar. Please wait..."
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "ਕੈਲੰਡਰ ਲਈ ਬਦਲਾਅ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ। ਉਡੀਕੋ ਜੀ..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1620
-msgid "Unable to parse item"
-msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
-
-#: ../plugins/itip-formatter/itip-formatter.c:1807
-msgid "Sent a cancelation notice to the delegate"
-msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1809
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
-
-#  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1861
-msgid "Attendee status updated"
-msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1881
-#| msgid "Object is invalid and cannot be updated\n"
-msgid "The meeting is invalid and cannot be updated"
-msgstr "ਮੀਟਿੰਗ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1947
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2086
-msgid "Meeting information sent"
-msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2089
-msgid "Task information sent"
-msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2092
-msgid "Memo information sent"
-msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2101
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2104
-msgid "Unable to send task information, the task does not exist"
-msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਕੰਮ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2107
-msgid "Unable to send memo information, the memo does not exist"
-msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
-msgid "calendar.ics"
-msgstr "calendar.ics"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2178
-msgid "Save Calendar"
-msgstr "ਕੈਲੰਡਰ ਸੰਭਾਲੋ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
-msgid "The calendar attached is not valid"
-msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar) "
-"ਨਹੀਂ ਹੈ।"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
-msgid "The item in the calendar is not valid"
-msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਆਈਟਮ ਠੀਕ ਨਹੀਂ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾ, ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ "
-"ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2335
-msgid "The calendar attached contains multiple items"
-msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਇੰਪੋਰਟ "
-"ਕਰਨਾ ਪਵੇਗਾ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2860
-msgctxt "cal-itip"
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2876
-msgid "Tentatively Accepted"
-msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2994
-msgid "This meeting recurs"
-msgstr "ਇਹ ਮੀਟਿੰਗ ਫੇਰ ਹੋਵੇਗੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2997
-msgid "This task recurs"
-msgstr "ਇਹ ਕੰਮ ਫੇਰ ਹੋਵੇਗੀ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3000
-msgid "This memo recurs"
-msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3231
-msgid "Meeting Invitations"
-msgstr "ਮੀਟਿੰਗ ਸੱਦਾ"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3257
-msgid "_Delete message after acting"
-msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
-msgid "Conflict Search"
-msgstr "ਅਪਵਾਦ ਖੋਜ"
-
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
-msgid "Today %H:%M"
-msgstr "ਅੱਜ %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
-msgid "Today %H:%M:%S"
-msgstr "ਅੱਜ %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
-msgid "Today %l:%M:%S %p"
-msgstr "ਅੱਜ %l:%M:%S %p"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
-msgid "Tomorrow %H:%M"
-msgstr "ਭਲਕ %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
-msgid "Tomorrow %H:%M:%S"
-msgstr "ਭਲਕ %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
-msgid "Tomorrow %l:%M %p"
-msgstr "ਭਲਕ %l:%M %p"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "ਭਲਕ %l:%M:%S %p"
-
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
-#, c-format
-msgid "%A"
-msgstr "%A"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
-msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
-msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
-
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
-msgid "%A, %B %e"
-msgstr "%A, %B %e"
-
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
-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.
-#: ../plugins/itip-formatter/itip-view.c:316
-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.
-#: ../plugins/itip-formatter/itip-view.c:320
-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.
-#: ../plugins/itip-formatter/itip-view.c:325
-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.
-#: ../plugins/itip-formatter/itip-view.c:329
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %e %B, %Y %l:%M:%S %p"
-
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
-msgid "An unknown person"
-msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਜਵਾਬ ਭੇਜੋ ਜੀ"
-
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
-#, c-format
-msgid "Received on behalf of %s"
-msgstr "%s ਦੇ ਤੌਰ ਉੱਤੇ ਲਿਆ"
-
-#: ../plugins/itip-formatter/itip-view.c:379
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:381
-#, c-format
-msgid "%s has published the following meeting information:"
-msgstr "%s ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:389
-#, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:391
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "%s ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:397
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:399
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "%s ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:403
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr "%s ਰਾਹੀਂ %s ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:405
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "%s ਤਾਜ਼ੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:409
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤਾ ਮੀਟਿੰਗ ਜਾਵਾਬ ਵਾਪਸ ਭੇਜਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:411
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:415
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:417
-#, c-format
-#| msgid "%s has canceled the following meeting."
-msgid "%s has canceled the following meeting:"
-msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:421
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "%s ਰਾਹੀਂ %s ਨੇ ਹੇਠ ਦਿੱਤੇ ਮੀਟਿੰਗ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ।"
-
-#: ../plugins/itip-formatter/itip-view.c:423
-#, c-format
-#| msgid "%s has proposed the following meeting changes."
-msgid "%s has proposed the following meeting changes:"
-msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:427
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:429
-#, c-format
-#| msgid "%s has declined the following meeting changes."
-msgid "%s has declined the following meeting changes:"
-msgstr "%s ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਅੱਗੇ ਦਿੱਤੀ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:467
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:469
-#, c-format
-msgid "%s has published the following task:"
-msgstr "%s ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:477
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:479
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:485
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:487
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "%s ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "%s ਰਾਹੀਂ %s ਅੱਗੇ ਦਿੱਤੀ ਅਸਾਇਨ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਲੈਣੀ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:493
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr "%s ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s ਰਾਹੀਂ %s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਅਸਾਇਨ ਕੰਮ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:499
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:503
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:505
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:509
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਅਸਾਇਨਮਿੰਟ ਬਦਲਾਅ ਸੁਝਾਏ ਹਨ:"
-
-#: ../plugins/itip-formatter/itip-view.c:511
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "%s ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਭੇਜੇ ਹਨ:"
-
-#: ../plugins/itip-formatter/itip-view.c:515
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "%s ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:517
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:554
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:556
-#, c-format
-msgid "%s has published the following memo:"
-msgstr "%s ਨੇ ਮੀਮੋ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:561
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "%s %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:563
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "%s ਮੌਜੂਦਾ ਮੀਮੋ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:567
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "%s ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:569
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "%s ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
-
-#: ../plugins/itip-formatter/itip-view.c:693
-msgid "All day:"
-msgstr "ਸਾਰਾ ਦਿਨ:"
-
-#: ../plugins/itip-formatter/itip-view.c:703
-msgid "Start day:"
-msgstr "ਦਿਨ ਸ਼ੁਰੂ:"
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
-msgid "Start time:"
-msgstr "ਸ਼ੁਰੂ ਸਮਾਂ:"
-
-#: ../plugins/itip-formatter/itip-view.c:715
-msgid "End day:"
-msgstr "ਦਿਨ ਅੰਤ:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
-msgid "End time:"
-msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
-
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ(_O)"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "ਮਨਜ਼ੂਰ(_c)"
-
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "ਆਰਜ਼ੀ(_T)"
-
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "ਸਭ ਮਨਜ਼ੂਰ(_c)"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "ਅੱਪਡੇਟ(_U)"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
-msgid "Comment:"
-msgstr "ਟਿੱਪਣੀ:"
-
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ ਦਿਓ(_r)"
-
-#  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
-
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_A)"
-
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "ਟਾਈਮ ਫਰੀ ਵਾਂਗ ਵੇਖੋ(_f)"
-
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
-
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "ਇੰਹੈਰਿਟ ਰੀਮਾਇਡਰ(_I)"
-
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "ਕੰਮ(_T):"
-
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "ਮੀਮੋ(_M):"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip ਫਾਰਮੈਟਰ"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "ਪੱਤਰ ਸੁਨੇਹਿਆਂ ਵਿੱਚ \"ਟੈਕਸਟ/ਕੈਲੰਡਰ\" ਮਾਈਮ ਭਾਗ ਵੇਖੋ"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਭੇਜਣ ਵਾਲੇ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr "ਇਹ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "'{0}' ਮੀਟਿੰਗ ਲਈ ਡੈਲੀਗੇਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੈਲੀਗੇਟ {1} ਨੂੰ ਜੋੜਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
 msgid "Get List _Archive"
 msgstr "ਲਿਸਟ ਅਕਾਇਵ ਲਵੋ(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "Get an archive of the list this message belongs to"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੇ ਅਕਾਇਵ ਖੋਜੋ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
 msgid "Get List _Usage Information"
 msgstr "ਲਿਸਟ ਵਰਤੋਂ ਜਾਣਕਾਰੀ ਲਵੋਂ(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਵੋ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
 msgid "Contact List _Owner"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮਾਲਕ(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਦੇ ਮਾਲਕ ਨਾਲ ਸੰਪਰਕ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
 msgid "_Post Message to List"
 msgstr "ਲਿਸਟ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
 msgid "_Subscribe to List"
 msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰ ਬਣੋ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
 msgid "_Unsubscribe from List"
 msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ, ਜੋ ਸਬੰਧਿਤ ਹੈ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
 msgid "Mailing _List"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ(_L)"
 
@@ -19788,73 +18640,58 @@ msgstr ""
 "\n"
 "ਹੈੱਡਰ: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:421
 #, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵਾਂ ਸੁਨੇਹਾ\n"
-"ਆਇਆ ਹੈ।"
-msgstr[1] ""
-"ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵੇਂ ਸੁਨੇਹੇ\n"
-"ਆਏ ਹਨ।"
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "ਤੁਹਾਨੂੰ ਇੱਕ ਨਵਾਂ %d  ਸੁਨੇਹਾ ਆਇਆ ਹੈ।"
+msgstr[1] "ਤੁਹਾਨੂੰ %d  ਨਵੇਂ ਸੁਨੇਹੇ ਆਏ ਹਨ।"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:410
 #, c-format
 msgid "Subject: %s"
 msgstr "ਵਿਸ਼ਾ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:420
-#, c-format
-msgid "You have received %d new message."
-msgid_plural "You have received %d new messages."
-msgstr[0] "ਤੁਹਾਨੂੰ ਇੱਕ ਨਵਾਂ %d  ਸੁਨੇਹਾ ਆਇਆ ਹੈ।"
-msgstr[1] "ਤੁਹਾਨੂੰ %d  ਨਵੇਂ ਸੁਨੇਹੇ ਆਏ ਹਨ।"
-
-#: ../plugins/mail-notification/mail-notification.c:429
-#: ../plugins/mail-notification/mail-notification.c:437
-#: ../plugins/mail-notification/mail-notification.c:440
-msgid "New email"
-msgstr "ਨਵੀਂ ਈਮੇਲ"
+#: ../plugins/mail-notification/mail-notification.c:427
+#| msgid "Restarting Evolution"
+msgid "New email in Evolution"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਨਵੀਂ ਈਮੇਲ"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid "Show %s"
 msgstr "%s ਵੇਖੋ"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:658
 msgid "_Play sound when a new message arrives"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "_Beep"
 msgstr "ਬੀਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "Use sound _theme"
 msgstr "ਸਾਊਂਡ ਥੀਮ ਵਰਤੋਂ(_t)"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:722
 msgid "Play _file:"
 msgstr "ਫਾਇਲ ਚਲਾਓ(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:731
 msgid "Select sound file"
 msgstr "ਸਾਊਂਡ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:787
 msgid "Notify new messages for _Inbox only"
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:797
 msgid "Show _notification when a new message arrives"
 msgstr "ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਉ(_n)"
 
@@ -19867,12 +18704,12 @@ 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>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ਵਲੋਂ ਮੇਲ ਰਾਹੀਂ ਬਣਾਇਆ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19881,7 +18718,7 @@ msgstr ""
 "ਚੁਣਿਆ ਕੈਲੰਡਰ ਵਿੱਚ ਈਵੈਂਟ '%s' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੇ ਈਵੈਂਟ ਨੂੰ "
 "ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../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 "
@@ -19890,7 +18727,7 @@ msgstr ""
 "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਟਾਸਕ '%s' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੀ ਟਾਸਕ ਨੂੰ "
 "ਸੋਧਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../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 "
@@ -19901,11 +18738,8 @@ msgstr ""
 "ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:647
 #, c-format
-#| msgid ""
-#| "You have selected %d mails to be converted to events. Do you really want "
-#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
@@ -19920,11 +18754,8 @@ msgstr[1] ""
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
-#| msgid ""
-#| "You have selected %d mails to be converted to tasks. Do you really want "
-#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
@@ -19939,11 +18770,8 @@ msgstr[1] ""
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../plugins/mail-to-task/mail-to-task.c:659
 #, c-format
-#| msgid ""
-#| "You have selected %d mails to be converted to memos. Do you really want "
-#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
@@ -19957,43 +18785,47 @@ msgstr[1] ""
 "ਤੁਸੀਂ ਚੁਣੀਆਂ %d ਮੇਲਾਂ ਨੂੰ ਮੀਮੋ ਵਿੱਚ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਉਹਨਾਂ ਸਭ ਨੂੰ "
 "ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:676
+#: ../plugins/mail-to-task/mail-to-task.c:680
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "ਕੀ ਤੁਸੀਂ ਬਾਕੀ ਮੇਲਾਂ ਨੂੰ ਬਦਲਣਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:755
 msgid "[No Summary]"
 msgstr "[ਸੰਖੇਪ ਨਹੀਂ]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:767
 msgid "Invalid object returned from a server"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਆਬਜੈਕਟ ਵਾਪਸ ਮਿਲਿਆ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../plugins/mail-to-task/mail-to-task.c:819
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ਪਰੋਸੈਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:844
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:844
+msgid "Unknown error."
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਹੈ।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
 "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਈਵੈਂਟ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:854
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
 "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਕੰਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:857
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -20001,44 +18833,40 @@ msgstr ""
 "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਮੀਮੋ ਉੱਥੇ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ "
 "ਜੀ।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "ਸਰੋਤ ਲਿਸਟ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 msgid "No writable calendar is available."
 msgstr "ਕੋਈ ਲਿਖਣਯੋਗ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
-msgid "Create an _Event"
-msgstr "ਈਵੈਂਟ ਬਣਾਓ(_E)"
+#: ../plugins/mail-to-task/mail-to-task.c:1270
+#| msgid "Create a new appointment"
+msgid "Create an _Appointment"
+msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a new event from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਈਵੈਂਟ ਬਣਾਓ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "ਮੀਮੋ ਬਣਾਓ(_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a new memo from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "ਟਾਸਕ ਬਣਾਓ(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a new task from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਟਾਸਕ ਬਣਾਓ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "ਮੀਟਿੰਗ ਬਣਾਓ(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new meeting from the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
 
@@ -20059,15 +18887,15 @@ msgstr ""
 "ਫੋਲਡਰ ਦੇ ਨਾਲ ਸਭ ਅਧੀਨ-"
 "ਫੋਲਡਰ ਵੀ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:216
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current Folder and _Subfolders"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:230
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current _Folder Only"
 msgstr "ਕੇਵਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:576
+#: ../plugins/mark-all-read/mark-all-read.c:545
 msgid "Mark Me_ssages as Read"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਹੋਏ ਬਣਾਓ(_S)"
 
@@ -20079,58 +18907,6 @@ msgstr "ਸਭ ਪੜ੍ਹੇ ਬਣਾਓ"
 msgid "Mark all messages in a folder as read."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਮਾਰਕ ਕਰੋ"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਸੰਦ"
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Plain Text Mode"
-msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "ਪੱਤਰ ਸੁਨੇਹੇ ਨੂੰ ਪਲੇਟ-ਟੈਕਸਟ ਵੇਖੋ, ਜੇ ਇਹ HTML ਸਮੱਗਰੀ ਵੀ ਰੱਖਦੀ ਹੋਵੇ।"
-
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show HTML if present"
-msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Let Evolution choose the best part to show."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਚੁਣਨ ਦਿਓ ਕਿ ਵੇਖਾਉਣ ਲਈ ਕੀ ਸਭ ਤੋਂ ਵਧੀਆ ਹੈ।"
-
-#: ../plugins/prefer-plain/prefer-plain.c:254
-msgid "Show plain text if present"
-msgstr "ਜੇ ਮੌਜੂਦ ਹੋਵੇ ਤਾਂ ਪਲੇਨ ਟੈਕਸਟ ਵੇਖੋ"
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"ਪਲੇਨ ਟੈਕਸਟ ਭਾਗ ਵੇਖੋ, ਜੇ ਮੌਜੂਦ ਹੋਵੇ, ਨਹੀਂ ਤਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਵਧੀਆ ਢੰਗ "
-"ਚੁਣਨ ਦਿਉ।"
-
-#: ../plugins/prefer-plain/prefer-plain.c:259
-msgid "Only ever show plain text"
-msgstr "ਹਮੇਸ਼ਾ ਪਲੇਨ ਟੈਕਸਟ ਹੀ ਵੇਖੋ"
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"ਹਮੇਸ਼ਾ ਪਲੇਨ ਟੈਕਸਟ ਭਾਗ ਵੇਖਾਓ ਅਤੇ ਹੋਰ ਭਾਗ ਤੋਂ ਅਟੈਚਮੈਂਟ ਬਣਾਓ, ਜੇ ਮੰਗਿਆ ਹੋਵੇ ਤਾਂ।"
-
-#: ../plugins/prefer-plain/prefer-plain.c:311
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "ਦਬਾਏ ਗਏ HTML ਭਾਗ ਅਟੈਚਮੈਂਟ ਵਜੋਂ ਵੇਖੋ(_u)"
-
-#: ../plugins/prefer-plain/prefer-plain.c:333
-msgid "HTML _Mode"
-msgstr "HT_ML ਮੋਡ"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST ਇੰਪੋਰਟ"
@@ -20143,38 +18919,37 @@ msgstr "Outlook ਨਿੱਜੀ ਫੋਲਡਰ (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "PST ਫਾਇਲ ਤੋਂ ਆਉਟਲੁੱਕ ਸੁਨੇਹੇ ਇੰਪੋਰਟ"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫੋਲਡਰ:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:599
 msgid "A_ppointments"
 msgstr "ਮੁਲਾਕਾਤ(_p)"
 
-#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "ਕੰਮ(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "ਜਰਨਲ ਐਂਟਰੀਆਂ(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:707
+#: ../plugins/pst-import/pst-importer.c:721
 msgid "Importing Outlook data"
 msgstr "ਆਉਟਲੁੱਕ ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:145
+#: ../plugins/publish-calendar/publish-calendar.c:152
 msgid "Calendar Publishing"
 msgstr "ਕੈਲੰਡਰ ਪਰਾਕਸ਼ਨ"
 
@@ -20186,49 +18961,49 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "Publish calendars to the web."
 msgstr "ਕੈਲੰਡਰ ਵੈੱਬ ਉੱਤੇ ਪਬਲਿਸ਼ ਕਰੋ।"
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../plugins/publish-calendar/publish-calendar.c:211
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "%s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:233
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%s ਪਬਲਿਸ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%s ਲਈ ਪਬਲਿਸ ਸਫ਼ਲ ਰਿਹਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:279
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s ਦਾ ਮਾਊਂਟ ਫੇਲ੍ਹ:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "ਯੋਗ(_n)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../plugins/publish-calendar/publish-calendar.c:774
 msgid "Are you sure you want to remove this location?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਟਿਕਾਣਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1104
 msgid "Could not create publish thread."
 msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1112
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
@@ -20249,7 +19024,6 @@ msgid "Manual (via Actions menu)"
 msgstr "ਖੁਦ (ਐਕਸ਼ਨ ਮੇਨੂ ਰਾਹੀਂ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#| msgid "Secure FTP (SSH)"
 msgid "Secure FTP (SFTP)"
 msgstr "ਸੁਰੱਖਿਅਤ FTP (SFTP)"
 
@@ -20321,100 +19095,100 @@ msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 msgid "Publishing Location"
 msgstr "ਪਰਕਾਸ਼ਣ ਟਿਕਾਣਾ"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../plugins/publish-calendar/publish-format-fb.c:97
+#: ../plugins/publish-calendar/publish-format-ical.c:95
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ਕੈਲੰਡਰ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਕੈਲੰਡਰ ਬੈਕਐਡ ਹੁਣ ਮੌਜੂਦ ਨਹੀਂ ਰਿਹਾ।"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:539
 msgid "New Location"
 msgstr "ਨਵਾਂ ਟਿਕਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:541
 msgid "Edit Location"
 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.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "ਵੇਰਵਾ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "ਟਿੱਪਣੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "ਦਰਸ਼ਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "ਸੋਧਿਆ"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ(_d)"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "ਹੈੱਡਰ ਅੱਗੇ ਜੋੜੋ(_h)"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "ਮੁੱਲ ਸੀਮਾ(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "ਰਿਕਾਰਡ ਸੀਮਾ(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:627
 msgid "Comma separated values (.csv)"
 msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੇ ਮੁੱਲ(.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20431,31 +19205,31 @@ msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਜਾਂ ਟਾਸਕ ਲਿਸਟ ਨ�
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:152
+#: ../plugins/save-calendar/rdf-format.c:146
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:387
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:123
 msgid "_Format:"
 msgstr "ਫਾਰਮੈਟ(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:185
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:340
 msgid "Save the selected calendar to disk"
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਨੂੰ ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:371
 msgid "Save the selected memo list to disk"
 msgstr "ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:402
 msgid "Save the selected task list to disk"
 msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ"
 
@@ -20471,276 +19245,27 @@ msgstr ""
 "ਵਾਲੇ ਈਮੇਲ ਦੇ ਮੁੱਲ "
 "ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../plugins/templates/templates.c:1105
+#: ../plugins/templates/templates.c:1113
 msgid "No Title"
 msgstr "ਟਾਈਟਲ ਨਹੀਂ"
 
-#: ../plugins/templates/templates.c:1217
+#: ../plugins/templates/templates.c:1225
 msgid "Save as _Template"
 msgstr "ਟੈਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ(_T)"
 
-#: ../plugins/templates/templates.c:1219
+#: ../plugins/templates/templates.c:1227
 msgid "Save as Template"
 msgstr "ਟੈਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "TNEF Decoder"
-msgstr "TNEF ਡੀਕੋਡਰ"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "ਮਾਈਕਰੋਸਾਫਟ ਆਉਟਲੁੱਕ ਤੋਂ TNEF (winmail.dat) ਡੀਕੋਡ ਕਰੋ।"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-msgid "Inline vCards"
-msgstr "ਇਨ-ਲਾਈਨ vCards"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਸਿੱਧੇ vCard ਵੇਖੋ।"
-
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
-msgid "Show Full vCard"
-msgstr "ਪੂਰਾ vCard ਵੇਖੋ"
-
-#: ../plugins/vcard-inline/vcard-inline.c:211
-msgid "Show Compact vCard"
-msgstr "ਥੋੜਾ vCard ਵੇਖੋ"
-
-#: ../plugins/vcard-inline/vcard-inline.c:272
-msgid "There is one other contact."
-msgstr "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
-
-#: ../plugins/vcard-inline/vcard-inline.c:281
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "%d ਹੋਰ ਸੰਪਰਕ ਹੈ।"
-msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
-
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਸੰਭਾਲੋ"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "WebDAV contacts"
-msgstr "WebDAV ਸੰਪਰਕ"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "Add WebDAV contacts to Evolution."
-msgstr "WebDAV ਸੰਪਰਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:286
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "ifMatch ਅਣਡਿੱਠਾ (_Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ, ਦੇ ਰਸਤੇ ਦੀ ਲਿਸਟ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Default window Y coordinate"
-msgstr "ਮੂਲ ਵਿੰਡੋ Y ਧੁਰਾ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "The default Y coordinate for the main window."
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਲਈ ਮੂਲ Y ਧੁਰਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "Default window X coordinate"
-msgstr "ਮੂਲ ਵਿੰਡੋ X ਧੁਰਾ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "The default X coordinate for the main window."
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਲਈ ਮੂਲ X ਧੁਰਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "Default window width"
-msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਚੌੜਾਈ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "The default width for the main window, in pixels."
-msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Default window height"
-msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਉਚਾਈ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "The default height for the main window, in pixels."
-msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Default window state"
-msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਹਾਲਤ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Whether or not the window should be maximized."
-msgstr "ਕੀ ਝਰੋਖੇ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਦਿੱਤਾ ਜਾਵੇ ਜਾਂ ਨਾ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid "Proxy configuration mode"
-msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੋਡ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੋਡ ਚੁਣੋ। ਸਹਿਯੋਗੀ ਮੁੱਲ ਹਨ 0, 1, 2, ਅਤੇ 3 \"ਸਿਸਟਮ ਸੰਰਚਨਾ "
-"ਵਰਤੋਂ\", \"ਪਰਾਕਸੀ "
-"ਨਹੀਂ\", \"ਖੁਦ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਦਿਓ\" ਅਤੇ \"autoconfig url ਵਿੱਚ ਦਿੱਤੀ ਪਰਾਕਸੀ "
-"ਸੰਰਚਨਾ ਵਰਤੋਂ"
-"\" ਹਨ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "HTTP proxy port"
-msgstr "HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/http_host\" ਰਾਹੀਂ "
-"ਦਿੱਤਾ "
-"ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "HTTP proxy host name"
-msgstr "HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The machine name to proxy HTTP through."
-msgstr "ਪਰਾਕਸੀ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "Secure HTTP proxy port"
-msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ  \"/apps/evolution/shell/network_config/secure_host\" ਰਾਹੀਂ "
-"ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "Secure HTTP proxy host name"
-msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy secure HTTP through."
-msgstr "ਪਰਕਾਸੀ ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "SOCKS proxy port"
-msgstr "SOCKS ਪਰਾਕਸੀ ਪੋਰਟ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/socks_host\"ਰਾਹੀਂ "
-"ਦਿੱਤਾ "
-"ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "SOCKS proxy host name"
-msgstr "SOCKS ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The machine name to proxy socks through."
-msgstr "ਪਰਾਕਸੀ ਸਾਕਟ ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Use HTTP proxy"
-msgstr "HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"ਜਦੋਂ HTTP/ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਵਰਤਣਾ ਹੋਵੇ ਤਾਂ ਪਰਾਕਸੀ ਸਥਾਪਨ ਚਾਲੂ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Authenticate proxy server connections"
-msgstr "ਪਰਾਕਸੀ ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਪਰਮਾਣਿਤ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਪਰਾਕਸੀ ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਯੂਜ਼ਰ ਨਾਂ ਨੂੰ "
-"\"/apps/evolution/"
-"shell/network_config/authentication_user\" GConf  ਕੁੰਜੀ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ gnome-"
-"keyring ਜਾਂ ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾਇਲ ਤੋਂ ਲਿਆ ਜਾਂਦਾ ਹੈ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "HTTP proxy username"
-msgstr "HTTP ਪਰਾਕਸੀ ਯੂਜ਼ਰ-ਨਾਂ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr ""
-"ਪਰਮਾਣਕਿਤਾ ਵਜੋਂ ਦੇਣ ਲਈ ਯੂਜ਼ਰ ਨਾਂ, ਜਦੋਂ ਕਿ HTTP ਪਰਾਕਸੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "HTTP proxy password"
-msgstr "HTTP ਪਰਾਕਸੀ ਪਾਸਵਰਡ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "ਜਦੋਂ HTTP ਪਰਾਕਸੀ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪਰਮਾਣਕਿਤਾ ਵਾਸਪੇ ਪਾਸਵਰਡ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Non-proxy hosts"
-msgstr "ਗ਼ੈਰ-ਪਰਾਕਸੀ ਹੋਸਟ"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-" ਇਸ ਕੁੰਜੀ ਵਿੱਚ ਹੋਸਟਾਂ ਦੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਸਿੱਧੇ ਕੁਨੈਕਟ ਹਨ, ਨਾ ਕਿ ਪਰਾਕਸੀ ਰਾਹੀਂ "
-"(ਜੇ ਇਹ ਐਕਟਿਵ "
-"ਹੋਵੇ)। ਇਹ ਮੁੱਲ ਵਿੱਚ ਹੋਸਟ-ਨਾਂ, ਡੋਮੇਨ (ਸ਼ੁਰੂਆਤੀ ਵਲਾਈਡ-ਕਾਰਡ *.foo.com ਆਦਿ ਨਾਲ), "
-"IP ਹੋਸਟ ਐਡਰੈੱਸ "
-"(IPv੪ ਅਤੇ IPv੬ ਦੋਵਾਂ) ਨਾਲ ਅਤੇ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਨਾਲ ਨੈੱਟਮਾਸਕ (ਕਿਵੇਂ ਕਿ 192.168.0."
-"0/24) ਹਨ।"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Automatic proxy configuration URL"
-msgstr "ਆਟੋਮੈਟਿਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ URL"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "URL that provides proxy configuration values."
-msgstr "URL ਜੋ ਕਿ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੁੱਲ ਦਿੰਦਾ ਹੈ।"
-
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "ਆਫਲਾਈਨ ਜਾਣ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "ਆਨਲਾਈਨ ਜਾਣ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "ਬੰਦ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
@@ -20780,290 +19305,281 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "ਸਭ ਫਾਇਲਾਂ (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 msgid "Saving user interface state"
 msgstr "ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਹਾਲਤ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:642
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ, ੨੦੦੪-੨੦੧੦\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:891
 msgid "Categories Editor"
 msgstr "ਕੈਟਾਗਰੀ ਐਡੀਟਰ"
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "ਬੱਗ ਬੱਡੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "ਬੱਗ ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_C)"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਯੂਜ਼ਰ ਗਾਈਡ ਖੋਲ੍ਹੋ"
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ(_F)"
-
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Forget all remembered passwords"
-msgstr "ਸਭ ਯਾਦ ਰੱਖੇ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ"
-
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "ਇੰਪੋਰਟ ਕਰੋ(_m)..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "ਹੋਰ ਕਾਰਜਾਂ ਤੋਂ ਡਾਟਾ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "ਇਸ ਝਲਕ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਨਵੀਂ ਵਿੰਡੋ ਬਣਾਓ"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_g)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ ਪਰਬੰਧ"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "ਤੁਰੰਤ ਹਵਾਲਾ(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "ਹੋਰ ਵੀ ਤਕਨੀਕੀ ਖੋਜ ਬਣਾਓ"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਸਾਫ਼ ਕਰੋ"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲੀ ਖੋਜ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "ਆਪਣੀ ਸੰਭਾਲੀ ਖੋਜ ਦਾ ਪਰਬੰਧ ਕਰੋ"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "ਖੋਜ ਟਾਈਪ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਚਲਾਓ"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "ਮੌਜੂਦਾ ਖੋਜ ਪੈਰਾਮੀਟਰ ਸੰਭਾਲੋ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱਗ ਬੱਡੀ ਵਰਤ ਕੇ ਬੱਗ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "ਆਫ਼-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "ਆਨ-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਨਲਾਈਨ ਮੋਡ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "ਲੇਆਉਟ(_o)"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "ਨਵਾਂ(_N)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱਚਰ ਦਿੱਖ(_S)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "ਵਿੰਡੋ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "ਸਾਈਡ-ਬਾਰ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "ਬਟਨ ਵੇਖੋ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "ਸਵਿੱਚਰ ਬਟਨ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ(_S)"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "ਟੂਲਬਾਰ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "ਟੂਲਬਾਰ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "ਆਈਕਾਨ ਹੀ(_I)"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਨਾਲ ਆਈਕਾਨ ਹੀ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "ਸਿਰਫ਼ ਟੈਕਸਟ(_T)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਨਾਲ ਟੈਕਸਟ ਹੀ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "ਆਈਕਾਨ ਅਤੇ ਟੈਕਸਟ(_a)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Display window buttons with icons and text"
 msgstr "ਵਿੰਡੋ ਬਟਨਾਂ ਨਾਲ ਆਈਕਾਨ ਅਤੇ ਟੈਕਸਟ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "ਟੂਲਬਾਰ ਸਟਾਈਲ(_b)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਡੈਸਕਟਾਪ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਨਾਲ ਵੇਖੋ"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ..."
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "ਵਿਊ ਬਣਾਓ ਜਾਂ ਸੋਧ"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "ਮੌਜੂਦਾ ਕਸਟਮਾਈਜ਼ ਵਿਊ ਸੰਭਾਲੋ"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_u)"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ"
 
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਇੱਕ ਕਸਟਮਾਈਜ਼ ਝਲਕ ਹੈ"
 
-#: ../shell/e-shell-window-actions.c:1816
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Change the page settings for your current printer"
 msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫ਼ਾ ਸੈਟਿੰਗ ਬਦਲੋ"
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
-#: ../shell/e-shell-window-actions.c:2327
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
-#| msgid "Select A File"
 msgid "Select view: %s"
 msgstr "ਝਲਕ ਚੁਣੋ: %s"
 
-#: ../shell/e-shell-window-actions.c:2428
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "ਇਹ ਖੋਜ ਪੈਰਾਮੀਟਰ ਚਲਾਓ"
 
@@ -21072,13 +19588,13 @@ msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:585
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ਈਵੇਲੂਸ਼ਨ"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21113,7 +19629,7 @@ msgstr ""
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
 "ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21121,13 +19637,13 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:215
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:306
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21136,48 +19652,47 @@ msgstr ""
 "'calendar(ਕੈਲੰਡਰ)', "
 "'contacts(ਸੰਪਰਕ)', 'tasks(ਟਾਸਕ)', ਅਤੇ 'memos(ਮੀਮੋ)'"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:310
 msgid "Apply the given geometry to the main window"
 msgstr "ਦਿੱਤੀ ਜੁਮੈਟਰੀ ਮੁੱਖ ਵਿੰਡੋ ਉੱਤੇ ਲਾਗੂ ਕਰੋ"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:316
 msgid "Ignore network availability"
 msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਅਣਡਿੱਠੀ ਕਰੋ"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:318
 msgid "Start in \"express\" mode"
 msgstr "\"ਐਕਸਪ੍ਰੈਸ\" ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:321
 msgid "Forcibly shut down Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਧੱਕੇ ਨਾਲ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਕੰਮ ਲਈ ਝਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
 
-#: ../shell/main.c:334
-#| msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:330
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "URI ਜਾਂ ਬਾਕੀ ਦੇ ਆਰਗੂਮੈਂਟ ਵਜੋਂ ਦਿੱਤੇ ਫਾਇਲ-ਨਾਂ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Request a running Evolution process to quit"
 msgstr "ਚੱਲਦੇ ਈਵੇਲਸ਼ਨ ਪਰੋਸੈਸ ਨੂੰ ਬੰਦ ਕਰਨ ਦੀ ਮੰਗ"
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:505
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21186,7 +19701,7 @@ msgstr ""
 "%s: --online ਅਤੇ --offline ਇੱਕ ਸਮੇਂ ਨਹੀਂ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।\n"
 " ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ  '%s --help' ਚਲਾਓ।\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21232,23 +19747,6 @@ msgstr ""
 "ਤੁਸੀਂ ਪਹਿਲਾਂ ਈਵੇਲੂਸ਼ਨ "
 "੨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਤੇ ਫੇਰ ਈਵੇਲੂਸ਼ਨ ੩ ਲਈ।"
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਯਾਦ ਰੱਖੇ ਹੋਏ ਪਾਸਵਰਡ ਭੁੱਲਣ ਲਈ ਤਿਆਰ ਹੋ?"
-
-#: ../shell/shell.error.xml.h:12
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ "
-"ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ "
-"ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "ਭੁੱਲੋ(_F)"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21357,7 +19855,7 @@ msgstr "ਸੰਗਠਨ ਇਕਾਈ ਨੂੰ ਜਾਰੀ ਕੀਤਾ"
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:543
+#: ../smime/lib/e-cert.c:542
 msgid "Serial Number"
 msgstr "ਕਰਮ ਅੰਕ"
 
@@ -21414,27 +19912,27 @@ msgstr "MD੫ ਫਿੰਗਰਪਰਿੰਟ"
 msgid "Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:589
 msgid "Select a certificate to import..."
 msgstr "ਅਯਾਤ ਕਰਨ ਲਈ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..."
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:602
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:632
+#: ../smime/gui/certificate-manager.c:637
 msgid "Failed to import certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1013
 msgid "All PKCS12 files"
 msgstr "ਸਭ PKCS12 ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1030
 msgid "All email certificate files"
 msgstr "ਸਭ ਈਮੇਲ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1047
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
@@ -21501,11 +19999,11 @@ msgstr ""
 msgid "Select certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL ਕਲਾਇਟ ਸਰਟੀਫਿਕੇਟ"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"
 
@@ -21569,6 +20067,10 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਖੇਤਰ"
 msgid "Field Value"
 msgstr "ਖੇਤਰ ਮੁੱਲ"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "ਵੇਰਵਾ"
+
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
@@ -21617,17 +20119,14 @@ msgid "Certificate Authority Trust"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਜਾਂਚ"
 
 #: ../smime/gui/smime-ui.ui.h:39
-#| msgid "Trust this CA to identify websites."
 msgid "Trust this CA to identify _websites."
 msgstr "ਇਸ CA ਉੱਤੇ ਵੈੱਬ-ਸਾਇਟਾਂ ਲਈ ਭਰੋਸਾ ਰੱਖੋ(_w)।"
 
 #: ../smime/gui/smime-ui.ui.h:40
-#| msgid "Trust this CA to identify email users."
 msgid "Trust this CA to identify _email users."
 msgstr "ਇਸ CA ਤੇ ਈ-ਮੇਲ ਯੂਜ਼ਰਾਂ ਦੀ ਪਛਾਣ ਲਈ ਭਰੋਸਾ ਰੱਖੋ।(_e)"
 
 #: ../smime/gui/smime-ui.ui.h:41
-#| msgid "Trust this CA to identify software developers."
 msgid "Trust this CA to identify _software developers."
 msgstr "ਇਸ CA ਤੇ ਸਾਫਟਵੇਅਰ ਡਿਵੈਲਪਰਾਂ ਦੀ ਪਛਾਣ ਲਈ ਭਰੋਸਾ ਕਰੋ(_s)"
 
@@ -21640,7 +20139,7 @@ msgstr ""
 "ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ "
 "ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
@@ -21664,153 +20163,153 @@ msgstr "ਇਸ ਸਰਟੀਫਿਕੇਟ ਦੀ ਪਰ੍ਮਾਣਕਿਤਾ
 msgid "_Edit CA Trust"
 msgstr "CA ਭਰੋਸਾ ਸੋਧ(_E)"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:391
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-cert.c:503
 msgid "Version"
 msgstr "ਵਰਜਨ"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-cert.c:518
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-cert.c:521
 msgid "Version 2"
 msgstr "ਵਰਜਨ 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-cert.c:524
 msgid "Version 3"
 msgstr "ਵਰਜਨ ੩"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-cert.c:607
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-cert.c:610
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD੫ RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-cert.c:613
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 RSA ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 RSA ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 RSA ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ਇਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਕੁੰਜੀ ਵਰਤੋਂ"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "ਨੈੱਟਸਕੇਪ ਸਰਟੀਫਿਕੇਟ ਕਿਸਮ"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਕੀ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ਇਕਾਈ ਪਛਾਣਕਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "ਐਲੋਗਰਿਥਮ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "ਐਲੋਗਰਿਥਮ ਪੈਰਾਮੀਟਰ"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵਜਨਕ ਕੀ ਜਾਣਕਾਰੀ"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼ੇ ਦਾ ਸਰਵਜਨਕ ਕੀ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼ੇ ਦੀ ਸਰਵਜਨਕ ਕੀ"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
 msgid "Error: Unable to process extension"
 msgstr "ਗਲਤੀ: ਕਾਰਜ ਵਾਧੇ ਲਈ ਅਸਫਲ"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "ਆਬਜੈਕਟ ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "ਈ-ਮੇਲ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "ਨਾ-ਇਨਕਾਰ"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "ਕੀ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:863
 msgid "Data Encipherment"
 msgstr "ਡਾਟਾ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:867
 msgid "Key Agreement"
 msgstr "ਕੁੰਜੀ ਇਕਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:924
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
 msgid "Not Critical"
 msgstr "ਘਾਤਕ ਨਹੀਂ"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
@@ -21822,45 +20321,45 @@ msgstr "ਵਾਧਾ"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1029
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "ਜਾਰੀ ਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ਜਾਰੀ ਕਰਤਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਮੁੱਲ"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ਫਾਇਲ ਪਾਸਵਰਡ"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ਫਾਇਲ ਲਈ ਪਾਸਵਰਡ:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 
@@ -21990,7 +20489,7 @@ msgstr "\"%s\" ਲਈ ਝਲਕ ਪਰਿਭਾਸ਼ਿਤ"
 msgid "Table"
 msgstr "ਟੇਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
 msgid "Save Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਸੰਭਾਲੋ"
 
@@ -22018,25 +20517,34 @@ msgstr "ਝਲਕ ਦੀ ਕਿਸਮ:"
 msgid "Type of View"
 msgstr "ਝਲਕ ਦੀ ਕਿਸਮ"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
+#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:317
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:318
+#: ../widgets/misc/ea-calendar-item.c:320
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "ਕੈਲੰਡਰ: %s ਤੋਂ %s ਤੱਕ"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਇਕਾਈ"
 
 #: ../widgets/misc/e-alert-bar.c:120
-#| msgid "Send this message"
 msgid "Close this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਬੰਦ ਕਰੋ"
 
+#: ../widgets/misc/e-attachment-bar.c:658
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "ਆਈਕਾਨ ਝਲਕ"
+
+#: ../widgets/misc/e-attachment-bar.c:660
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "ਲਿਸਟ ਝਲਕ"
+
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
@@ -22046,49 +20554,49 @@ msgid "Attached message"
 msgstr "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "ਪਹਿਲਾਂ ਹੀ ਲੋਡ ਕਾਰਵਾਈ ਜਾਰੀ ਹੈ।"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾਂ ਸੰਭਾਲਣ ਕਾਰਵਾਈ ਜਾਰੀ ਹੈ।"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "ਅਟੈਚਮੈਂਟ ਸਮੱਗਰੀ ਲੋਡ ਨਹੀਂ ਹੈ"
 
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
@@ -22097,6 +20605,11 @@ msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕ�
 msgid "Attachment Properties"
 msgstr "ਅਟੈਚਮੈਂਟ ਵਿਸ਼ੇਸਤਾ"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "MIME ਟਾਈਪ:"
@@ -22199,20 +20712,107 @@ msgstr "\"%s\" ਨਾਲ ਖੋਲ੍ਹੋ"
 msgid "Open this attachment in %s"
 msgstr "ਇਹ ਅਟੈਚਮੈਂਟ %s ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
+#: ../widgets/misc/e-book-source-config.c:98
+#| msgid "Mark as _default address book"
+msgid "Mark as default address book"
+msgstr "ਡਿਫਾਲਟ ਐਡਰੈੱਸ ਬੁੱਕ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../widgets/misc/e-book-source-config.c:103
+#| msgid "A_utocomplete with this address book"
+msgid "Autocomplete with this address book"
+msgstr "ਇਸ ਐਡਰੈੱਸ ਬੁੱਕ ਨਾਲ ਆਟੋ-ਪੂਰਨ"
+
+#: ../widgets/misc/e-book-source-config.c:277
+#| msgid "Copy _book content locally for offline operation"
+msgid "Copy book content locally for offline operation"
+msgstr "ਆਫਲਾਈਨ ਓਪਰੇਸ਼ਨ ਲਈ ਬੁੱਕ ਸਮੱਗਰੀ ਕਾਪੀ ਕਰੋ"
+
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹਣ ਲਈ ਕੰਟਰੋਲ-ਕਲਿੱਕ ਕਰੋ"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:187
+#| msgid "Previous"
+msgid "Previous month"
+msgstr "ਪਿੱਛੇ ਮਹੀਨੇ"
+
+#: ../widgets/misc/e-calendar.c:211
+#| msgctxt "DateFmt"
+#| msgid "Next Mon"
+msgid "Next month"
+msgstr "ਅਗਲੇ ਮਹੀਨੇ"
+
+#: ../widgets/misc/e-calendar.c:233
+#| msgid "Previous"
+msgid "Previous year"
+msgstr "ਪਿੱਛੇ ਸਾਲ"
+
+#: ../widgets/misc/e-calendar.c:254
+#| msgctxt "DateFmt"
+#| msgid "Next Tue"
+msgid "Next year"
+msgstr "ਅਗਲੇ ਸਾਲ"
+
+#: ../widgets/misc/e-calendar.c:278
 msgid "Month Calendar"
 msgstr "ਮਹੀਨਾ ਕੈਲੰਡਰ"
 
+#. This is a strftime() format. %B = Month name.
+#: ../widgets/misc/e-calendar-item.c:1283
+#: ../widgets/misc/e-calendar-item.c:2136
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1285
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1269
+#: ../widgets/misc/e-calendar-item.c:1322
+#| msgid "%B %Y"
+msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
+#: ../widgets/misc/e-cal-source-config.c:170
+#| msgid "Mark as _default calendar"
+msgid "Mark as default calendar"
+msgstr "ਡਿਫਾਲਟ ਕੈਲੰਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../widgets/misc/e-cal-source-config.c:173
+#| msgid "Mark as _default task list"
+msgid "Mark as default task list"
+msgstr "ਡਿਫਾਲਟ ਟਾਸਕ ਲਿਸਟ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../widgets/misc/e-cal-source-config.c:176
+#| msgid "Mark as _default memo list"
+msgid "Mark as default memo list"
+msgstr "ਡਿਫਾਲਟ ਮੀਮੋ ਲਿਸਟ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ"
+
+#: ../widgets/misc/e-cal-source-config.c:201
+#| msgid "Colo_r:"
+msgid "Color:"
+msgstr "ਰੰਗ:"
+
+#: ../widgets/misc/e-cal-source-config.c:406
+#| msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਕਾਪੀ ਕਰੋ"
+
+#: ../widgets/misc/e-cal-source-config.c:410
+#| msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy task list contents locally for offline operation"
+msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ"
+
+#: ../widgets/misc/e-cal-source-config.c:414
+#| msgid "Cop_y memo list contents locally for offline operation"
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ"
+
 #: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ"
@@ -22225,7 +20825,7 @@ msgstr "ਵਰਤਣ ਲਈ ਅੱਖਰ ਦਿਓ"
 msgid "Other..."
 msgstr "ਹੋਰ..."
 
-#: ../widgets/misc/e-contact-map-window.c:355
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "ਸੰਪਰਕ ਨਕਸ਼ਾ"
 
@@ -22261,16 +20861,16 @@ msgstr "ਕੋਈ ਨਹੀਂ(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../widgets/misc/e-dateedit.c:1824
 msgid "Invalid Date Value"
 msgstr "ਗਲਤ ਤਾਰੀਖ ਮੁੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../widgets/misc/e-dateedit.c:1868
 msgid "Invalid Time Value"
 msgstr "ਗਲਤ ਸਮਾਂ ਮੁੱਲ"
 
@@ -22376,6 +20976,62 @@ msgstr "ਫਾਇਲ ਚੁਣੋ"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਫਾਇਲ ਇੰਪੋਰਟ ਕਰਨ ਲਈ \"ਲਾਗੂ ਕਰੋ\" ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ।"
 
+#: ../widgets/misc/e-mail-signature-combo-box.c:327
+msgid "Autogenerated"
+msgstr "ਸਵੈ-ਨਿਰਮਤ"
+
+#: ../widgets/misc/e-mail-signature-editor.c:287
+#| msgid "_Close"
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_S)"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "ਦਸਤਖਤ ਸੋਧ"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "ਦਸਤਖਤ ਨਾਂ(_S):"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "ਬੇ-ਨਾਂ"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "ਸਕ੍ਰਿਪਟ ਜੋੜੋ(_S)"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "ਦਸਤਖਤੀ ਸਕ੍ਰਿਪਟ ਸ਼ਾਮਿਲ"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ ਸੋਧ"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ ਵਿੱਚ ਵਰਤੀ\n"
+"ਜਾਵੇਗੀ। ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ ਵੇਖਾਉਣ ਦੇ ਕੰਮ\n"
+" ਆਵੇਗਾ।"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "ਸਕ੍ਰਿਪਟ(_c):"
+
+#  mail:signature-notscript secondary
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨਕਸ਼ਾ"
@@ -22406,48 +21062,49 @@ msgid "Evolution Preferences"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਸੰਦ"
 
 #  message-search popup match count string
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "ਮਿਲਦਾ: %d"
+#| msgid "Matches: %d"
+msgid "Matches: %u"
+msgstr "ਮਿਲਦੇ: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "ਇਹ ਪੱਟੀ ਬੰਦ ਕਰੋ"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "ਖੋਜ(_d):"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "ਪਿੱਛੇ(_P)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦੀ ਪਿਛਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦੇ ਸਭ(_c)"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "ਪੇਜ਼ ਦੇ ਅੰਤ ਉੱਤੇ ਪੁੱਜੇ, ਉੱਤੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "ਪੇਜ਼ ਦੇ ਉੱਤੇ ਪੁੱਜੇ, ਹੇਠਾਂ ਤੋਂ ਫੇਰ ਜਾਰੀ"
 
@@ -22586,107 +21243,148 @@ msgstr "ਜਵਾਬੀ ਸੂਚਨਾ"
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ਖੋਜ(_t)"
 
-#: ../widgets/misc/e-signature-editor.c:142
-#: ../widgets/misc/e-signature-editor.c:567
-#: ../widgets/misc/e-signature-manager.c:376
-#: ../widgets/misc/e-signature-script-dialog.c:223
-msgid "Unnamed"
-msgstr "ਬੇ-ਨਾਂ"
-
-#: ../widgets/misc/e-signature-editor.c:218
-msgid "_Save and Close"
-msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_S)"
-
-#: ../widgets/misc/e-signature-editor.c:434
-msgid "Edit Signature"
-msgstr "ਦਸਤਖਤ ਸੋਧ"
-
-#: ../widgets/misc/e-signature-editor.c:449
-msgid "_Signature Name:"
-msgstr "ਦਸਤਖਤ ਨਾਂ(_S):"
-
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "ਦਸਤਖਤੀ ਸਕ੍ਰਿਪਟ ਸ਼ਾਮਿਲ"
-
-#: ../widgets/misc/e-signature-manager.c:386
-msgid "Edit Signature Script"
-msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ ਸੋਧ"
-
-#: ../widgets/misc/e-signature-manager.c:605
-msgid "Add _Script"
-msgstr "ਸਕ੍ਰਿਪਟ ਜੋੜੋ(_S)"
+#: ../widgets/misc/e-source-config.c:671 ../widgets/misc/e-source-config.c:675
+msgid "Type:"
+msgstr "ਕਿਸਮ:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ ਵਿੱਚ ਵਰਤੀ\n"
-"ਜਾਵੇਗੀ। ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ ਵੇਖਾਉਣ ਦੇ ਕੰਮ\n"
-" ਆਵੇਗਾ।"
+#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
+msgid "Name:"
+msgstr "ਨਾਂ:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "ਸਕ੍ਰਿਪਟ(_c):"
-
-#  mail:signature-notscript secondary
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../widgets/misc/e-source-config.c:1285
+#| msgid "Refresh the folder"
+msgid "Refresh every"
+msgstr "ਤਾਜ਼ਾ ਕਰੋ ਹਰੇਕ"
+
+#: ../widgets/misc/e-source-config.c:1315
+#: ../widgets/misc/e-source-config.c:1343
+#| msgid "Use _secure connection"
+msgid "Use a secure connection"
+msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ"
+
+#: ../widgets/misc/e-source-config.c:1357
+#| msgid "Imported Certificate"
+msgid "Ignore invalid SSL certificate"
+msgstr "ਗਲਤ SSL ਸਰਟੀਫਿਕੇਟ ਅਣਡਿੱਠਾ"
+
+#: ../widgets/misc/e-source-config.c:1394
+msgid "User"
+msgstr "ਯੂਜ਼ਰ"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../widgets/misc/e-spell-entry.c:351
+#| msgid "(no subject)"
+msgid "(no suggestions)"
+msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
+
+#: ../widgets/misc/e-spell-entry.c:375
+#| msgid "_Move..."
+msgid "More..."
+msgstr "...ਹੋਰ"
+
+#. + Add to Dictionary
+#: ../widgets/misc/e-spell-entry.c:444
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "\"%s\" ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
+
+#. - Ignore All
+#: ../widgets/misc/e-spell-entry.c:487
+#| msgid "Ignore"
+msgid "Ignore All"
+msgstr "ਸਭ ਅਣਡਿੱਠੇ"
+
+#: ../widgets/misc/e-spell-entry.c:513
+msgid "Spelling Suggestions"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਸੁਝਾਅ"
 
 #: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "URL ਉੱਤੇ ਜਾਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "ਲਿੰਕ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰਕ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
 msgstr "ਲਿੰਕ ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰਕ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "ਚਿੱਤਰ ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "Copy the image to the clipboard"
 msgstr "ਚਿੱਤਰ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1435
+#: ../widgets/misc/e-web-view-gtkhtml.c:466
+#: ../widgets/misc/e-web-view-gtkhtml.c:1311
 msgid "Select all text and images"
 msgstr "ਸਭ ਟੈਕਸਟ ਅਤੇ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
+#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view-gtkhtml.c:977
+#: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "ਐਡਰੈੱਸ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../widgets/misc/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "ਖਾਲੀ ਦਸਤਖਤ"
+
+#: ../widgets/misc/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ ਜੀ।"
+
+#: ../widgets/misc/widgets.error.xml.h:6
+#| msgid "Could not save signature file."
+msgid "Could not load signature."
+msgstr "ਦਸਤਖਤ ਲੋਡ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ।"
+
+#: ../widgets/misc/widgets.error.xml.h:7
+#| msgid "Could not save signature file."
+msgid "Could not save signature."
+msgstr "ਦਸਤਖਤ ਸੰਭਾਲੇ ਨਹੀਂ ਜਾ ਸਕੇ।"
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "ਪੋਪਅੱਪ ਲਿਸਟ"
@@ -22715,7 +21413,7 @@ msgstr "ਸਮੇਂ ਦਾ ਫਾਰਮੈਟ ਇੰਝ ਦਾ ਹੋਣਾ ਲ
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਖਾਸ ਤੌਰ ਤੇ ੦ ਤੇ ੧੦੦ ਦੇ ਦਰਮਿਆਨ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../widgets/table/e-table-click-to-add.c:610
+#: ../widgets/table/e-table-click-to-add.c:609
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
@@ -22828,7 +21526,7 @@ msgstr "ਇੰਞ ਗਰੁੱਪ(_G)..."
 msgid "_Fields Shown..."
 msgstr "ਵੇਖਾਏ ਖੇਤਰ(_F)..."
 
-#: ../widgets/table/e-table-field-chooser.c:153
+#: ../widgets/table/e-table-field-chooser.c:152
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22847,7 +21545,7 @@ msgstr "ਕਾਲਮ ਸ਼ਾਮਲ"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:361
+#: ../widgets/table/e-table-group-container.c:360
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22860,7 +21558,7 @@ msgstr[1] "%s: %s (%d ਆਈਟਮਾਂ)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:373
+#: ../widgets/table/e-table-group-container.c:372
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22956,14 +21654,1650 @@ msgstr "ਦਬਾਓ"
 msgid "sort"
 msgstr "ਲੜੀਬੱਧ"
 
-#: ../widgets/text/e-text.c:2338
+#: ../widgets/text/e-text.c:2074
 msgid "Select All"
 msgstr "ਸਭ ਚੁਣੋ"
 
-#: ../widgets/text/e-text.c:2351
+#: ../widgets/text/e-text.c:2087
 msgid "Input Methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
+#~ msgid "Some features may not work properly with your current server"
+#~ msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ"
+
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results the server should be upgraded "
+#~ "to a supported version"
+#~ msgstr ""
+#~ "ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਨਾਲ "
+#~ "ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
+
+#~ msgid "GroupWise Address book creation:"
+#~ msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਐਡਰੈੱਸ-ਬੁੱਕ ਨਿਰਮਾਣ:"
+
+#~ msgid ""
+#~ "Currently you can only access the GroupWise System Address Book from "
+#~ "Evolution. Please use some other GroupWise mail client once to get your "
+#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+#~ msgstr ""
+#~ "ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰੁੱਪਵਾਇਜ਼ ਸਿਸਟਮ ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ "
+#~ "ਕਰਕੇ ਕੋਈ ਹੋਰ ਗਰੁੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਗਰੁੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ "
+#~ "ਅਤੇ ਗਰੁੱਪਵਾਇਜ਼ ਨਿੱਜੀ ਸੰਪਰਕ ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋ।"
+
+#~ msgid "Couldn't get list of address books: %s"
+#~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਸੂਚੀ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s"
+
+#~ msgid "Some features may not work properly with your current server."
+#~ msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"
+
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results, the server should be upgraded "
+#~ "to a supported version."
+#~ msgstr ""
+#~ "ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ "
+#~ "ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ "
+#~ "ਚਾਹੀਦਾ ਹੈ।"
+
+#~ msgid "_Type:"
+#~ msgstr "ਕਿਸਮ(_T):"
+
+#~ msgid "Sh_ow reminder notifications"
+#~ msgstr "ਰੀਮਾਈਡਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ(_o)"
+
+#~ msgid "You are acting on behalf of %s"
+#~ msgstr "ਤੁਸੀਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਕੰਮ ਕਰ ਰਹੇ ਹੋ"
+
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "ਵਿਚੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਸਾਕਟ ਦਾ ID"
+
+#~ msgid "socket"
+#~ msgstr "ਸਾਕਟ"
+
+#~ msgid "Please enter your full name."
+#~ msgstr "ਆਪਣਾ ਪੂਰਾ ਨਾਂ ਦਿਓ।"
+
+#~ msgid "Please enter your email address."
+#~ msgstr "ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
+
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਈਮੇਲ ਐਡਰੈੱਸ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Please enter your password."
+#~ msgstr "ਆਪਣਾ ਪਾਸਵਰਡ ਦਿਓ ਜੀ।"
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Google"
+#~ msgstr "ਗੂਗਲ"
+
+#~| msgid "Always"
+#~ msgid "Always (SSL)"
+#~ msgstr "ਹਮੇਸ਼ਾ (SSL)"
+
+#~| msgid "Whenever Possible"
+#~ msgid "When possible (TLS)"
+#~ msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ (TLS)"
+
+#~ msgid "Personal details:"
+#~ msgstr "ਨਿੱਜੀ ਵੇਰਵਾ:"
+
+#~ msgid "Email address:"
+#~ msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ:"
+
+#~ msgid "Details:"
+#~ msgstr "ਵੇਰਵਾ:"
+
+#~ msgid "Server type:"
+#~ msgstr "ਸਰਵਰ ਕਿਸਮ:"
+
+#~ msgid "Server address:"
+#~ msgstr "ਸਰਵਰ ਐਡਰੈੱਸ:"
+
+#~ msgid "Use encryption:"
+#~ msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ:"
+
+#~ msgid ""
+#~ "To use the email application you'll need to setup an account. Put your "
+#~ "email address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+#~ msgstr ""
+#~ "ਈਮੇਲ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਤੁਹਾਨੂੰ ਅਕਾਊਂਟ ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਅਤੇ "
+#~ "ਪਾਸਵਰਡ ਹੇਠਾਂ ਭਰੋ ਅਟੇ ਅਸੀਂ ਸਭ ਸੈਟਿੰਗ ਆਪਣੇ ਆਪ ਲੈਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਾਂਗੇ। ਜੇ ਅਸੀਂ ਇਹ ਸਭ ਕੁਝ "
+#~ "ਆਟੋਮੈਟਿਕ ਨਾ ਕਰ ਸਕੇ ਤਾਂ ਤੁਹਾਨੂੰ ਆਪਣੇ ਸਰਵਰ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੀ ਦੇਣੀ ਪਵੇਗੀ।"
+
+#~ msgid ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+#~ msgstr ""
+#~ "ਅਫਸੋਸ, ਅਸੀਂ ਤੁਹਾਡੀ ਮੇਲ ਲਈ ਆਟੋਮੈਟਿਕ ਸੈਟਿੰਗ ਨਹੀਂ ਲੈ ਸਕੇ। ਇਹ ਹੇਠਾਂ ਦਰਜ ਕਰੋ ਜੀ। ਅਸੀਂ ਤੁਹਾਡੇ ਵਲੋਂ "
+#~ "ਦਿੱਤੀ ਗਈ ਜਾਣਕਾਰੀ ਮੁਤਾਬਕ ਪੂਰਾ ਵੇਰਵਾ ਲੈਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਤਾਂ ਕੀਤੀ ਹੈ, ਪਰ ਤੁਹਾਨੂੰ ਉਹਨਾਂ ਨੂੰ ਬਦਲਣਾ "
+#~ "ਵੀ ਪੈ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "You can specify more options to configure the account."
+#~ msgstr "ਤੁਸੀਂ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਲਈ ਹੋਰ ਚੋਣਾਂ ਦੇ ਸਕਦੇ ਹੋ।"
+
+#~ msgid ""
+#~ "Now we need your settings for sending mail. We've tried to make some "
+#~ "guesses but you should check them over to make sure."
+#~ msgstr ""
+#~ "ਹੁਣ ਤੁਹਾਨੂੰ ਮੇਲ ਭੇਜਣ ਲਈ ਸੈਟਿੰਗ ਦੇਣ ਦੀ ਲੋੜ ਹੈ। ਅਸੀਂ ਕੁਝ ਅੰਦਾਜ਼ਾ ਲਗਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਚੁੱਕੇ ਹਾਂ, "
+#~ "ਪਰ ਤੁਹਾਨੂੰ ਇਹ ਚੈੱਕ ਕਰ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਕਿ ਉਹ ਠੀਕ ਹਨ।"
+
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "ਤੁਸੀਂ ਆਪਣੇ ਅਕਾਊਂਟ ਲਈ ਆਪਣੀ ਡਿਫਾਲਟ ਸੈਟਿੰਗ ਦੇ ਸਕਦੇ ਹੋ।"
+
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr ""
+#~ "ਸਮਾਂ ਹੈ ਚੈੱਕ ਕਰਨ ਦਾ, ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਿ ਅਸੀਂ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੀਏ ਅਤੇ "
+#~ "ਤੁਹਾਡੀਆਂ ਮੇਲਾਂ ਲੈਣੀਆਂ ਸ਼ੁਰੂ ਕਰੀਏ।"
+
+#~ msgid "Next - Receiving mail"
+#~ msgstr "ਅੱਗੇ - ਈਮੇਲ ਲੈਣੀਆਂ"
+
+#~ msgid "Receiving mail"
+#~ msgstr "ਈਮੇਲ ਲੈਣੀਆਂ"
+
+#~ msgid "Next - Sending mail"
+#~ msgstr "ਅੱਗੇ - ਈਮੇਲ ਭੇਜਣੀਆਂ"
+
+#~ msgid "Back - Identity"
+#~ msgstr "ਪਿੱਛੇ - ਪਛਾਣ"
+
+#~ msgid "Next - Receiving options"
+#~ msgstr "ਅੱਗੇ - ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
+
+#~ msgid "Receiving options"
+#~ msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
+
+#~ msgid "Back - Receiving mail"
+#~ msgstr "ਪਿੱਛੇ - ਮੇਲ ਲੈਣੀਆਂ"
+
+#~ msgid "Sending mail"
+#~ msgstr "ਮੇਲ ਭੇਜਣੀਆਂ"
+
+#~ msgid "Next - Review account"
+#~ msgstr "ਅੱਗੇ - ਅਕਾਊਂਟ ਪੜਤਾਲ"
+
+#~ msgid "Next - Defaults"
+#~ msgstr "ਅੱਗੇ - ਡਿਫਾਲਟ"
+
+#~ msgid "Back - Receiving options"
+#~ msgstr "ਪਿੱਛੇ - ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
+
+#~ msgid "Back - Sending mail"
+#~ msgstr "ਪਿੱਛੇ - ਮੇਲ ਭੇਜਣੀਆਂ"
+
+#~ msgid "Review account"
+#~ msgstr "ਅਕਾਊਂਟ ਪੜਤਾਲ"
+
+#~ msgid "Finish"
+#~ msgstr "ਮੁਕੰਮਲ"
+
+#~ msgid "Back - Sending"
+#~ msgstr "ਪਿੱਛੇ - ਭੇਜਣਾ"
+
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ ਸੰਪਰਕ ਸੈਟਅੱਪ"
+
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
+
+#~ msgid "Google account settings:"
+#~ msgstr "ਗੂਗਲ ਅਕਾਊਂਟ ਸੈਟਿੰਗ:"
+
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਯਾਹੂ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
+
+#~ msgid ""
+#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. So please confirm and re-enter the calendar name if it "
+#~ "is not correct."
+#~ msgstr ""
+#~ "ਯਾਹੂ ਕੈਲੰਡਰ ਪਹਿਲਾਂ ਨਾਂ_ਆਖਰੀ ਨਾਂ ਰਾਹੀਂ ਰੱਖਦੇ ਹਨ। ਅਸੀਂ ਕੈਲੰਡਰ ਨਾਂ ਬਣਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਹੈ। "
+#~ "ਇਸਕਰਕੇ ਕੈਲੰਡਰ ਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ, ਜੇ ਠੀਕ ਨਾ ਹੋਵੇ ਤਾਂ ਕੈਲੰਡਰ ਨਾਂ ਫੇਰ ਲਿਖੋ।"
+
+#~ msgid "Yahoo account settings:"
+#~ msgstr "ਯਾਹੂ ਅਕਾਊਂਟ ਸੈਟਿੰਗ:"
+
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "ਯਾਹੂ ਕੈਲੰਡਰ ਨਾਂ:"
+
+#~ msgid "Password:"
+#~ msgstr "ਪਾਸਵਰਡ:"
+
+#~ msgid "Close Tab"
+#~ msgstr "ਟੈਬ ਬੰਦ ਕਰੋ"
+
+#~ msgid "Account Wizard"
+#~ msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ"
+
+#~ msgid "Evolution account assistant"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
+
+#~ msgid "On This Computer"
+#~ msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
+
+#~ msgid "Modify %s..."
+#~ msgstr "%s ਸੋਧ..."
+
+#~ msgid "Add a new account"
+#~ msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
+
+#~ msgid "Account management"
+#~ msgstr "ਅਕਾਊਂਟ ਪਰਬੰਧ"
+
+#~ msgid "Settings"
+#~ msgstr "ਸੈਟਿੰਗ"
+
+#~ msgid "Undo the last action"
+#~ msgstr "ਪਿਛਲੀ ਕਾਰਵਾਈ ਵਾਪਸ ਲਵੋ"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "ਆਖਰੀ ਵਾਪਸ ਕੀਤੀ ਕਾਰਵਾਈ ਨੂੰ ਮੁੜ-ਕਰੋ"
+
+#~ msgid "Search for text"
+#~ msgstr "ਟੈਕਸਟ ਖੋਜੋ"
+
+#~ msgid "Search for and replace text"
+#~ msgstr "ਟੈਕਸਟ ਦੀ ਖੋਜ ਕਰੋ ਅਤੇ ਬਦਲੋ"
+
+#~| msgid "Delete the selected calendar"
+#~ msgid "List of selected calendars"
+#~ msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਦੀ ਸੂਚੀ"
+
+#~| msgid "List of available calendars:"
+#~ msgid "List of calendars to load"
+#~ msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ ਦੀ ਸੂਚੀ"
+
+#~| msgid "Delete the selected memo list"
+#~ msgid "List of selected memo lists"
+#~ msgstr "ਚੁਣੇ ਮੀਮੋ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
+
+#~| msgid "The registry of memo lists"
+#~ msgid "List of memo lists to load"
+#~ msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੇ ਮੀਮੋ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
+
+#~| msgid "Delete the selected task list"
+#~ msgid "List of selected task lists"
+#~ msgstr "ਚੁਣੀਆਂ ਟਾਸਕ ਦੀ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
+
+#~| msgid "The registry of task lists"
+#~ msgid "List of task lists to load"
+#~ msgstr "ਲੋਡ ਕਰਨ ਲਈ ਚੁਣੀ ਟਾਸਕ ਸੂਚੀਆਂ ਦੀ ਸੂਚੀ"
+
+#~ msgid "Configuration version"
+#~ msgstr "ਸੰਰਚਨਾ ਵਰਜਨ"
+
+#~ msgid ""
+#~ "The configuration version of Evolution, with major/minor/configuration "
+#~ "level (for example \"2.6.0\")."
+#~ msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+
+#~ msgid "Last upgraded configuration version"
+#~ msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
+
+#~ msgid ""
+#~ "The last upgraded configuration version of Evolution, with major/minor/"
+#~ "configuration level (for example \"2.6.0\")."
+#~ msgstr ""
+#~ "ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ "
+#~ "\"2.6.0\")"
+
+#~| msgid "All local folders"
+#~ msgid "Enable local folders"
+#~ msgstr "ਲੋਕਲ ਫੋਲਡਰ ਚਾਲੂ"
+
+#~ msgid "Enable search folders on startup."
+#~ msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ।"
+
+#~ msgid "Display only message texts not exceeding certain size"
+#~ msgstr "ਕੇਵਲ ਉਹੀ ਟੈਕਸਟ ਸੁਨੇਹੇ ਵੇਖੋ, ਜੋ ਕਿ ਕੁਝ ਆਕਾਰ ਤੋਂ ਵੱਧ ਨਹੀਂ ਹਨ"
+
+#~ msgid ""
+#~ "Enable to display only message texts not exceeding size defined in "
+#~ "'message_text_part_limit' key."
+#~ msgstr ""
+#~ "ਕੇਵਲ ਉਹੀ ਸੁਨੇਹੇ ਵੇਖਾਉਣ ਲਈ ਯੋਗ ਕਰਦਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਦੀ ਲਿਮਟ 'message_text_part_limit' "
+#~ "ਕੁੰਜੀ 'ਚ ਸੈੱਟ ਕੀਤੇ ਤੋਂ ਵੱਧ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Message text limit for display"
+#~ msgstr "ਵੇਖਾਉਣ ਲਈ ਸੁਨੇਹਾ ਟੈਕਸਟ ਲਿਮਟ"
+
+#~ msgid ""
+#~ "This decides the max size of the message text that will be displayed "
+#~ "under Evolution, specified in terms of KB. The default is 4096 (4MB). "
+#~ "This value is used only when 'force_message_limit' key is activated."
+#~ msgstr ""
+#~ "ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ "
+#~ "ਸਕਦਾ ਹੈ। ਡਿਫਾਲਟ 4 (੪) MB / ੪੦੯੬ KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇਹ ਮੁੱਲ "
+#~ "ਤਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ, ਜਦੋਂ 'force_message_limit' ਕੁੰਜੀ ਐਕਟੀਵੇਟ ਹੈ।"
+
+#~ msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+#~ msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਸ਼ੈਲੀ (\"normal\", \"full headers\", \"source\")"
+
+#~ msgid "Play sound when new messages arrive."
+#~ msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ।"
+
+#~ msgid ""
+#~ "If \"true\", then beep, otherwise will play sound file when new messages "
+#~ "arrive."
+#~ msgstr "ਜੇ \"ਸਹੀਂ\" ਕੀਤਾ ਤਾਂ ਨਵੇਂ ਸੁਨੇਹੇ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਜਾਂ ਬੀਪ ਚਲਾਈ ਜਾਵੇ।"
+
+#~| msgid "FILE"
+#~ msgid "FIXME"
+#~ msgstr "FIXME"
+
+#~ msgid "Could not parse S/MIME message: Unknown error"
+#~ msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#~ msgid "Could not parse PGP/MIME message: Unknown error"
+#~ msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#~ msgid "Unknown error verifying signature"
+#~ msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#~ msgid "If all conditions are met"
+#~ msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
+
+#~ msgid "If any conditions are met"
+#~ msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
+
+#~ msgid "Enter Passphrase for %s"
+#~ msgstr "%s ਲਈ ਭੇਦ ਲਿਖੋ"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "ਭੇਦ ਲਿਖੋ"
+
+#~ msgid "Enter Password for %s"
+#~ msgstr "%s ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
+
+#~ msgid "Enter Password"
+#~ msgstr "ਪਾਸਵਰਡ ਭਰੋ"
+
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "ਅਕਾਊਂਟ '%s' ਲਈ ਟਰਾਂਸਪੋਰਟ ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "ਫੋਲਡਰ '%s' ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ"
+
+#~ msgid "Refreshing folder '%s'"
+#~ msgstr "'%s' ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Expunging folder '%s'"
+#~ msgstr "'%s' ਨਿਕਾਲਾ ਫੋਲਡਰ"
+
+#~ msgid "Disconnecting %s"
+#~ msgstr "%s ਨਾਲੋਂ ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
+
+#~ msgid "Create R_ule"
+#~ msgstr "ਨਿਯਮ ਬਣਾਓ(_u)"
+
+#~ msgctxt "mail-signature"
+#~ msgid "None"
+#~ msgstr "ਕੋਈ ਨਹੀਂ"
+
+#~ msgid "Fil_e:"
+#~ msgstr "ਫਾਇਲ(_e):"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ਮੇਲ ਸੰਰਚਨਾ"
+
+#~ msgid "Please configure the following account settings."
+#~ msgstr "ਹੇਠ ਦਿੱਤੀ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰੋ ਜੀ।"
+
+#~ msgid ""
+#~ "Please enter information about the way you will send mail. If you are not "
+#~ "sure, ask your system administrator or Internet Service Provider."
+#~ msgstr ""
+#~ "ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਯਕੀਨੀ ਨਹੀਂ "
+#~ "ਹੋ ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਸਰਵਿਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+
+#~ msgid "minu_tes"
+#~ msgstr "ਮਿੰਟ(_t)"
+
+#~ msgid "Checking for New Messages"
+#~ msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~| msgid "Setup Google contacts with Evolution"
+#~ msgid "Setup Google con_tacts with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ _ਸੰਪਰਕ ਸੈਟਅੱਪ"
+
+#~| msgid "Setup Google calendar with Evolution"
+#~ msgid "Setup Google ca_lendar with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ ਗੂਗਲ _ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
+
+#~| msgid "Setup Yahoo calendar with Evolution"
+#~ msgid "Setup _Yahoo calendar with Evolution"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਨਾਲ _ਯਾਹੂ ਕੈਲੰਡਰ ਸੈਟਅੱਪ"
+
+#~| msgid "Yahoo Calendar name:"
+#~ msgid "Yahoo Calen_dar name:"
+#~ msgstr "ਯਾਹੂ ਕੈਲੰ_ਡਰ ਨਾਂ:"
+
+#~ msgid "Formatting Message..."
+#~ msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "Retrieving '%s'"
+#~ msgstr "'%s' ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Unknown external-body part."
+#~ msgstr "ਅਣਜਾਣ ਬਾਹਰੀ-ਮੁੱਖ ਭਾਗ।"
+
+#~ msgid ""
+#~ "Evolution cannot render this email as it is too large to process. You can "
+#~ "view it unformatted or with an external text editor."
+#~ msgstr ""
+#~ "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ "
+#~ "ਵੇਖ ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਐਡੀਟਰ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Completed on"
+#~ msgstr "ਸਮਾਪਤ "
+
+#~ msgid "Overdue:"
+#~ msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
+
+#~ msgid "by"
+#~ msgstr "ਨੂੰ"
+
+#~ msgid "View _Unformatted"
+#~ msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
+
+#~ msgid "Hide _Unformatted"
+#~ msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਓਹਲੇ(_U)"
+
+#~ msgid "O_pen With"
+#~ msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(_p)"
+
+#~| msgid "Attachment"
+#~| msgid_plural "Attachments"
+#~ msgctxt "Button"
+#~ msgid "Attachment"
+#~ msgstr "ਅਟੈਚਮੈਂਟ"
+
+#~ msgid "No HTML stream available"
+#~ msgstr "ਕੋਈ HTML ਸਟਰੀਮ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+#~ msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#~ msgstr ""
+#~ "ਜਦੋਂ ਅਸਲੀ ਸੁਨੇਹੇ ਨੂੰ ਸਾਇਨ ਕੀਤਾ ਹੋਵੇ (PGP ਜਾਂ S/MIME) ਤਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਜ਼ਿਟਲ ਰੂਪ ਵਿੱਚ ਸਾਇਨ "
+#~ "ਕਰੋ"
+
+#~ msgid "Composer Window default width"
+#~ msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਚੌੜਾਈ"
+
+#~ msgid "Default width of the Composer Window."
+#~ msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
+
+#~ msgid "Composer Window default height"
+#~ msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਮੂਲ ਉਚਾਈ"
+
+#~ msgid "Default height of the Composer Window."
+#~ msgstr "ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ"
+
+#~ msgid "Attribute message."
+#~ msgstr "ਗੁਣ ਸੁਨੇਹਾ ਹੈ।"
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message, attributing the "
+#~ "message to the original author."
+#~ msgstr ""
+#~ "ਟੈਕਸਟ, ਜੋ ਕਿ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ, ਜਦੋਂ ਸੁਨੇਹੇ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਜਿਸ 'ਚ ਅਸਲੀ ਲੇਖਕ "
+#~ "ਲਈ ਸੁਨੇਹਾ ਹੈ।"
+
+#~ msgid "Forward message."
+#~ msgstr "ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜੋ।"
+
+#~ msgid ""
+#~ "The text that is inserted when forwarding a message, saying that the "
+#~ "forwarded message follows."
+#~ msgstr ""
+#~ "ਟੈਸਕਟ, ਜੋ ਕਿ ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ ਹੈ, ਦਰਸਾਉਂਦਾ ਹੈ ਕਿ ਅੱਗੇ ਭੇਜਿਆ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ।"
+
+#~ msgid "Original message."
+#~ msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਹੈ।"
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message (top posting), "
+#~ "saying that the original message follows."
+#~ msgstr ""
+#~ "ਟੈਕਸਟ, ਜੋ ਕਿ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ, ਜਦੋਂ ਸੁਨੇਹੇ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਉੱਤੇ ਲਿਖਣਾ), ਜਿਸ 'ਚ "
+#~ "ਲਿਖਿਆ ਹੈ ਕਿ ਅਸਲੀ ਸੁਨੇਹਾ ਹੇਠਾਂ ਹੈ।"
+
+#~ 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."
+#~ msgstr ""
+#~ "ਇਹ ਮੁੱਲ ਖਾਲੀ ਲਾਈਨ ਹੋ ਸਕਦੀ ਹੈ, ਜਿਸ ਦਾ ਮਤਲਬ ਕੈ ਸਿਸਟਮ ਤਸਵੀਰ ਫੋਲਡਰ, ਜੋ ਕਿ ਅਕਸਰ ~/"
+#~ "Pictures (~/ਤਸਵੀਰਾਂ) ਸੈਟ ਹੁੰਦਾ ਹੈ। ਇਹ ਫੋਲਡਰ ਨੂੰ ਤਾਂ ਵੀ ਵਰਤਿਆ ਜਾਵੇਗਾ, ਜਦੋਂ ਪਾਥ ਨਾ-ਮੌਜੂਦ "
+#~ "ਫੋਲਡਰ ਲਈ ਪੁਆਇੰਟ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
+
+#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
+#~ msgstr "ਕੀ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਲੋਕਲ ਫੋਲਡਰ ਵੇਖਾਉਣਾ (ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ) ਹੈ।"
+
+#~ msgid ""
+#~ "This setting specifies whether the threads should be in expanded or "
+#~ "collapsed state by default. Requires a restart to apply."
+#~ msgstr ""
+#~ "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ (ਮਾਮਲਾ) ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। "
+#~ "ਲਾਗੂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded \"1\" = collapsed"
+#~ msgstr ""
+#~ "ਦਰਸਾਉਂਦਾ ਹੈ ਕਿ ਕੀ ਸੁਨੇਹਾ ਹੈੱਡਰ ਨੂੰ ਪੈਨ ਝਲਕ ਵਿੱਚ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਸਮੇਟਿਆ ਹੋਵੇ ਜਾਂ ਫੈਲਾਇਆ। "
+#~ "\"0\" = ਫੈਲਾਇਆ \"1\" = ਸਮੇਟਿਆ"
+
+#~ msgid ""
+#~ "Tells how to sort accounts in a folder tree used in a Mail view. When set "
+#~ "to true accounts are sorted alphabetically, with an exception of On This "
+#~ "Computer and Search folders, otherwise accounts are sorted based on an "
+#~ "order given by a user."
+#~ msgstr ""
+#~ "ਮੇਲ ਝਲਕ ਵਿੱਚ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਅਕਾਊਂਟ ਨੂੰ ਕਿਵੇਂ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ ਦੱਸੋ। ਜਦੋਂ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ "
+#~ "ਅਕਾਊਂਟ ਨੂੰ ਵਰਤਣਮਾਲਾ ਦੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ, ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਅਤੇ ਖੋਜ ਫੋਲਡਰ ਨੂੰ ਛੱਡ "
+#~ "ਕੇ, ਨਹੀਂ ਤਾਂ ਅਕਾਊਂਟ ਨੂੰ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤੇ ਢੰਗ ਨਾਲ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇਗਾ।"
+
+#~ msgid "Mail browser width"
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਚੌੜਾਈ"
+
+#~ msgid "Default width of the mail browser window."
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਚੌੜਾਈ ਹੈ।"
+
+#~ msgid "Mail browser height"
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਉਚਾਈ"
+
+#~ msgid "Default height of the mail browser window."
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ।"
+
+#~ msgid "Mail browser maximized"
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵੱਧੋ-ਵੱਧ"
+
+#~ msgid "Default maximized state of the mail browser window."
+#~ msgstr "ਮੇਲ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ।"
+
+#~ msgid "\"Folder Subscriptions\" window height"
+#~ msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਉਚਾਈ"
+
+#~ msgid ""
+#~ "Initial height of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
+#~ "ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "\"Folder Subscriptions\" window maximize state"
+#~ msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Folder Subscriptions\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Folder Subscriptions"
+#~ "\" window cannot be maximized. This key exists only as an implementation "
+#~ "detail."
+#~ msgstr ""
+#~ "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ "
+#~ "ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ "
+#~ "ਜਾਂਦਾ, ਜਦੋਂ \"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+
+#~ msgid "\"Folder Subscriptions\" window width"
+#~ msgstr "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਚੌੜਾਈ"
+
+#~ msgid ""
+#~ "Initial width of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "\"ਫੋਲਡਰ ਮੈਂਬਰੀ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ ਤਾਂ "
+#~ "ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "Default reply style"
+#~ msgstr "ਡਿਫਾਲਟ ਜਵਾਬ ਸਟਾਇਲ"
+
+#~ msgid ""
+#~ "Possible values are: never - to never close browser window always - to "
+#~ "always close browser window ask - (or any other value) will ask user"
+#~ msgstr ""
+#~ "ਸੰਭ ਮੁੱਲ ਹਨ: never (ਕਦੇ ਨਹੀਂ) - ਹਮੇਸ਼ਾ ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਕਦੇ ਨਾ ਬੰਦ ਕਰਨ ਲਈ, always (ਹਮੇਸ਼ਾ) "
+#~ "- ਬਰਾਊਜ਼ਰ ਵਿੰਡੋ ਹਮੇਸ਼ਾ ਬੰਦ ਕਰਨ ਲਈ, ask (ਪੁੱਛੋ)  - (ਜਾਂ ਕੋਈ ਮੁੱਲ) ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ"
+
+#~ msgid "List of accounts"
+#~ msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
+
+#~ msgid ""
+#~ "List of accounts known to the mail component of Evolution. The list "
+#~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
+#~ "accounts."
+#~ msgstr ""
+#~ "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਸੂਚੀ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /"
+#~ "apps/evolution/mail/accounts ਦੇ ਅਨੁਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
+
+#~ msgid "List of accepted licenses"
+#~ msgstr "ਮਨਜ਼ੂਰ ਲਾਈਸੈਂਸਾਂ ਦੀ ਲਿਸਟ"
+
+#~ msgid "List of protocol names whose license has been accepted."
+#~ msgstr "ਪਰੋਟੋਕੋਲਾਂ ਨਾਂ ਦੀ ਲਿਸਟ, ਜਿਹਨਾਂ ਦਾ ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+#~ msgid "\"Filter Editor\" window height"
+#~ msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਉਚਾਈ"
+
+#~ msgid ""
+#~ "Initial height of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window vertically."
+#~ msgstr ""
+#~ "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "\"Filter Editor\" window maximize state"
+#~ msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#~ "when the user maximizes or unmaximizes the window. Note, this particular "
+#~ "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#~ "be maximized. This key exists only as an implementation detail."
+#~ msgstr ""
+#~ "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ "
+#~ "ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ "
+#~ "ਜਾਂਦਾ, ਜਦੋਂ \"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ ਮੌਜੂਦ "
+#~ "ਹੈ।"
+
+#~ msgid "\"Filter Editor\" window width"
+#~ msgstr "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਚੌੜਾਈ"
+
+#~ msgid ""
+#~ "Initial width of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window horizontally."
+#~ msgstr ""
+#~ "\"ਫਿਲਟਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid ""
+#~ "Whether check for new messages when Evolution is started. This includes "
+#~ "also sending messages from Outbox."
+#~ msgstr ""
+#~ "ਕੀ ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਨਵੇਂ ਸੁਨੇਹੇ ਖੋਜਣੇ ਹਨ। ਇਸ ਵਿੱਚ ਆਉਟਬਾਕਸ ਤੋਂ ਭੇਜੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ "
+#~ "ਸ਼ਾਮਲ ਹਨ।"
+
+#~ msgid ""
+#~ "Whether check for new messages in all active accounts regardless of the "
+#~ "account \"Check for new messages every X minutes\" option when Evolution "
+#~ "is started. This option is used only together with 'send_recv_on_start' "
+#~ "option."
+#~ msgstr ""
+#~ "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਸਮੇਂ ਸਭ ਐਕਟਿਵ ਅਕਾਊਂਟ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਜਾਂਚ ਕਰਨੀ ਹੈ, \"ਨਵੇਂ ਸੁਨੇਹਿਆਂ "
+#~ "ਲਈ ਹਰੇਕ X ਮਿੰਟ ਬਾਅਦ ਚੈੱਕ ਕਰੋ\" ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋਏ। ਇਹ ਚੋਣ ਨੂੰ ਕੇਵਲ "
+#~ "'send_recv_on_start' ਚੋਣ ਨਾਲ ਜੋੜ ਕੇ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "\"Send and Receive Mail\" window height"
+#~ msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਪੱਤਰ\" ਵਿੰਡੋ ਉਚਾਈ"
+
+#~ msgid ""
+#~ "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "\"Send and Receive Mail\" window maximize state"
+#~ msgstr "\"ਪੱਤਰ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Send and Receive "
+#~ "Mail\" window cannot be maximized. This key exists only as an "
+#~ "implementation detail."
+#~ msgstr ""
+#~ "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ "
+#~ "ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ "
+#~ "ਜਾਂਦਾ, ਜਦੋਂ \"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ ਮੌਜੂਦ "
+#~ "ਹੈ।"
+
+#~ msgid "\"Send and Receive Mail\" window width"
+#~ msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਮੇਲ\" ਵਿੰਡੋ ਚੌੜਾਈ"
+
+#~ msgid ""
+#~ "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "\"Search Folder Editor\" window height"
+#~ msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਉਚਾਈ"
+
+#~ msgid ""
+#~ "Initial height of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "\"Search Folder Editor\" window maximize state"
+#~ msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Search Folder Editor\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Search Folder Editor"
+#~ "\" window cannot be maximized. This key exists only as an implementation "
+#~ "detail."
+#~ msgstr ""
+#~ "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ "
+#~ "ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ "
+#~ "ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ \"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ "
+#~ "ਵਜੋਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+
+#~ msgid "\"Search Folder Editor\" window width"
+#~ msgstr "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਚੌੜਾਈ"
+
+#~ msgid ""
+#~ "Initial width of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "\"ਖੋਜ ਫੋਲਡਰ ਐਡੀਟਰ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰ ਕਰੇਗਾ "
+#~ "ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+
+#~ msgid "Drag'n'drop export format"
+#~ msgstr "ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਐਕਸਪੋਰਟ ਫਾਰਮੈਟ"
+
+#~ msgid ""
+#~ "Define the email export format when doing drag'n'drop. Possible values "
+#~ "are mbox or pdf"
+#~ msgstr ""
+#~ "ਜਦੋਂ ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਕਰਨ ਲਈ ਈਮੇਲ ਐਕਸਪੋਰਟ ਫਾਰਮੈਟ ਦਿਉ। ਸੰਭਵ ਮੁੱਲ ਹਨ ਜਾਂ mbox ਜਾਂ pdf ਹੈ।"
+
+#~ msgid "Format of the drag'n'drop export filename"
+#~ msgstr "ਡਰੈਗ ਅਤੇ ਡਰੋਪ ਐਕਸਪੋਰਟ ਫਾਇਲ-ਨਾਂ ਦਾ ਫਾਰਮੈਟ"
+
+#~ msgid ""
+#~ "Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#~ "(: email sent date), 2 (: drag'n'drop date)"
+#~ msgstr ""
+#~ "ਐਕਸਪੋਰਟ ਕੀਤੀਆਂ ਫਾਇਲ-ਨਾਂ YYYYmmDDHHMMSS_email_title ਹੋਵੇਗਾ, ਸੰਭਵ ਮੁੱਲ: 1 (:ਈਮੇਲ ਭੇਜਣ "
+#~ "ਮਿਤੀ), 2(:ਡਰੈਗ-ਡਰੋਪ ਮਿਤੀ)।"
+
+#~ msgid "_Add Signature"
+#~ msgstr "ਦਸਤਖਤ ਸ਼ਾਮਿਲ(_A)"
+
+#~ msgid ""
+#~ "The output of this script will be used as your\n"
+#~ "signature. The name you specify will be used\n"
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ ਵਿੱਚ ਵਰਤੀ\n"
+#~ "ਜਾਵੇਗੀ।ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ ਵੇਖਾਉਣ ਦੇ ਕੰਮ\n"
+#~ " ਆਵੇਗੀ।"
+
+#~ msgid "Drafts _Folder:"
+#~ msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(_F):"
+
+#~ msgid "_Trash Folder:"
+#~ msgstr "ਰੱਦੀ ਫੋਲਡਰ(_T):"
+
+#~ msgid "_Junk Folder:"
+#~ msgstr "ਜੰਕ ਫੋਲਡਰ(_J):"
+
+#~ msgid "Signat_ure:"
+#~ msgstr "ਦਸਤਖਤ(_u):"
+
+#~ msgid "_Make this my default account"
+#~ msgstr "ਮੇਰੇ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਮੂਲ ਬਣਾਓ(_M)"
+
+#~ msgid "Also encrypt to sel_f when sending encrypted messages"
+#~ msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ ਖੁਦ ਇੰਕ੍ਰਿਪਟ ਕਰੋ(_f)"
+
+#~ msgid "Encrypt out_going messages (by default)"
+#~ msgstr "ਬਾਹਰੀ ਜਾਣ ਵਾਲੇ ਪੱਤਰਾਂ ਨੂੰ ਇਕ੍ਰਿਪਸ਼ਨ (ਮੂਲ ਹੀ)(_g)"
+
+#~ msgid "Digitally sign o_utgoing messages (by default)"
+#~ msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਡਿਜ਼ੀਟਲ ਸਾਈਨ ਕਰੋ (ਡਿਫਾਲਟ)(_s)"
+
+#~ msgid "S_elect..."
+#~ msgstr "ਚੁਣੋ(_e)..."
+
+#~ msgid "Clea_r"
+#~ msgstr "ਸਾਫ਼ ਕਰੋ(_r)"
+
+#~ msgid "Cle_ar"
+#~ msgstr "ਸਾਫ਼ ਕਰੋ(_a)"
+
+#~ msgid "description"
+#~ msgstr "ਵੇਰਵਾ"
+
+#~ msgid "Mailbox location"
+#~ msgstr "ਮੇਲ-ਬਾਕਸ ਟਿਕਾਣਾ"
+
+#~ msgid "_Use secure connection:"
+#~ msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
+
+#~ msgid "SSL is not supported in this build of Evolution"
+#~ msgstr " SSL ਸਹਿਯੋਗ ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਲਈ ਸਹਿਯੋਗ ਨਹੀਂ"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
+
+#~ msgid "Re_member password"
+#~ msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_m)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "ਸਰਵਰ ਸੰਰਚਨਾ"
+
+#~ msgid "User _Name:"
+#~ msgstr "ਯੂਜ਼ਰ ਨਾਂ(_N):"
+
+#~ msgid "Remember _password"
+#~ msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_p)"
+
+#~| msgid "None"
+#~ msgid "none"
+#~ msgstr "ਕੋਈ ਨਹੀਂ"
+
+#~| msgid "Label"
+#~ msgid "label"
+#~ msgstr "ਲੇਬਲ"
+
+#~ msgid "Cannot set signature script \"{0}\"."
+#~ msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ \"{0}\" ਸੈਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
+
+#  mail:signature-notscript secondary
+#~ msgid "The script file must exist and be executable."
+#~ msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਅਤੇ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+
+#~ msgid "Unable to connect to the GroupWise server."
+#~ msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#~ msgid "Please check your account settings and try again."
+#~ msgstr "ਆਪਣੀ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#~ msgid "Signature Already Exists"
+#~ msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
+
+#  mail:no-rename-folder-exists secondary
+#  mail:vfolder-notunique secondary
+#~ msgid ""
+#~ "A signature already exists with the name \"{0}\". Please specify a "
+#~ "different name."
+#~ msgstr "ਨਾਂ \"{1}\" ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ ਜੀ।"
+
+#~ msgid ""
+#~ "No message satisfies your search criteria. Either clear search with "
+#~ "Search->Clear menu item or change it."
+#~ msgstr ""
+#~ "ਕੋਈ ਸੁਨੇਹਾ ਤੁਹਾਡੀ ਖੋਜ ਮੁਤਾਬਕ ਨਹੀਂ ਹੈ। ਜਾਂ ਤਾਂ ਖੋਜ -> ਖੋਜ ਮੇਨੂ ਆਈਟਮ ਰਾਹੀਂ ਸਾਫ਼ ਕਰੋ ਜਾਂ ਬਦਲੋ "
+#~ "ਜੀ।"
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports SSL."
+#~ msgstr ""
+#~ "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP "
+#~ "ਸਰਵਰ SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports TLS."
+#~ msgstr ""
+#~ "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP "
+#~ "ਸਰਵਰ TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+
+#~ msgid ""
+#~ "Selecting this option means that your server does not support either SSL "
+#~ "or TLS. This means that your connection will be insecure, and that you "
+#~ "will be vulnerable to security exploits."
+#~ msgstr ""
+#~ "ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ "
+#~ "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
+
+#~ msgid ""
+#~ "This is the port on the LDAP server that Evolution will try to connect "
+#~ "to. A list of standard ports has been provided. Ask your system "
+#~ "administrator what port you should specify."
+#~ msgstr ""
+#~ "ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ "
+#~ "ਪੋਰਟਾਂ ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
+
+#~ msgid "EFolderList XML for the list of completion URIs"
+#~ msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML"
+
+#~ msgid "EFolderList XML for the list of completion URIs."
+#~ msgstr "ਮੁਕੰਮਲ URI ਸੂਚੀ ਲਈ EFolderList XML ਹੈ।"
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") address book in the sidebar of "
+#~ "the \"Contacts\" view."
+#~ msgstr "\"ਸੰਪਰਕ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਐਡਰੈੱਸ ਬੁੱਕ ਦੀ UID ਹੈ।"
+
+#~ msgid "Whether to show maps in preview pane."
+#~ msgstr "ਕੀ ਝਲਕ ਪੱਟੀ ਵਿੱਚ ਨਕਸ਼ੇ ਵੇਖਾਉਣੇ ਹਨ।"
+
+#~ msgid ""
+#~ "Whether addresses should be formatted according to standard in their "
+#~ "destination country."
+#~ msgstr "ਕੀ ਐਡਰੈਸ ਨੂੰ ਟਿਕਾਣਾ ਦੇਸ਼ਨ ਦੇ ਮਿਆਰ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕਰਨਾ ਹੈ।"
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#~ "\"Calendar\" view."
+#~ msgstr "'ਕੈਲੰਡਰ' ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਕੈਲੰਡਰੀ ਲਿਸਟ ਦੀ UID ਹੈ।"
+
+#~ msgid ""
+#~ "The default timezone to use for dates and times in the calendar, as an "
+#~ "untranslated Olsen timezone database location like \"America/New York\"."
+#~ msgstr ""
+#~ "ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ "
+#~ "ਡਾਟਾਬੇਸ ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
+
+#~ msgid ""
+#~ "Use the system timezone instead of the timezone selected in Evolution."
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਚੁਣੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਸਮਾਂ-ਖੇਤਰ ਵਰਤੋਂ"
+
+#~ msgid ""
+#~ "Shows the second time zone in a Day View, if set. Value is similar to one "
+#~ "used in a 'timezone' key."
+#~ msgstr ""
+#~ "ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ ਵੇਖਣਾ ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ। ਮੁੱਲ 'timezone' ਕੁੰਜੀ ਵਿੱਚ ਵਰਤੇ ਵਾਂਗ ਹੈ"
+
+#~ msgid "List of recently used second time zones in a Day View."
+#~ msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤੇ ਦੂਜੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਲਿਸਟ"
+
+#~ msgid "Maximum number of recently used timezones to remember."
+#~ msgstr "ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
+
+#~ msgid ""
+#~ "Maximum number of recently used timezones to remember in a "
+#~ "'day_second_zones' list."
+#~ msgstr "'day_second_zones' ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
+
+#~ msgid ""
+#~ "Whether to show times in twenty four hour format instead of using am/pm."
+#~ msgstr "ਕੀ ਸਮਾਂ ਸਵੇਰੇ/ਸ਼ਾਮ ਦੀ ਬਜਾਏ ੪ ਘੰਟਿਆਂ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਵੇ।"
+
+#~ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+#~ msgstr "ਹਫਤਾ ਸ਼ੁਰੂ ਹੋਣ ਦਾ ਦਿਨ, ਐਤਵਾਰ (੦) ਤੋਂ ਸ਼ਨਿਚੱਰਵਾਰ (੬)।"
+
+#~ msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#~ msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
+
+#~ msgid "Intervals shown in Day and Work Week views, in minutes."
+#~ msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ।"
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the date navigator calendar and "
+#~ "the task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+#~ "ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
+
+#~ msgid "Vertical pane position"
+#~ msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+#~ "ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+#~ "ਹੈ, ਜੋ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ "
+#~ "ਹੈ, ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the calendar lists and the date "
+#~ "navigator calendar."
+#~ msgstr ""
+#~ "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਸੂਚੀ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ।"
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#~ "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#~ "list."
+#~ msgstr ""
+#~ "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਮੀਮੋ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
+#~ "\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
+#~ "ਝਲਕ ਬਾਹੀ ਨੂੰ ਮੀਮੋ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
+
+#~ msgid "If \"true\", show the memo preview pane in the main window."
+#~ msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+
+#~ msgid "Position of the task preview pane when oriented horizontally."
+#~ msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਹਰੀਜੱਟਲ ਹੋਵੇ।"
+
+#~ msgid "Position of the memo preview pane when oriented vertically."
+#~ msgstr "ਮੀਮੋ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ।"
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the task list. \"0\" (Classic View) places the preview pane below the "
+#~ "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#~ "list."
+#~ msgstr ""
+#~ "ਲੇਆਉਟ ਸਟਾਇਲ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਟਾਸਕ ਲਿਸਟ ਨਾਲ ਸਬੰਧਿਤ ਝਲਕ ਬਾਹੀ ਕਿੱਥੇ ਵੇਖਾਈ ਜਾਵੇ। "
+#~ "\"0\" (ਕਲਾਸਿਕ ਝਲਕ) ਝਲਕ ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਹੇਠਾਂ ਵੇਖਾਉਂਦੀ ਹੈ। \"1\" (ਵਰਟੀਕਲ ਝਲਕ) "
+#~ "ਝਲਕ ਬਾਹੀ ਨੂੰ ਟਾਸਕ ਲਿਸਟ ਦੇ ਨਾਲ ਰੱਖਦੀ ਹੈ।"
+
+#~ msgid "If \"true\", show the task preview pane in the main window."
+#~ msgstr "ਜੇ ਸਹੀਂ ਸੈੱਟ ਕੀਤਾ ਤਾਂ, ਮੁੱਖ ਵਿੰਡੋ ਵਿੱਚ ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"
+
+#~ msgid "Position of the task preview pane when oriented vertically."
+#~ msgstr "ਟਾਸਕ ਝਲਕ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜਦੋਂ ਸਥਿਤੀ ਵਰਟੀਕਲ ਹੋਵੇ।"
+
+#~ msgid ""
+#~ "Whether to compress weekends in the month view, which puts Saturday and "
+#~ "Sunday in the space of one weekday."
+#~ msgstr ""
+#~ "ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ ਐਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ "
+#~ "ਤੌਰ ਤੇ ਵੇਖਾਇਆ ਜਾਵੇ।"
+
+#~ msgid ""
+#~ "Whether to display the end time of events in the week and month views."
+#~ msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ।"
+
+#~ msgid "Days on which the start and end of work hours should be indicated."
+#~ msgstr "ਦਿਨ, ਜਿੰਨਾ ਤੋਂ ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਸ਼ੁਰੂ ਅਤੇ ਅੰਤ ਹੁੰਦੇ ਹਨ, ਵੇਖਾਉਣ ਲ਼ਈ"
+
+#~ msgid ""
+#~ "Whether to draw the Marcus Bains Line (line at current time) in the "
+#~ "calendar."
+#~ msgstr "ਕੀ ਕੈਲੰਡਰ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ (ਮੌਜੂਦਾ ਸਮੇਂ ਦੀ ਰੇਖਾ) ਖਿੱਚਣੀ ਹੈ।"
+
+#~ msgid "Color to draw the Marcus Bains line in the Day View."
+#~ msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ।"
+
+#~ msgid ""
+#~ "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#~ msgstr "ਸਮਾਂ ਰੇਖਾ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਖਿੱਚਣ ਲਈ ਰੰਗ (ਮੂਲ ਖਾਲੀ ਹੈ)।"
+
+#~ msgid ""
+#~ "Show days with recurrent events in italic font in bottom left calendar."
+#~ msgstr "ਖੱਬੇ ਪਾਸੇ ਹੇਠਾਂ ਕੈਲੰਡਰ ਵਿੱਚ ਮੁੜ ਵਾਪਰਨ ਵਾਲੇ ਈਵੈਂਟ ਲਈ ਦਿਨ ਤਿਰਛੇ ਰੂਪ 'ਚ ਵੇਖਾਉ।"
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#~ "\"Memos\" view."
+#~ msgstr "\"ਮੀਮੋ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਮੀਮੋ ਲਿਸਟ ਦੀ UID ਹੈ।"
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#~ "\"Tasks\" view."
+#~ msgstr "\"ਟਾਸਕ\" ਝਲਕ ਦੀ ਬਾਹੀ ਵਿੱਚ ਚੁਣੀ (ਜਾਂ \"ਪ੍ਰਾਇਮਰੀ\") ਟਾਸਕ ਲਿਸਟ ਦੀ UID ਹੈ।"
+
+#~ msgid "Whether to hide completed tasks in the tasks view."
+#~ msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid ""
+#~ "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#~ "\"."
+#~ msgstr "ਟਾਸਟ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+
+#~ msgid "Number of units for determining when to hide tasks."
+#~ msgstr "ਕੰਮ ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
+
+#~ msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#~ msgstr "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
+
+#~ msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+#~ msgstr "ਕੰਮ ਦਾ ਰੰਗ, ਜਿਨਾਂ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀ ਹੈ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when deleting an appointment or task."
+#~ msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when expunging appointments and tasks."
+#~ msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
+
+#~ msgid "Whether to set a default reminder for appointments."
+#~ msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid "Number of units for determining a default reminder."
+#~ msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
+
+#~ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#~ msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+
+#~ msgid "Whether to set a reminder for birthdays and anniversaries."
+#~ msgstr "ਕੀ ਜਨਮਦਿਨ ਤੇ ਵਰ੍ਹੇ-ਗੰਢ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid "Number of units for determining a birthday or anniversary reminder."
+#~ msgstr "ਜਨਮਦਿਨ ਜਾਂ ਵਰ੍ਹੇਗੰਢ ਰੀਮਾਈਡਰ ਜਾਣਨ ਲਈ ਇਕਾਈਆਂ ਦੀ ਗਿਣਤੀ"
+
+#~ msgid ""
+#~ "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#~ "\"days\"."
+#~ 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 "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ।"
+
+#~ msgid "Time the last reminder ran, in time_t."
+#~ msgstr "ਸਮਾਂ ਜਦੋਂ ਰੀਮਾਈਡਰ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)।"
+
+#~ msgid "Calendars to run reminders for"
+#~ msgstr "ਰੀਮਾਈਡਰ ਚਲਾਉਣ ਲਈ ਕੈਲੰਡਰ"
+
+#~ msgid "Programs that are allowed to be run by reminders."
+#~ msgstr "ਪ੍ਰੋਗਰਾਮ, ਜੋ ਕਿ ਰੀਮਾਈਡਰ ਵਲੋਂ ਚਲਾਉਣ ਦੀ ਇਜ਼ਾਜ਼ਤ ਹੈ।"
+
+#~ msgid "Whether or not to use the notification tray for display reminders."
+#~ msgstr "ਰੀਮਾਈਡਰ ਵੇਖਾਉਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid "Free/busy server URLs"
+#~ msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ URL"
+
+#~ 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 ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ "
+#~ "ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+
+#~ msgid ""
+#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+#~ "debug messages."
+#~ msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ 0। ਚੇਤਾਵਨੀ ਲਈ 1। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ 2।"
+
+#~ msgid "On The Web"
+#~ msgstr "ਵੈੱਬ ਤੇ"
+
+#~ msgid "Weather"
+#~ msgstr "ਮੌਸਮ"
+
+#~ msgid "Birthdays & Anniversaries"
+#~ msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
+
+#~ msgid "_New Calendar..."
+#~ msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)..."
+
+#~ msgid "Recent Messages"
+#~ msgstr "ਤਾਜ਼ੇ ਸੁਨੇਹੇ"
+
+#~ msgid "Python Test Plugin"
+#~ msgstr "ਪਾਈਥਨ ਟੈਸਟ ਪਲੱਗਇਨ"
+
+#~ msgid "Test Plugin for Python EPlugin loader."
+#~ msgstr "ਪਾਈਥਨ ਈ-ਪਲੱਗਇਨ ਲੋਡਰ ਲਈ ਟੈਸਟ ਪਲੱਗਇਨ।"
+
+#~ msgid "Python Plugin Loader tests"
+#~ msgstr "ਪਾਈਥਨ ਪਲੱਗਇਨ ਲੋਡਰ ਟੈਸਟ"
+
+#~ msgid "Evolution Setup Assistant"
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈੱਟਅੱਪ ਸਹਾਇਕ "
+
+#~ msgid "Local Address Books"
+#~ msgstr "ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ"
+
+#~ msgid "Add local address books to Evolution."
+#~ msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
+
+#~ msgid "Inline Audio"
+#~ msgstr "ਲਾਈਨ 'ਚ ਆਡੀਓ"
+
+#~ msgid "Play audio attachments directly in mail messages."
+#~ msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਤੋਂ ਆਡੀਓ ਅਟੈਚਮੈਂਟ ਸਿੱਧੀਆਂ ਚਲਾਓ।"
+
+#~ msgid "Ensuring local sources"
+#~ msgstr "ਲੋਕਲ ਸਰੋਤ ਯਕੀਨੀ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
+
+#~ msgid "_Restore Evolution from the backup file"
+#~ msgstr "ਬੈਕ-ਅੱਪ ਫਾਇਲ ਤੋਂ ਈਵੂਲੇਸ਼ਨ ਰੀਸਟੋਰ ਕਰੋ(_R)"
+
+#~ msgid "Please select an Evolution Archive to restore:"
+#~ msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੂਲੇਸ਼ਨ ਅਕਾਇਵ ਚੁਣੋ ਜੀ:"
+
+#~ msgid "Back up and Restore"
+#~ msgstr "ਬੈਕਅੱਪ ਅਤੇ ਰੀਸਟੋਰ"
+
+#~ msgid "Back up and restore your Evolution data and settings."
+#~ msgstr "ਆਪਣੀ ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕ ਅੱਪ ਤੇ ਰੀਸਟੋਰ ਕਰੋ"
+
+#~ msgid "Authentication failed. Server requires correct login."
+#~ msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ। ਸਰਵਰ ਲਈ ਢੁੱਕਵਾਂ ਲਾਗਇਨ ਚਾਹੀਦਾ ਹੈ।"
+
+#~ msgid "Given URL cannot be found."
+#~ msgstr "ਦਿੱਤਾ URL ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"
+
+#~ msgid ""
+#~ "Server returned unexpected data.\n"
+#~ "%d - %s"
+#~ msgstr ""
+#~ "ਸਰਵਰ ਨੇ ਅਣਜਾਣ ਡਾਟਾ ਭੇਜਿਆ ਹੈ।\n"
+#~ "%d - %s"
+
+#  FIXME: domain/code
+#~ msgid "Failed to parse server response."
+#~ msgstr "ਸਰਵਰ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#~ msgid "Events"
+#~ msgstr "ਈਵੈਂਟ"
+
+#~ msgid "User's calendars"
+#~ msgstr "ਯੂਜ਼ਰ ਦਾ ਕੈਲੰਡਰ"
+
+#~ msgid "Failed to get server URL."
+#~ msgstr "ਸਰਵਰ URL ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#~ msgid "Searching for user's calendars..."
+#~ msgstr "ਯੂਜ਼ਰ ਦਾ ਕੈਲੰਡਰ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "Previous attempt failed: %s"
+#~ msgstr "ਪਿਛਲੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੈ: %s"
+
+#~ msgid "Previous attempt failed with code %d"
+#~ msgstr "ਪਿਛਲੀ ਕੋਸ਼ਿਸ਼ ਕੋਡ %d ਨਾਲ ਫੇਲ੍ਹ ਹੋਈ"
+
+#~ msgid "Enter password for user %s on server %s"
+#~ msgstr "%2$s ਸਰਵਰ ਉੱਤੇ %1$s ਯੂਜ਼ਰ ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
+
+#~ msgid "Cannot create soup message for URL '%s'"
+#~ msgstr "URL '%s' ਲਈ soup ਸੁਨੇਹਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#~ msgid "Searching folder content..."
+#~ msgstr "ਫੋਲਡਰ ਸਮੱਗਰੀ ਖੋਜੀ ਜਾ ਰਹੀ ਹੈ..."
+
+#~ msgid "List of available calendars:"
+#~ msgstr "ਉਪਲੱਬਧ ਕੈਲੰਡਰਾਂ ਦੀ ਲਿਸਟ:"
+
+#~ msgid "Supports"
+#~ msgstr "ਸਹਿਯੋਗ"
+
+#~ msgid "User e_mail:"
+#~ msgstr "ਯੂਜ਼ਰ ਈਮੇਲ(_m):"
+
+#~ msgid "Failed to create thread: %s"
+#~ msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
+
+#~ msgid "Server URL '%s' is not a valid URL"
+#~ msgstr "ਸਰਵਰ URL '%s' ਢੁੱਕਵਾਂ URL ਨਹੀਂ ਹੈ"
+
+#~ msgid "Browse for a CalDAV calendar"
+#~ msgstr "CalDAV ਕੈਲੰਡਰ ਲਈ ਝਲਕ"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Brows_e server for a calendar"
+#~ msgstr "ਕੈਲੰਡਰ ਲਈ ਸਰਵਰ ਦੀ ਝਲਕ(_e)"
+
+#~ msgid "Re_fresh:"
+#~ msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f):"
+
+#~ msgid "CalDAV Support"
+#~ msgstr "CalDAV ਸਹਿਯੋਗ"
+
+#~ msgid "Add CalDAV support to Evolution."
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ CalDAV ਸਹਿਯੋਗ ਸ਼ਾਮਲ ਕਰੋ।"
+
+#~| msgid "_Customize options"
+#~ msgid "C_ustomize options"
+#~ msgstr "ਚੋਣਾਂ ਲਈ ਪਸੰਦ(_u)"
+
+#~ msgid "On open"
+#~ msgstr "ਖੋਲ੍ਹਣ ਸਮੇਂ"
+
+#~ msgid "On file change"
+#~ msgstr "ਫਾਇਲ ਬਦਲਣ ਸਮੇਂ"
+
+#~ msgid "Periodically"
+#~ msgstr "ਨਿਯਮਤ"
+
+#~ msgid "Force read _only"
+#~ msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਮਜਬੂਰ(_o)"
+
+#~ msgid "Local Calendars"
+#~ msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
+
+#~ msgid "Add local calendars to Evolution."
+#~ msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
+
+#~ msgid "Userna_me:"
+#~ msgstr "ਯੂਜ਼ਰ ਨਾਂ(_m):"
+
+#~ msgid "Web Calendars"
+#~ msgstr "ਵੈੱਬ ਕੈਲੰਡਰ"
+
+#~ msgid "Add web calendars to Evolution."
+#~ msgstr "ਵੈੱਬ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
+
+#~ msgid "Weather: Fog"
+#~ msgstr "ਮੌਸਮ: ਧੁੰਦ"
+
+#~ msgid "Weather: Cloudy"
+#~ msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
+
+#~ msgid "Weather: Cloudy Night"
+#~ msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ ਵਾਲੀ ਰਾਤ"
+
+#~ msgid "Weather: Overcast"
+#~ msgstr "ਮੌਸਮ: ਮੀਂਹ"
+
+#~ msgid "Weather: Showers"
+#~ msgstr "ਮੌਸਮ: ਫੁਹਾਰ"
+
+#~ msgid "Weather: Snow"
+#~ msgstr "ਮੌਸਮ: ਬਰਫ਼"
+
+#~ msgid "Weather: Sunny"
+#~ msgstr "ਮੌਸਮ: ਖੜਿਆ ਦਿਨ"
+
+#~ msgid "Weather: Clear Night"
+#~ msgstr "ਮੌਸਮ: ਸਾਫ਼ ਰਾਤ"
+
+#~ msgid "Weather: Thunderstorms"
+#~ msgstr "ਮੌਸਮ: ਬਰਫ਼ੀਲਾ ਤੂਫਾਨ"
+
+#~ msgid "Select a location"
+#~ msgstr "ਇੱਕ ਟਿਕਾਣਾ ਚੁਣੋ"
+
+#~ msgctxt "weather-cal-location"
+#~ msgid "None"
+#~ msgstr "ਕੋਈ ਨਹੀਂ"
+
+#~ msgid "_Units:"
+#~ msgstr "ਇਕਾਈ(_U):"
+
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "ਮੀਟਰਿਕ (ਸੈਂਲਸੀਅਸ, ਸੈਂਮੀ, ਆਦਿ)"
+
+#~ msgid "Imperial (Fahrenheit, inches, etc)"
+#~ msgstr "ਇੰਪੀਰਿਲ (ਫਾਰਨਹੀਂਟ, ਇੰਚ ਆਦਿ)"
+
+#~ msgid "Weather Calendars"
+#~ msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
+
+#~ msgid "Add weather calendars to Evolution."
+#~ msgstr "ਮੌਸਮ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
+
+#~ msgid "Default Sources"
+#~ msgstr "ਡਿਫਾਲਟ ਸਰੋਤ"
+
+#~ msgid "Mark your preferred address book and calendar as default."
+#~ msgstr "ਤੁਹਾਡੀ ਪਸੰਦੀਦਾ ਦਾ ਐਡਰੈੱਸ ਬੁੱਕ ਅਤੇ ਕੈਲੰਡਰ ਨੂੰ ਡਿਫਾਲਟ ਬਣਾਓ।"
+
+#~ msgid "Automatically launch editor when key is pressed in the mail composer"
+#~ msgstr "ਜਦੋਂ ਮੇਲ ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਸਵਿੱਚ ਦੱਬੀ ਜਾਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਐਡੀਟਰ ਚਲਾਓ"
+
+#~ msgid "Server"
+#~ msgstr "ਸਰਵਰ"
+
+#~ msgid "Enter password for user %s to access list of subscribed calendars."
+#~ msgstr "ਯੂਜ਼ਰ %s ਨੂੰ ਮੈਂਬਰੀ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਅਸੈਸ ਲਿਸਟ ਲਈ ਪਾਸਵਰਡ ਦਿਓ।"
+
+#~ msgid ""
+#~ "Cannot read data from Google server.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਗੂਗਲ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
+#~ "%s"
+
+#~ msgid "Cal_endar:"
+#~ msgstr "ਕੈਲੰਡਰ(_e):"
+
+#~ msgid "Retrieve _List"
+#~ msgstr "ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ(_L)"
+
+#~ msgid "Google Calendars"
+#~ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
+
+#~ msgid ""
+#~ "Select your IMAP Header Preferences. \n"
+#~ "The more headers you have the more time it will take to download."
+#~ msgstr ""
+#~ "ਆਪਣੀ IMAP ਹੈੱਡਰ ਪਸੰਦ ਚੁਣੋ। \n"
+#~ "ਜਿੰਨੇ ਹੈੱਡਰ ਵੱਧ ਉਨ੍ਹਾਂ ਹੀ ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਉੱਤੇ ਸਮਾਂ ਲੱਗੇਗਾ।"
+
+#~ msgid ""
+#~ "Give the extra headers that you need to fetch in addition to the above "
+#~ "standard headers. \n"
+#~ "You can ignore this if you choose \"All Headers\"."
+#~ msgstr ""
+#~ "ਵਾਧੂ ਹੈੱਡਰ ਦਿੰਦੀ ਹੈ, ਜਿਸ ਦੀ ਤੁਹਾਨੂੰ ਸਟੈਂਡਰਡ ਹੈੱਡਰ ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n"
+#~ "ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋ ਜੇ ਤੁਸੀਂ \"ਸਭ ਹੈੱਡਰ\" ਦੀ ਚੋਣ ਕਰਦੇ ਹੋ।"
+
+#~ msgid "Fine-tune your IMAP accounts."
+#~ msgstr "ਆਪਣੇ IMAP ਅਕਾਊਂਟ ਵਿੱਚ ਸੁਧਾਰ ਕਰੋ।"
+
+#~ msgid ""
+#~ "You have received %d new message\n"
+#~ "in %s."
+#~ msgid_plural ""
+#~ "You have received %d new messages\n"
+#~ "in %s."
+#~ msgstr[0] ""
+#~ "ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵਾਂ ਸੁਨੇਹਾ\n"
+#~ "ਆਇਆ ਹੈ।"
+#~ msgstr[1] ""
+#~ "ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵੇਂ ਸੁਨੇਹੇ\n"
+#~ "ਆਏ ਹਨ।"
+
+#~ msgid "New email"
+#~ msgstr "ਨਵੀਂ ਈਮੇਲ"
+
+#~ msgid "Cannot get source list. %s"
+#~ msgstr "ਸਰੋਤ ਲਿਸਟ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s"
+
+#~ msgid "Create an _Event"
+#~ msgstr "ਈਵੈਂਟ ਬਣਾਓ(_E)"
+
+#~ msgid "TNEF Decoder"
+#~ msgstr "TNEF ਡੀਕੋਡਰ"
+
+#~ msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+#~ msgstr "ਮਾਈਕਰੋਸਾਫਟ ਆਉਟਲੁੱਕ ਤੋਂ TNEF (winmail.dat) ਡੀਕੋਡ ਕਰੋ।"
+
+#~ msgid "Inline vCards"
+#~ msgstr "ਇਨ-ਲਾਈਨ vCards"
+
+#~ msgid "Show vCards directly in mail messages."
+#~ msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਸਿੱਧੇ vCard ਵੇਖੋ।"
+
+#~ msgid "WebDAV contacts"
+#~ msgstr "WebDAV ਸੰਪਰਕ"
+
+#~ msgid "Add WebDAV contacts to Evolution."
+#~ msgstr "WebDAV ਸੰਪਰਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
+#~ msgid ""
+#~ "List of paths for the folders to be synchronized to disk for offline usage"
+#~ msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ, ਦੇ ਰਸਤੇ ਦੀ ਲਿਸਟ"
+
+#~ msgid "Default window Y coordinate"
+#~ msgstr "ਮੂਲ ਵਿੰਡੋ Y ਧੁਰਾ"
+
+#~ msgid "The default Y coordinate for the main window."
+#~ msgstr "ਮੁੱਖ ਵਿੰਡੋ ਲਈ ਮੂਲ Y ਧੁਰਾ ਹੈ।"
+
+#~ msgid "Default window X coordinate"
+#~ msgstr "ਮੂਲ ਵਿੰਡੋ X ਧੁਰਾ"
+
+#~ msgid "The default X coordinate for the main window."
+#~ msgstr "ਮੁੱਖ ਵਿੰਡੋ ਲਈ ਮੂਲ X ਧੁਰਾ ਹੈ।"
+
+#~ msgid "Default window width"
+#~ msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਚੌੜਾਈ"
+
+#~ msgid "The default width for the main window, in pixels."
+#~ msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
+
+#~ msgid "Default window height"
+#~ msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਉਚਾਈ"
+
+#~ msgid "The default height for the main window, in pixels."
+#~ msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
+
+#~ msgid "Default window state"
+#~ msgstr "ਡਿਫਾਲਟ ਵਿੰਡੋ ਹਾਲਤ"
+
+#~ msgid "Whether or not the window should be maximized."
+#~ msgstr "ਕੀ ਝਰੋਖੇ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਦਿੱਤਾ ਜਾਵੇ ਜਾਂ ਨਾ।"
+
+#~ msgid "Proxy configuration mode"
+#~ msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੋਡ"
+
+#~ msgid ""
+#~ "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+#~ "representing \"use system settings\", \"no proxy\", \"use manual proxy "
+#~ "configuration\" and \"use proxy configuration provided in the autoconfig "
+#~ "url\" respectively."
+#~ msgstr ""
+#~ "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੋਡ ਚੁਣੋ। ਸਹਿਯੋਗੀ ਮੁੱਲ ਹਨ 0, 1, 2, ਅਤੇ 3 \"ਸਿਸਟਮ ਸੰਰਚਨਾ ਵਰਤੋਂ\", "
+#~ "\"ਪਰਾਕਸੀ ਨਹੀਂ\", \"ਖੁਦ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਦਿਓ\" ਅਤੇ \"autoconfig url ਵਿੱਚ ਦਿੱਤੀ "
+#~ "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਵਰਤੋਂ\" ਹਨ"
+
+#~ msgid "HTTP proxy port"
+#~ msgstr "HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "http_host\" that you proxy through."
+#~ msgstr ""
+#~ "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/http_host\" ਰਾਹੀਂ "
+#~ "ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
+
+#~ msgid "HTTP proxy host name"
+#~ msgstr "HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#~ msgid "The machine name to proxy HTTP through."
+#~ msgstr "ਪਰਾਕਸੀ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
+
+#~ msgid "Secure HTTP proxy port"
+#~ msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "secure_host\" that you proxy through."
+#~ msgstr ""
+#~ "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ  \"/apps/evolution/shell/network_config/secure_host\" ਰਾਹੀਂ "
+#~ "ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
+
+#~ msgid "Secure HTTP proxy host name"
+#~ msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#~ msgid "The machine name to proxy secure HTTP through."
+#~ msgstr "ਪਰਕਾਸੀ ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
+
+#~ msgid "SOCKS proxy port"
+#~ msgstr "SOCKS ਪਰਾਕਸੀ ਪੋਰਟ"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "socks_host\" that you proxy through."
+#~ msgstr ""
+#~ "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/socks_host\"ਰਾਹੀਂ "
+#~ "ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
+
+#~ msgid "SOCKS proxy host name"
+#~ msgstr "SOCKS ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
+
+#~ msgid "The machine name to proxy socks through."
+#~ msgstr "ਪਰਾਕਸੀ ਸਾਕਟ ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
+
+#~ msgid "Use HTTP proxy"
+#~ msgstr "HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ"
+
+#~ msgid ""
+#~ "Enables the proxy settings when accessing HTTP/Secure HTTP over the "
+#~ "Internet."
+#~ msgstr "ਜਦੋਂ HTTP/ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਵਰਤਣਾ ਹੋਵੇ ਤਾਂ ਪਰਾਕਸੀ ਸਥਾਪਨ ਚਾਲੂ।"
+
+#~ msgid "Authenticate proxy server connections"
+#~ msgstr "ਪਰਾਕਸੀ ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਪਰਮਾਣਿਤ"
+
+#~ msgid ""
+#~ "If true, then connections to the proxy server require authentication. The "
+#~ "username is retrieved from the \"/apps/evolution/shell/network_config/"
+#~ "authentication_user\" GConf key, and the password is retrieved from "
+#~ "either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+#~ msgstr ""
+#~ "ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਪਰਾਕਸੀ ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਯੂਜ਼ਰ ਨਾਂ ਨੂੰ \"/apps/"
+#~ "evolution/shell/network_config/authentication_user\" GConf  ਕੁੰਜੀ ਅਤੇ ਪਾਸਵਰਡ "
+#~ "ਨੂੰ gnome-keyring ਜਾਂ ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾਇਲ ਤੋਂ ਲਿਆ ਜਾਂਦਾ ਹੈ।"
+
+#~ msgid "HTTP proxy username"
+#~ msgstr "HTTP ਪਰਾਕਸੀ ਯੂਜ਼ਰ-ਨਾਂ"
+
+#~ msgid "Username to pass as authentication when doing HTTP proxying."
+#~ msgstr "ਪਰਮਾਣਕਿਤਾ ਵਜੋਂ ਦੇਣ ਲਈ ਯੂਜ਼ਰ ਨਾਂ, ਜਦੋਂ ਕਿ HTTP ਪਰਾਕਸੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ।"
+
+#~ msgid "HTTP proxy password"
+#~ msgstr "HTTP ਪਰਾਕਸੀ ਪਾਸਵਰਡ"
+
+#~ msgid "Password to pass as authentication when doing HTTP proxying."
+#~ msgstr "ਜਦੋਂ HTTP ਪਰਾਕਸੀ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪਰਮਾਣਕਿਤਾ ਵਾਸਪੇ ਪਾਸਵਰਡ।"
+
+#~ msgid "Non-proxy hosts"
+#~ msgstr "ਗ਼ੈਰ-ਪਰਾਕਸੀ ਹੋਸਟ"
+
+#~ msgid ""
+#~ "This key contains a list of hosts which are connected to directly, rather "
+#~ "than via the proxy (if it is active). The values can be hostnames, "
+#~ "domains (using an initial wildcard like *.foo.com), IP host addresses "
+#~ "(both IPv4 and IPv6) and network addresses with a netmask (something like "
+#~ "192.168.0.0/24)."
+#~ msgstr ""
+#~ " ਇਸ ਕੁੰਜੀ ਵਿੱਚ ਹੋਸਟਾਂ ਦੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਸਿੱਧੇ ਕੁਨੈਕਟ ਹਨ, ਨਾ ਕਿ ਪਰਾਕਸੀ ਰਾਹੀਂ (ਜੇ ਇਹ "
+#~ "ਐਕਟਿਵ ਹੋਵੇ)। ਇਹ ਮੁੱਲ ਵਿੱਚ ਹੋਸਟ-ਨਾਂ, ਡੋਮੇਨ (ਸ਼ੁਰੂਆਤੀ ਵਲਾਈਡ-ਕਾਰਡ *.foo.com ਆਦਿ ਨਾਲ), IP "
+#~ "ਹੋਸਟ ਐਡਰੈੱਸ (IPv੪ ਅਤੇ IPv੬ ਦੋਵਾਂ) ਨਾਲ ਅਤੇ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਨਾਲ ਨੈੱਟਮਾਸਕ (ਕਿਵੇਂ ਕਿ "
+#~ "192.168.0.0/24) ਹਨ।"
+
+#~ msgid "Automatic proxy configuration URL"
+#~ msgstr "ਆਟੋਮੈਟਿਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ URL"
+
+#~ msgid "URL that provides proxy configuration values."
+#~ msgstr "URL ਜੋ ਕਿ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੁੱਲ ਦਿੰਦਾ ਹੈ।"
+
+#~ msgid "_Forget Passwords"
+#~ msgstr "ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ(_F)"
+
+#~ msgid "Forget all remembered passwords"
+#~ msgstr "ਸਭ ਯਾਦ ਰੱਖੇ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ"
+
+#~ msgid "Are you sure you want to forget all remembered passwords?"
+#~ msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਯਾਦ ਰੱਖੇ ਹੋਏ ਪਾਸਵਰਡ ਭੁੱਲਣ ਲਈ ਤਿਆਰ ਹੋ?"
+
+#~ msgid ""
+#~ "Forgetting your passwords will clear all remembered passwords. You will "
+#~ "be reprompted next time they are needed."
+#~ msgstr ""
+#~ "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ "
+#~ "ਤਾਂ ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
+
+#~ msgid "_Forget"
+#~ msgstr "ਭੁੱਲੋ(_F)"
+
 #~ msgid "Recent _Documents"
 #~ msgstr "ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼(_D)"
 
@@ -22988,9 +23322,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "File exists \"{0}\"."
 #~ msgstr "ਫਾਇਲ ਮੌਜੂਦ \"{0}\" ਹੈ।"
 
-#~ msgid "GConf error: %s"
-#~ msgstr "GConf ਗਲਤੀ: %s"
-
 #~ msgid "All further errors shown only on terminal."
 #~ msgstr "ਹੋਰ ਬਾਕੀ ਸਭ ਗਲਤੀਆਂ ਕੇਵਲ ਟਰਮੀਨਲ ਉੱਤੇ ਹੀ ਵੇਖੋ।"
 
@@ -23054,9 +23385,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "File _name:"
 #~ msgstr "ਫਾਇਲ ਨਾਂ(_n):"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
 #~ msgid "Send the debugging output of all components to a file."
 #~ msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
@@ -23236,9 +23564,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Use _SSL"
 #~ msgstr "_SSL ਵਰਤੋਂ"
 
-#~ msgid "_Secure connection"
-#~ msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ (_S)"
-
 #~ msgid "Show a map of all the contacts"
 #~ msgstr "ਸਭ ਸੰਪਰਕਾਂ ਲਈ ਨਕਸ਼ਾ ਵੇਖੋ"
 
@@ -23322,9 +23647,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Junk Mail Settings"
 #~ msgstr "ਜੰਕ ਪੱਤਰ ਸੈਟਿੰਗ"
 
-#~ msgid "Email:"
-#~ msgstr "ਈਮੇਲ:"
-
 #~ msgid "Junk List:"
 #~ msgstr "ਜੰਕ ਲਿਸਟ:"
 
@@ -24007,9 +24329,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Log Messages:"
 #~ msgstr "ਲਾਗ ਸੁਨੇਹੇ:"
 
-#~ msgid "Log Level"
-#~ msgstr "ਲਾਗ ਲੈਵਲ"
-
 #~ msgid "Error"
 #~ msgstr "ਗਲਤੀ"
 
@@ -24064,9 +24383,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Subscribe dialog default width"
 #~ msgstr "ਮੈਂਬਰ ਬਣੋ ਡਾਈਲਾਗ ਮੂਲ ਚੌੜਾਈ"
 
-#~ msgid "(Not Recommended)"
-#~ msgstr "(ਸਿਫਾਰਸ਼ੀ ਨਹੀਂ)"
-
 #~ msgid "(Note: Requires restart of the application)"
 #~ msgstr "(ਨੋਟ: ਐਪਲੀਕੇਸ਼ਨ ਮੁੜ-ਸਟਾਰਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ)"
 
@@ -24136,9 +24452,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "V_ariable-width:"
 #~ msgstr "ਅਸਥਿਰ-ਚੌੜਾਈ(_a):"
 
-#~ msgid "_Mark messages as read after"
-#~ msgstr "ਇਸ ਦੇ ਬਾਅਦ ਵਿੱਚ ਸੁਨੇਹੇ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਓ(_M)"
-
 #~ msgid "_Show image animations"
 #~ msgstr "ਚਿੱਤਰ ਐਨੀਮੇਸ਼ਨ ਵੇਖਾਓ(_S)"
 
@@ -24288,9 +24601,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Shell View"
 #~ msgstr "ਸ਼ੈੱਲ ਝਲਕ"
 
-#~ msgid "Source"
-#~ msgstr "ਸਰੋਤ"
-
 #~ msgid "Width"
 #~ msgstr "ਚੌੜਾਈ"
 
@@ -24318,9 +24628,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Adapter"
 #~ msgstr "ਐਡਪਟਰ"
 
-#~ msgid "Selected"
-#~ msgstr "ਚੁਣਿਆ"
-
 #~ msgid "Has Cursor"
 #~ msgstr "ਕਰਸਰ ਹੈ"
 
@@ -24498,9 +24805,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "_From Field"
 #~ msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
 
-#~ msgid "Toggles whether the From chooser is displayed"
-#~ msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
-
 #~ msgid "Hide"
 #~ msgstr "ਓਹਲੇ"
 
@@ -24585,9 +24889,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ "ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸੈਟਿੰਗ ਪੜ੍ਹਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ "
 #~ "ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
 
-#~ msgid "Allows Evolution to display text part of limited size"
-#~ msgstr "ਸੀਮਿਤ ਸਾਈਜ਼ ਦਾ ਟੈਕਸਟ ਭਾਗ ਵੇਖਾਉਣ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਮਨਜੂਰ"
-
 #~ msgid "Enable to render message text part of limited size."
 #~ msgstr "ਰੈਡਰ ਸੁਨੇਹਾ ਟੈਕਸਟ ਭਾਗ ਨੂੰ ਸੀਮਿਤ ਆਕਾਰ ਦਿਓ।"
 
@@ -25026,9 +25327,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "The shell window's GtkUIManager"
 #~ msgstr "ਸ਼ੈੱਲ ਵਿੰਡੋ GtkUIManager"
 
-#~ msgid "Module Directory"
-#~ msgstr "ਮੋਡੀਊਲ ਡਾਇਰੈਕਟਰੀ"
-
 #~ msgid "The directory from which to load EModules"
 #~ msgstr "ਡਾਇਰੈਕਟਰੀ, ਜਿਸ ਵਿੱਚੋਂ ਈਮੋਡੀਊਲ ਲੋਡ ਹੁੰਦੇ ਹਨ"
 
@@ -25348,9 +25646,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Text width"
 #~ msgstr "ਟੈਕਸਟ ਚੌੜਾਈ"
 
-#~ msgid "Text height"
-#~ msgstr "ਟੈਕਸਟ ਉਚਾਈ"
-
 #~ msgid "Use ellipsis"
 #~ msgstr "ਅੰਡਾਕਾਰ ਵਰਤੋਂ"
 
@@ -25464,9 +25759,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕਾਰਡ ਅਤੇ ਸੂਚੀ ਝਲਕ ਅਤੇ ਦਿੱਖ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ, (ਪਿਕਸਲ "
 #~ "ਵਿੱਚ)।"
 
-#~ msgid "Look up in address books"
-#~ msgstr "ਐਡਰੈਸ ਬੁੱਕ ਵਿੱਚ ਖੋਜ"
-
 #~ msgid ""
 #~ "389\n"
 #~ "636\n"
@@ -25676,9 +25968,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Memo_s"
 #~ msgstr "ਮੀਮੋ(_s)"
 
-#~ msgid "_Calendars"
-#~ msgstr "ਕੈਲੰਡਰ(_C)"
-
 #~ msgid "Evolution Calendar alarm notification service"
 #~ msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
@@ -25932,9 +26221,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "C_ut"
 #~ msgstr "ਕੱਟੋ(_u)"
 
-#~ msgid "_Paste"
-#~ msgstr "ਚੇਪੋ(_P)"
-
 #~ msgid "_Mark Selected Tasks as Complete"
 #~ msgstr "ਚੁਣੇ ਕੰਮ ਪੂਰੇ ਹੋਏ ਨਿਰਧਾਰਿਤ ਕਰੋ(_M)"
 
@@ -26168,9 +26454,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Open in _New Window"
 #~ msgstr "ਨਵੇਂ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_N)"
 
-#~ msgid "_Move..."
-#~ msgstr "ਭੇਜੋ(_M)..."
-
 #~ msgid "_Unread Search Folder"
 #~ msgstr "ਖੋਜ ਫੋਲਡਰ ਅਣ-ਪੜ੍ਹਿਆ(_U)"
 
@@ -26225,9 +26508,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Open in %s..."
 #~ msgstr "%s ਨਾਲ ਖੋਲ੍ਹੋ..."
 
-#~ msgid "message"
-#~ msgstr "ਸੁਨੇਹਾ"
-
 #~ msgid "Add address"
 #~ msgstr "ਐਡਰੈੱਸ ਜੋੜ੍ਹੋ"
 
@@ -26408,10 +26688,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Subject or Sender contains"
 #~ msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
-#~| msgid "Audio inline plugin"
-#~ msgid "Audio Inline"
-#~ msgstr "ਆਡੀਓ ਇਨ-ਲਾਈਨ"
-
 #~| msgid "Copy tool"
 #~ msgid "Copy Tool"
 #~ msgstr "ਟੂਲ ਕਾਪੀ ਕਰੋ"
@@ -26632,9 +26908,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Folder Size"
 #~ msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#~ msgid "User"
-#~ msgstr "ਯੂਜ਼ਰ"
-
 #~ msgid "Subscribe to Other User's Folder"
 #~ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣਾਓ"
 
@@ -26710,9 +26983,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Create items"
 #~ msgstr "ਆਈਟਮਾਂ ਬਣਾਓ"
 
-#~ msgid "Create subfolders"
-#~ msgstr "ਸਬ-ਫੋਲਡਰ ਬਣਾਓ"
-
 #~ msgid "Delete Any Items"
 #~ msgstr "ਕੋਈ ਵੀ ਆਈਟਮਾਂ ਹਟਾਓ"
 
@@ -27065,9 +27335,9 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgstr ""
 #~ "ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਛੋਟੀ ਜਿਹੀ ਤਸਵੀਰ ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹਿਆਂ ਨਾਲ ਅਟੈਚ ਕਰੋ\n"
 #~ "\n"
-#~ "ਪਹਿਲੀ ਵਾਰ ਯੂਜ਼ਰ ਨੂੰ ੪੮*੪੮ png ਚਿੱਤਰ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਇਸ ਬੇਸ੬੪ (Base-"
-#~ "64) ਇੰਕੋਡ ਮੁਤਾਬਕ ਹੈ ਅਤੇ ~/.evolution/faces ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾਂਦਾ ਹੈ। ਇਸ ਨੂੰ ਭੇਜਣ ਲਈ "
-#~ "ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+#~ "ਪਹਿਲੀ ਵਾਰ ਯੂਜ਼ਰ ਨੂੰ ੪੮*੪੮ png ਚਿੱਤਰ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਇਸ ਬੇਸ੬੪ "
+#~ "(Base-64) ਇੰਕੋਡ ਮੁਤਾਬਕ ਹੈ ਅਤੇ ~/.evolution/faces ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾਂਦਾ ਹੈ। ਇਸ ਨੂੰ ਭੇਜਣ "
+#~ "ਲਈ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
 #~ msgid ""
 #~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
@@ -27487,9 +27757,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Choose Image"
 #~ msgstr "ਚਿੱਤਰ ਚੁਣੋ"
 
-#~ msgid "Empty message"
-#~ msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
-
 #~ msgid "Reflow model"
 #~ msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
@@ -27561,9 +27828,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "Basic"
 #~ msgstr "ਬੇਸਿਕ"
 
-#~ msgid "Find Possible Search Bases"
-#~ msgstr "ਸਭ ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਵਰਤੋਂ"
-
 #~ msgid "_Add Address Book"
 #~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਲ(_A)"
 
@@ -28651,9 +28915,6 @@ msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 #~ msgid "A plugin to setup Google Calendar and Contacts."
 #~ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
-#~ msgid "Google sources"
-#~ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
-
 #~ msgid "A plugin to setup GroupWise calendar and contacts sources."
 #~ msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
author	A S Alam <aalam@users.sf.net>	2012-08-19 17:29:44 +0800
committer	A S Alam <aalam@users.sf.net>	2012-08-19 17:29:44 +0800
commit	7d1751cc26a75166019917ec8c3b35e1083d27d6 (patch)
tree	3d8ecd0e0b1734ec7ba7e17f44b41ee56c8eae9c
parent	528eef4f3cd39048578be19cd745b4476019bc0d (diff)
download	gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.gz gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.bz2 gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.lz gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.xz gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.tar.zst gsoc2013-evolution-7d1751cc26a75166019917ec8c3b35e1083d27d6.zip