update for change string

svn path=/trunk/; revision=31579
author: Amanpreet Singh Alam <aman@src.gnome.org> 2006-02-25 15:14:46 +0800
committer: Amanpreet Singh Alam <aman@src.gnome.org> 2006-02-25 15:14:46 +0800
commit: a915d220f70203959dc069e2f9beef174acd1a70 (patch)
tree: 05552d4c17d656f0861a487712a4c06c4c9311a6 /po
parent: 8ac649ab854d44add24f5464be3e2ee5d117437f (diff)
download: gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.gz
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.bz2
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.lz
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.xz
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.zst
gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.zip
1 files changed, 3435 insertions, 3023 deletions
diff --git a/po/pa.po b/po/pa.po
index e0bfb39fd3..9ca508ccf8 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,16 +7,17 @@
 # This file is distributed under the same license as the evolution package.
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # Amanpreet Singh Alam <aalam@redhat.com>, 2004.
-# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
+# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005, 2006.
 # Amanpreet Singh Brar <amanpreetsinghalam@redhat.com>, 2005.
 # Amanpreet Singh Brar <amanpreetalam@yahoo.com>, 2005.
+# Amanpreet Singh Brar Alamwalia <apbrar@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 05:20+0100\n"
-"PO-Revision-Date: 2005-12-26 11:13+0530\n"
+"POT-Creation-Date: 2006-02-24 06:07+0100\n"
+"PO-Revision-Date: 2006-02-25 12:41+0530\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +53,7 @@ msgstr[0] "ਮੌਜੂਦਾ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਫੋਲ
 msgstr[1] "ਮੌਜੂਦਾ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਫੋਲਡਰ ਵਿੱਚ %d ਕਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "ਖੋਲ੍ਹੋ"
 
@@ -97,23 +98,23 @@ msgstr "ਕੈਲੰਡਰ ਵੇਖਣ ਘਟਨਾ"
 msgid "Grab Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੋਵੇ"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "ਨਵਾਂ ਰੁਝੇਵਾਂ"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "ਨਵੇਂ ਸਾਰੇ ਦਿਨ ਦੇ ਰੁਝੇਵੇਂ"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "ਅੱਜ ਤੇ ਜਾਓ"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "ਮਿਤੀ ਤੇ ਜਾਓ"
 
@@ -141,7 +142,7 @@ msgstr "ਕੰਮ ਹਫਤਾ ਦਰਿਸ਼: %s. %s"
 #: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Day View: %s. %s"
-msgstr "ਦਿਨ ਦਰਿਸ਼: %s. %s"
+msgstr "ਦਿਨ ਝਲਕ: %s. %s"
 
 #: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
@@ -152,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲ਼ਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/calendar-component.c:661
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -163,8 +164,8 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/calendar-component.c:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -172,9 +173,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -182,10 +183,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
 #: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -195,8 +196,8 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/calendar-component.c:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -226,12 +227,12 @@ msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲ਼ਈ ਇਸ ਨੂੰ ਦ
 #: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
-msgstr "ਮਹੀਨਾ ਦਰਿਸ਼: %s. %s"
+msgstr "ਮਹੀਨਾ ਝਲਕ: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
-msgstr "ਹਫਤਾ ਦਰਿਸ਼: %s. %s"
+msgstr "ਹਫਤਾ ਝਲਕ: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
@@ -289,7 +290,7 @@ msgstr "ਸਾਰਣੀ ਸੈੱਲ"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲਈ ਦਬਾਓ"
 
@@ -549,33 +550,34 @@ msgstr "ਸਰਟੀਫਿਕੇਟ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
-msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਉ"
+msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1186
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:393
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
+msgid "Evolution Address Book"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚੋ ਸਿਰਨਾਵਾਂ ਖੋਲ੍ਹੋ"
+msgid "Evolution Address Book address pop-up"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਿਰਨਾਵਾਂ ਪੋਪਅੱਪ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਿਰਨਾਵਾ ਦਰਸ਼ਕ"
+msgid "Evolution Address Book address viewer"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਿਰਨਾਵਾਂ ਦਰਸ਼ਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਕਾਰਡ ਦਰਸ਼ਕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਭਾਗ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -584,7 +586,7 @@ msgstr "ਏਵੇਲੂਸ਼ਨ S/Mime ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਬੰ
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਵਿਵਸਥਾ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸਥਾਪਨ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
@@ -593,12 +595,12 @@ msgstr "ਆਪਣੇ S/MIME ਸਰਟੀਫਿਕੇਟ ਇਥੇ ਰੱਖੋ"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
-#: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
-#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
-#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "ਇਸ ਕੰਪਿਊਟਰ ਤੇ"
@@ -609,20 +611,19 @@ msgstr "ਇਸ ਕੰਪਿਊਟਰ ਤੇ"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
-#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
-#: ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:525
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾਂ ਤੇ"
 
@@ -655,9 +656,9 @@ msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ(_B)"
 msgid "Create a new address book"
 msgstr "ਇੱਕ ਸੁਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:386
-msgid "Failed upgrading Addressbook settings or folders."
-msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿਵਸਥਾ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਸਥਾਪਨ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
@@ -669,25 +670,27 @@ msgstr "ਮੂਲ"
 msgid "_Type:"
 msgstr "ਕਿਸਮ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕਿਤਾਬ ਭਾਗ ਨਕਲ ਕਰੋ"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
-msgid "Addressbook"
-msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ"
+msgid "Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਬੁੱਕ"
 
 #: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
@@ -717,25 +720,25 @@ msgid "Address Book Properties"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿਸ਼ੇਸਤਾਵਾਂ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "ਤਬਦੀਲ ਹੋ ਰਿਹਾ ਹੈ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' ਨੂੰ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP ਸਰਵਰ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:768
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
-msgstr "ਸਵੈ-ਪੂਰਤੀ ਵਿਵਸਥਾ"
+msgstr "ਸਵੈ-ਪੂਰਤੀ ਸਥਾਪਨ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1143
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -746,17 +749,17 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ਮੇਲਿੰਗ ਸੂਚੀ ਸੰਪਰਕ ਦਾ ਫਾਰਮਿਟ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।\n"
+"ਮੇਲਿੰਗ ਸੂਚੀ ਸੰਪਰਕ ਦਾ ਫਾਰਮੈਟ ਤਬਦੀਲ ਹੋ ਗਿਆ ਹੈ।\n"
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜਦੋਂ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੀ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1166
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -766,7 +769,7 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜਦੋਂ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੀ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1176
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -776,30 +779,55 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜਦੋਂ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੀ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-view.c:769
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "ਫੋਲਡਰ \"%s\" ਦਾ ਨਾਂ-ਤਬਦੀਲ ਕਰੋ:"
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "ਫੋਲਡਰ ਨਾਂ ਤਬਦੀਲ"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#: ../addressbook/gui/component/addressbook-view.c:445
+msgid "A Folder with this name already exists"
+msgstr "ਇਸ ਨਾਂ ਨਾਲ ਇੱਕ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
+
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "ਨਵੀਂ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:770
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
-#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-mail-list.xml.h:27
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:30
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:772
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:443
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As Vcard..."
+msgstr "Vcard ਇੰਝ ਸੰਭਾਲੋ..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1197
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 
@@ -807,12 +835,12 @@ msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook.c:191
+#: ../addressbook/gui/component/addressbook.c:197
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
+#: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -915,7 +943,7 @@ msgid "Add Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "ਹਮੇਸ਼ਾ"
 
@@ -948,31 +976,46 @@ msgid "Lo_gin:"
 msgstr "ਲਾਗਆਨ(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+msgid "No encryption"
+msgstr "ਕੋਈ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "ਇੱਕ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr "SSL ਇਨਕ੍ਰਿਪਸ਼ਨ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "ਖੋਜ ਫਿਲਟਰ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "ਖੋਜ ਅਧਾਰ(_b):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "ਫਿਲਟਰ ਖੋਜ(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "ਖੋਜ ਫਿਲਟਰ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -981,52 +1024,57 @@ msgstr ""
 "ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਇਕਾਈਆਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ "
 "ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
-"SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP "
+"ਸਰਵਰ SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"ਇਹ ਚੋਣ ਤਾਂ ਕਰੋ, ਜੇਕਰ ਈਵੇਲੂਸ਼ਨ SSL/TLS ਦੀ ਕੋਸ਼ਿਸ ਤਾਂ ਹੀ ਕਰੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ ਵਾਤਾਵਰਣ ਸੁਰੱਖਿਅਤ "
-"ਨਹੀਂ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਜੇਕਰ ਤੁਸੀਂ ਅਤੇ ਤੁਹਾਡਾ LDAP ਸਰਵਰ ਫਾਇਰਵਾਲ ਦੇ ਅੰਦਰ ਹੈ ਤਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ SSL/"
-"TLS ਵਰਤਣ ਦੀ ਜਰੂਰਤ ਨਹੀਂ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਸੁਰੱਖਿਅਤ ਹੋ।"
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 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. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL/TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ "
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ "
 "ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "ਅਧੀਨ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "ਸਹਾਇਕ ਖੋਜ ਆਧਾਰ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr "TLS ਇਨਕ੍ਰਿਪਸ਼ਨ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 "ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹੁੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤੁਸੀਂ ਖੋਜ ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ "
-"ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਤੋਂ ਸ਼ੁਰੂ ਹੋ ਜਾਵੇਗੀ।"
+"ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼ੁਰੂ ਹੋ ਜਾਵੇਗੀ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 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 "
@@ -1037,13 +1085,13 @@ msgstr ""
 "\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਇਕਾਈਆਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ "
 "ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "ਇਹ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਦਾ ਪੂਰਾ ਨਾਂ ਹੈ। ਉਦਾਹਰਨ ਲਈ \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1051,7 +1099,7 @@ msgstr ""
 "ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ "
 "ਤੁਹਾਡੀ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1060,7 +1108,7 @@ msgstr ""
 "ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"Email Address\" "
 "ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹੁੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1068,7 +1116,7 @@ msgstr ""
 "ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸੂਚੀ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ ਵੇਖਣ "
 "ਲਈ ਹੈ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 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 "
@@ -1077,80 +1125,78 @@ msgstr ""
 "ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਮਿਆਰੀ ਪੋਰਟਾਂ "
 "ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇ ਦੀ ਵਰਤੋ ਕਰਕੇ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:303
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "ਜਦੋ ਵੀ ਸੰਭਵ ਹੋਵੇ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "ਡਾਊਨਲੋਡ ਸੀਮਾ(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਲੱਭੋ(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "ਲਾਗਿੰਨ ਢੰਗ(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "ਨਾਂ(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "ਪੋਰਟ(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "ਖੋਜ ਸੀਮਾ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "ਸਮਾਂ-ਸੀਮਾ(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "ਕਾਰਡ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1987
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2020
+#: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "ਮਿੰਟ"
@@ -1162,7 +1208,6 @@ msgstr "ਮਿੰਟ"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
@@ -1215,13 +1260,13 @@ msgid "<b>Work</b>"
 msgstr "<b>ਕੰਮ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
@@ -1229,9 +1274,9 @@ msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:526
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
 
@@ -1272,9 +1317,9 @@ msgstr "ਟੈਲੀਫੋਨ"
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
-#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "ਕੰਮ"
 
@@ -1296,12 +1341,13 @@ msgid "_Birthday:"
 msgstr "ਜਨਮ-ਦਿਨ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1661
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "ਵਰਗ(_C)"
 
@@ -1327,7 +1373,7 @@ msgstr "ਫਾਇਲ ਹੇਠਾਂ(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ(_F):"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
@@ -1398,7 +1444,7 @@ msgstr "ਸਿਰਨਾਵਾਂ"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
@@ -1407,9 +1453,9 @@ msgstr "ਸਿਰਨਾਵਾਂ"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "ਸੋਧਯੋਗ"
 
@@ -2382,9 +2428,9 @@ msgid "Zimbabwe"
 msgstr "ਜਿੰਬਾਬਾਵੇ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
 #: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
@@ -2395,7 +2441,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
@@ -2405,7 +2451,7 @@ msgid "Yahoo Messenger"
 msgstr "ਯਾਹੂ ਸੁਨੇਹੇਦਾਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
@@ -2416,7 +2462,7 @@ msgstr "ਸੇਵਾ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:455
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
@@ -2426,69 +2472,69 @@ msgid "Username"
 msgstr "ਉਪਭੋਗਤਾ ਨਾਂ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Home"
 msgstr "ਘਰ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "ਯਾਹੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
 msgid "Source Book"
 msgstr "ਸਰੋਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
 msgstr "ਨਿਯਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
 msgid "Is New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Writable Fields"
 msgstr "ਲਿਖਣਯੋਗ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
 msgid "Required Fields"
 msgstr "ਲੋਡ਼ੀਦੇ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
 msgstr "ਤਬਦੀਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2687
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2759
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2688
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2760
 msgid "No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2967
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3044
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2496,27 +2542,31 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "ਪੂਰਾ ਸੋਧੋ(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "ਪੂਰਾ ਨਾਂ(_F):"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "ਪੂਰਾ ਨਾਂ(_F)"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "ਈ-ਮੇਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "ਈ-ਪੱਤਰ(_m):"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਚੁਣੋ(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2525,7 +2575,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ ਸੂਚੀ (%s)\n"
 "ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2533,7 +2583,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਸੂਚੀਆਂ\n"
 "ਹਟਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2542,7 +2592,7 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ (%s) ਨੂੰ\n"
 "ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2650,7 +2700,7 @@ msgstr "_IM ਸੇਵਾ:"
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
@@ -2698,7 +2748,7 @@ msgstr "ਸੂਚੀ ਵਿੱਚ ਹੇਠਾਂ ਸੰਪਰਕ ਤੋਂ ਈ-
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2753,11 +2803,28 @@ msgstr ""
 "ਸੰਪਰਕ ਦਾ ਤਬਦੀਲ ਨਾਂ ਜਾਂ ਈ-ਪੱਤਰ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ\n"
 "ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:162
-msgid "Advanced Search"
-msgstr "ਤਕਨੀਕੀ ਖੋਜ"
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "ਵਰਗ ਹੈ"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "ਈ-ਪੱਤਰ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ ਹੁੰਦੇ ਨਾਂ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2772,7 +2839,7 @@ msgstr[1] "%d ਸੰਪਰਕ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2783,12 +2850,12 @@ msgid "Error getting book view"
 msgstr "ਬੁੱਕ ਦਰਿਸ਼ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
@@ -2796,137 +2863,108 @@ msgstr "ਮਾਡਲ"
 msgid "Error modifying card"
 msgstr "ਸੋਧਿਆ ਕਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ ਹੁੰਦੇ ਨਾਂ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Email begins with"
-msgstr "ਈ-ਪੱਤਰ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "ਵਰਗ ਹੈ"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Any field contains"
-msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
-msgid "Advanced..."
-msgstr "ਤਕਨੀਕੀ..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:479
+#: ../calendar/gui/e-meeting-list-view.c:480
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "ਕਿਸਮ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
-msgid "Address Book"
-msgstr "ਸਿਰਨਾਵਾਂ ਬੁੱਕ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "VCard ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1069
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "VCard ਇਸਤਰਾਂ ਸੰਭਾਲੋ(_S)...."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "ਸੂਚੀ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "ਛਾਪੋ(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਨਕਲ(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "ਕੱਟੋ(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:433
-#: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ਨਕਲ(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "ਚਿਪਕਾਉ(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "ਕੋਈ ਵਰਗ"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "ਕਾਰਡ ਛਾਪੋ"
 
@@ -2959,7 +2997,7 @@ msgid "Car Phone"
 msgstr "ਕਾਰ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2972,17 +3010,15 @@ msgstr "ਕੰਪਨੀ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: ../addressbook/gui/widgets/eab-contact-display.c:567
-#: ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ਈ-ਪੱਤਰ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "ਈ-ਪੱਤਰ 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "ਈ-ਪੱਤਰ 3"
 
@@ -3067,9 +3103,9 @@ msgstr "ਰੇਡੀਓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:490
+#: ../calendar/gui/e-meeting-list-view.c:491
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "ਕੰਮ"
 
@@ -3106,31 +3142,31 @@ msgstr "ਵੈਬ ਸਾਇਟ"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "ਚੌਡ਼ਾਈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "ਉਚਾਈ"
 
@@ -3282,107 +3318,107 @@ msgid "Home page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "ਸਫਲਤਾ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "ਪਿੱਛਾ ਰੁਝਿਆ"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "ਰਿਪੋਸਟਰੀ ਬੰਦ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "ਕੋਈ ਸਵੈ ਸੰਪਰਕ ਸੂਚੀ ਪ੍ਰਭਾਸ਼ਿਤ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "ਅਧਿਕਾਰ ਨਹੀ ਹੈ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "ਸਬੰਧ ਨਹੀ ਲੱਭਾ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰਕ ID ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2375
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
+msgid "Canceled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲਾਜ਼ਮੀ ਹੈ"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "TLS not Available"
 msgstr "TLS ਉਪਲੱਬਧ ਨਹੀ ਹੈ"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸਰੋਤ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Not available in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "ਹੋਰ ਗਲਤੀ"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Invalid server version"
 msgstr "ਗਲਤ ਸਰਵਰ ਵਰਜਨ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3392,7 +3428,7 @@ msgstr ""
 "ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਤਿਆਰ ਨਾ ਕੀਤੀ ਗਈ ਹੋਵੇ ਜਾਂ ਹਾਲੇ ਡਾਊਨਲੋਡ ਨਾ ਹੋਈ ਹੋਵੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਨਲਾਇਨ ਢੰਗ "
 "ਨਾਲ ਚਾਲੂ ਹੋਣ ਉਪਰੰਤ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਡਾਊਨਲੋਡ ਕਰੋ ਤਾਂ ਇਸ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਸਕੇ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3401,7 +3437,7 @@ msgstr ""
 "ਅਸੀਂ ਇਹ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮਾਰਗ %s ਹੈ ਅਤੇ "
 "ਤੁਹਾਡੇ ਕੋਲ ਅਧਿਕਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3409,7 +3445,7 @@ msgstr ""
 "ਅਸੀਂ ਇਸ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਸੀਂ ਸਹੀਂ URI ਭਰਿਆ ਹੈ ਜਾਂ LDAP "
 "ਸਰਵਰ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3418,7 +3454,7 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਵਿੱਚ LDAP ਸਹਾਇਤਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ LDAP ਸਹਾਇਤਾ "
 "ਚਾਹੁੰਦੇ ਹੋ, ਤੁਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਪੈਕੇਜ LDAP-enabled ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3426,7 +3462,7 @@ msgstr ""
 "ਅਸੀ ਇਸ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ ਹਾਂ। ਇਸ ਦਾ ਅਰਥ ਇਹ ਹੈ ਕਿ ਜਾਂ ਤਾਂ ਤੁਸੀਂ ਗਲਤ URI "
 "ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ ਜਾਂ ਸਰਵਰ ਪਹੁੰਚ ਤੋਂ ਬਾਹਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:146
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3439,7 +3475,7 @@ msgstr ""
 "ਪਸੰਦ ਨਤੀਜਾਂ ਸਮਾਂ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3451,45 +3487,45 @@ msgstr ""
 "ਵਿੱਚ ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ ਪਸੰਦ ਦਾ ਸਮਾਂ ਹੋਰ ਵਧਾ\n"
 "ਦਿਓ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਪਿੱਠਭੂਮੀ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "ਇਸ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਲਈ ਪਿੱਠਭੂਮੀ ਨੇ ਇਸ ਸਵਾਲ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਇਨਕਾਰੀ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
 msgstr "ਇਹ ਕਿਊਰੀ ਨੂੰ ਸਫਲਤਾਪੂਰਕ ਪੂਰਾ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-#: ../addressbook/gui/widgets/eab-gui-util.c:694
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr "ਸੋਧ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:197
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr "ਹਟਾਉਣ ਸੂਚੀ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:649
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:291
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3504,7 +3540,7 @@ msgstr[1] ""
 "ਸੰਪਰਕ %d ਖੁਦ ਹੀ %d ਝਰੋਖੇ ਖੋਲ ਦੇਣਗੇ।\n"
 "ਕੀ ਤੁਸੀਂ ਇੰਨੇ ਸੰਪਰਕ ਵੇਖਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3513,103 +3549,72 @@ msgstr ""
 "%s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
 "ਕੀ ਇਸ ਉੱਪਰ ਹੀ ਲਿਖਿਆ ਜਾਵੇ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:369
-#: ../addressbook/gui/widgets/eab-gui-util.c:372
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ਸੰਪਰਕ"
 msgstr[1] "ਸੰਪਰਕ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:595
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਚੁਣੋ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "ਸੂਚੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:757
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:760
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:762
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:765
-msgid "Select target addressbook."
-msgstr "ਨਿਯਤ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਚੁਣੋ"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:988
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "ਬਹੁ VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:991
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s ਲਈ VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1032
-#: ../addressbook/gui/widgets/eab-gui-util.c:1050
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(ਕੋਈ ਨਹੀਂ)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "ਮੂਲ ਈ-ਪੱਤਰ"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "ਇੱਕ ਕਾਰਵਾਈ ਚੁਣੋ"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "\"%s\" ਲਈ ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ \"%s\" ਨੂੰ ਸਿਰਨਾਵੇਂ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਦੀ ਜਾਂਚ..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾ ਮਿਲਾਓ"
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
@@ -3638,6 +3643,36 @@ msgstr "ਕਾਰਡ ਵੇਖਾਓ"
 msgid "GTK Tree View"
 msgstr "GTK ਸਰੋਤ ਦਰਿਸ਼"
 
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "ਆਉਟਲੁੱਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "ਆਉਟਲੁੱਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "ਮੌਜੀਲਾ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "ਮੌਜੀਲਾ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
+
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
@@ -3647,7 +3682,7 @@ msgstr "ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ..."
 
 #: ../addressbook/importers/evolution-ldif-importer.c:761
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮਿਟ (.ldif)"
+msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:762
 msgid "Evolution LDIF importer"
@@ -3666,12 +3701,12 @@ msgstr "ਈਵੇਲੂਸ਼ਨ VCard ਆਯਾਤਕਾਰ"
 msgid "Print envelope"
 msgstr "ਲਿਫਾਫਾ ਛਾਪੋ"
 
-#: ../addressbook/printing/e-contact-print.c:1033
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "ਸੰਪਰਕ ਛਾਪੋ"
 
-#: ../addressbook/printing/e-contact-print.c:1124
-#: ../addressbook/printing/e-contact-print.c:1152
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "ਸੰਪਰਕ ਛਾਪੋ"
 
@@ -3713,14 +3748,14 @@ msgstr "ਪਦਲੇਖ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
-msgstr "ਫਾਰਮਿਟ"
+msgstr "ਫਾਰਮੈਟ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "ਸਿਰਲੇਖ"
@@ -3800,7 +3835,7 @@ msgstr "ਪੋਰਟਰੇਟ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
-msgstr "ਦਰਿਸ਼"
+msgstr "ਝਲਕ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
@@ -3824,9 +3859,9 @@ msgstr "ਛਾਂ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-contacts.c:205
 msgid "Size:"
 msgstr "ਅਕਾਰ:"
 
@@ -3928,7 +3963,7 @@ msgstr "ਕਮਾਂਡ ਲਾਇਨ ਆਰਗੂਮਿੰਟ ਗਲਤੀ, ਕ�
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
-msgstr "ਸਿਰਫ csv ਜਾਂ vcard ਫਾਰਮਿਟ ਵਰਤੋਂ।"
+msgstr "ਸਿਰਫ csv ਜਾਂ vcard ਫਾਰਮੈਟ ਵਰਤੋਂ।"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
@@ -4059,37 +4094,37 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੰਮ ਨੂੰ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid "Delete calendar '{0}'?"
-msgstr "ਕੀ ਕੈਲੰਡਰ \"{0}\" ਹਟਾਉਣਾ ਹੈ?"
+msgid "Cannot create a new event"
+msgstr "ਨਵੀਂ ਘਟਨਾ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
 #: ../calendar/calendar.error.xml.h:24
+msgid "Delete calendar '{0}'?"
+msgstr "ਕੀ ਕੈਲੰਡਰ '{0}' ਹਟਾਉਣਾ ਹੈ?"
+
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
 msgstr "ਕੀ ਮੀਮੋ ਸੂਚੀ '{0}' ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
 msgstr "ਕੀ ਕੰਮ ਸੂਚੀ '{0}' ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../calendar/calendar.error.xml.h:26
-msgid "Don't Send"
-msgstr "ਨਾ ਭੇਜੋ"
-
 #: ../calendar/calendar.error.xml.h:27
+msgid "Do _not Send"
+msgstr "ਨਾ ਭੇਜੋ(_n)"
+
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ਡਾਊਨਲੋਡ ਕਰਨਾ ਜਾਰੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਹ ਰੁਝੇਵਾਂ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ਡਾਊਨਲੋਡ ਜਾਰੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਕੰਮ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Editor could not be loaded."
 msgstr "ਸੰਪਾਦਕ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:30
-msgid "Email invitations will be sent to all participants and allow them to RSVP."
-msgstr "ਈ-ਪੱਤਰ ਸੱਦਾ ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜਿਆ ਜਾਵੇਗਾ ਅਤੇ ਉਹ RSVP ਲਈ ਸਵੀਕਾਰ ਹਨ।"
-
 #: ../calendar/calendar.error.xml.h:31
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
@@ -4099,90 +4134,93 @@ msgstr ""
 "ਅਧਿਕਾਰ ਵੀ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:32
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "ਈ-ਮੇਲ ਸੱਦਾ ਸਭ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜੀ ਜਾਵੇਗੀ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਜਵਾਬ ਦੇਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
 msgstr "ਮੀਮੋ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "ਕੰਮ ਸੂਚੀ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
-msgstr "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਹੋਰ ਵਿਅਕਤੀ ਇਸ ਨੂੰ ਆਪਣੀ ਸੂਚੀ ਵਿੱਚੋਂ ਨਹੀਂ ਹਟਾਉਣਗੇ।"
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ "
+"ਜਰਨਲ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਨਾ ਭੇਜੀ ਤਾਂ, ਹੋਰ ਭਾਗ ਲੈਣ ਵਾਲੇ ਮੀਟਿੰਗ ਦੇ ਰੱਦ ਹੋਣ ਬਾਰੇ ਜਾਣ ਨਹੀਂ "
 "ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਹੋਰ ਵਿਅਕਤੀ ਇਸ ਨੂੰ ਆਪਣੀ ਸੂਚੀ ਵਿੱਚੋਂ ਨਹੀਂ ਹਟਾਉਣਗੇ।"
-
-#: ../calendar/calendar.error.xml.h:38
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "ਭੇਜੋ"
+msgstr ""
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ "
+"ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Send Notice"
-msgstr "ਸੂਚਨਾ ਭੇਜੋ"
-
-#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣ ਨਾਲ ਭਾਗ ਲੈਣ ਵਾਲੇ ਆਪਣਾ ਕੈਲੰਡਰ ਠੀਕ ਰੱਖ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਰੁਝੇਵੇਂ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ "
-"ਹੋ ਸਕਦਾ ਹੈ।"
+"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਰੁਝੇਵੇਂ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ "
+"ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ "
-"ਹੋ ਸਕਦਾ ਹੈ।"
+"ਕੁਝ ਨੱਥੀਆਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਕੰਮ ਨੂੰ ਹੁਣੇ ਸੰਭਾਲਣ ਨਾਲ ਇਹ ਨੱਥੀ ਗੁੰਮ ਹੋਣ ਦਾ ਖਤਰਾ ਹੋ "
+"ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸਰਵਰ ਨਾਲ ਕੁਝ ਫੀਚਰ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ਈਵੇਲ਼ੂਸ਼ਨ ਕੈਲੰਡਰ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੰਮ ਅਸਧਾਰਨ ਤਰੀਕੇ ਨਾਲ ਬੰਦ ਹੋ ਗਿਆ ਹੈ।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "ਕੈਲੰਡਰ ਨੂੰ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr "ਕੈਲੰਡਰ, ਜੋ ਤੁਸੀਂ ਚੁਣਿਆ ਹੈ, ਸਿਰਫ਼ ਪੜ੍ਹਨ ਲਈ ਹੈ"
+
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "ਮੀਮੋ ਸੂਚੀ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
@@ -4208,84 +4246,95 @@ msgid "Would you like to save your changes to this appointment?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਰੁਝੇਵੇਂ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to save your changes to this task?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਮੀਮੋ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:55
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr "ਕੀ ਤੁਸੀ ਰਸਾਲਾ ਇੰਦਰਾਜ਼ ਲਈ ਰੱਦ ਕਰਨ ਦੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid "Would you like to save your changes to this task?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਤਬਦੀਲੀ ਨੂੰ ਸੰਭਾਲਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid "Would you like to send a cancelation notice for this journal entry?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਜਰਨਲ ਇੰਦਰਾਜ਼ ਲਈ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੋਗੇ?"
 
 #: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਦੀ ਸੂਚਨਾ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਲਈ ਸੱਦਾ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਮ ਬਾਰੇ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੂਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਮੀਟਿੰਗ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 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:62
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
+"ਤੁਸੀਂ ਇੱਕ ਨਾ-ਸਹਾਇਕ ਗਰੁੱਪਵਾਈਜ਼ (GroupWise) ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਜਾ ਰਹੇ ਹੋ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਨ "
+"ਨਾਲ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਚੰਗੇ ਨਤੀਜਿਆਂ ਲਈ ਸਰਵਰ ਨੂੰ ਸਹਾਇਕ ਵਰਜਨ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ।"
 
 #: ../calendar/calendar.error.xml.h:64
+msgid "You have changed this task, but not yet saved it."
+msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "ਇਸ ਕੰਮ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਤਾਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਪਰ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਗਈਆਂ ਹਨ।"
+
+#: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡਾ ਕੈਲੰਡਰ ਉਦੋਂ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕੇਗਾ, ਜਦ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ ਕਰਦੇ।"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤੁਹਾਡੇ ਕੰਮ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮੁੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਉਪਲੱਬਧ ਨਹੀਂ ਸਕਣਗੇ।"
 
-#: ../calendar/calendar.error.xml.h:66
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:68
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "_Save Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr "ਸੂਚਨਾ ਭੇਜੋ(_S)"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}"
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:48
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
@@ -4332,12 +4381,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "ਕੈਲੰਡਰ"
 
@@ -4378,17 +4427,19 @@ msgid "Memo_s"
 msgstr "ਮੀਮੋ(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
-#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:520
-#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:591
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4408,28 +4459,31 @@ msgstr "ਕੰਮ(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "ਘੰਟੇ"
+msgstr[1] "ਘੰਟੇ"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:356
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s ਜਦੋਂ ਤੱਕ %s"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
@@ -4437,10 +4491,10 @@ msgstr "ਰੁਝੇਵੇਂ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
-#: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "ਟਿਕਾਣਾ:"
 
@@ -4449,18 +4503,17 @@ msgid "Snooze _time:"
 msgstr "ਅੰਤਰਾਲ ਸਮਾਂ(_t):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
@@ -4468,52 +4521,36 @@ msgstr "ਸੋਧ(_E)"
 msgid "_Snooze"
 msgstr "ਬੇਕਾਰ(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "ਰੁਝੇਵੇਂ ਦਾ ਟਿਕਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
-msgid "<b>Calendars</b>"
-msgstr "<b>ਕੈਲੰਡਰ</b>"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
-msgid "Preferences"
-msgstr "ਮੇਰੀ ਪਸੰਦ"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
-msgid "_Configure Alarms"
-msgstr "ਅਲਾਰਮ ਸੰਰਚਨਾ(_C)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
-msgid "_Quit"
-msgstr "ਬਾਹਰ(_Q)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "ਕੋਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤੁਹਾਡੇ ਲਈ %d ਅਲਾਰਮ"
 
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4525,7 +4562,7 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪੁੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4541,7 +4578,7 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
@@ -4558,60 +4595,66 @@ msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
 #. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
+#: ../calendar/gui/alarm-notify/util.c:58
 #, c-format
-msgid "(%d seconds)"
-msgstr "(%d ਸਕਿੰਟ)"
+msgid "(%ld seconds)"
+msgstr "(%ld ਸਕਿੰਟ)"
 
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
 #, c-format
 msgid "(%d %s %d %s)"
 msgstr "(%d %s %d %s)"
 
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:991 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (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/alarm-notify/util.c:65
+#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
 msgid "second"
 msgstr "ਦੂਜਾ"
 
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 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/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
 #, c-format
 msgid "(%d %s)"
 msgstr "(%d %s)"
 
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
 #, c-format
 msgid " %u second"
 msgstr " %u ਸਕਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
 #, c-format
 msgid " %u seconds"
 msgstr " %u ਸਕਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
 #, c-format
 msgid " %u minute"
 msgstr " %u ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
 #, c-format
 msgid " %u minutes"
 msgstr " %u ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
 #, c-format
 msgid "%u hour"
 msgstr " %u ਘੰਟਾ"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
 #, c-format
 msgid "%u hours"
 msgstr " %u ਘੰਟੇ"
@@ -4626,11 +4669,11 @@ msgstr "ਇਕਾਈਆਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰ�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਪਿੱਠਭੂਮੀ ਰੰਗ, \"#rrggbb\" ਫਾਰਮਿਟ ਵਿੱਚ।"
+msgstr "ਅੱਜ ਦੇ ਕੰਮਾਂ ਲਈ ਪਿੱਠਭੂਮੀ ਰੰਗ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ਕੰਮ ਦਾ ਰੰਗ, ਜਿਨਾਂ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀ ਹੈ, \"#rrggbb\" ਫਾਰਮਿਟ ਵਿੱਚ।"
+msgstr "ਕੰਮ ਦਾ ਰੰਗ, ਜਿਨਾਂ ਦੀ ਮਿਆਦ ਲੰਘ ਚੁੱਕੀ ਹੈ, \"#rrggbb\" ਫਾਰਮੈਟ ਵਿੱਚ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
@@ -4669,12 +4712,12 @@ msgid "Default reminder value"
 msgstr "ਮੂਲ ਯਾਦਪੱਤਰ ਮੁੱਲ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ urls"
+msgid "Free/busy server URLs"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆਂ ਨਮੂਨਾ urls"
+msgid "Free/busy template URL"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਨਮੂਨਾ URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
@@ -4694,11 +4737,11 @@ msgstr "ਖਿਤਿਜੀ ਪੱਟੀ ਸਥਿਤੀ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮਿਟ ਵਿੱਚ 0 ਤੋਂ 23"
+msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ 0 ਤੋਂ 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮਿਟ ਵਿੱਚ 0 ਤੋਂ 23"
+msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ 0 ਤੋਂ 23"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -4709,8 +4752,8 @@ msgid "Last alarm time"
 msgstr "ਆਖਰੀ ਅਲਾਰਮ ਸਮਾਂ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਛਾਪਣ ਲਈ ਸਰਵਰ url ਦੀ ਸੂਚੀ ਹੈ।"
+msgid "List of server URLs for free/busy publishing."
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਛਾਪਣ ਲਈ ਸਰਵਰ URL ਦੀ ਸੂਚੀ ਹੈ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
@@ -4848,22 +4891,22 @@ msgstr "ਅੱਜ ਦੇ ਕੰਮ ਦਾ ਰੰਗ"
 msgid "Tasks vertical pane position"
 msgstr "ਕੰਮ ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"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 ""
-"ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
-"ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
+"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗੀ ਖੇਤਰ ਅਤੇ %d ਨੂੰ "
+"ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, 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."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"ਵਿਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ url ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗਤਾ ਖੇਤਰ ਅਤੇ %d ਨੂੰ "
-"ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ"
+"ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
+"ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
@@ -4879,7 +4922,7 @@ msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
-msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮਿਟ"
+msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
@@ -5001,26 +5044,27 @@ msgstr "ਟਿੱਪਣੀ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 msgid "Location contains"
 msgstr "ਟਿਕਾਣਾ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "ਛਾਪੋ"
 
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2117
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
@@ -5041,7 +5085,7 @@ msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋ�
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
@@ -5051,124 +5095,127 @@ msgstr "ਦਿਨ"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
-#: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:216
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "ਵੈੱਬ ਤੇ"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:259
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "ਮੌਸਮ"
 
-#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/calendar-component.c:536
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../calendar/gui/calendar-component.c:839
+#: ../calendar/gui/calendar-component.c:840
 msgid "Failed upgrading calendars."
-msgstr "ਕੈਲੰਡਰ ਦਾ ਨਵੀਨੀਕਰਨ ਅਸਫਲ"
+msgstr "ਕੈਲੰਡਰ ਦਾ ਅੱਪਗਰੇਡ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1138
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ਰੁਝੇਵੇਂ ਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ '%s' ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1151
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ਰੁਝੇਵੇਂ ਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "ਕੈਲੰਡਰ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "ਨਵਾਂ ਰੁਝੇਵਾਂ"
 
-#: ../calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "ਰੁਝੇਵਾਂ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "ਨਵਾਂ ਰੁਝੇਵਾਂ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "ਨਵੇਂ ਸਾਰੇ ਦਿਨ ਦੇ ਰੁਝੇਵੇ"
 
-#: ../calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰੇ ਦਿਨ ਦੇ ਰੁਝੇਵੇਂ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੇਂ ਸਾਰਾ-ਦਿਨ ਰੁਝੇਵੇ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/calendar-component.c:1481
-#: ../calendar/gui/dialogs/event-page.c:870
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
-msgstr "ਦਿਨ ਦਰਿਸ਼"
+msgstr "ਦਿਨ ਝਲਕ"
 
 #: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
-msgstr "ਕੰਮ ਹਫਤਾ ਦਰਿਸ਼"
+msgstr "ਕੰਮ ਹਫਤਾ ਝਲਕ"
 
 #: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
-msgstr "ਹਫਤਾ ਦਰਿਸ਼"
+msgstr "ਹਫਤਾ ਝਲਕ"
 
 #: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
-msgstr "ਮਹੀਨਾ ਦਰਿਸ਼"
+msgstr "ਮਹੀਨਾ ਝਲਕ"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਤਰੀਕਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
-msgstr "ਅਣਪਛਾਤੀ ਸਫਲਤਾ"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "ਅਲਾਰਮ ਸੋਧ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
@@ -5199,17 +5246,17 @@ msgid "Mes_sage:"
 msgstr "ਸੁਨੇਹਾ(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "ਧੁਨੀ ਚਲਾਉ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
@@ -5218,7 +5265,7 @@ msgid "Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "ਇੱਕ ਈ-ਪੱਤਰ ਭੇਜੋ"
 
@@ -5246,8 +5293,10 @@ msgstr "ਬਾਅਦ"
 msgid "before"
 msgstr "ਪਹਿਲਾਂ"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "ਦਿਨ"
 
@@ -5263,14 +5312,6 @@ msgstr "ਹਰ ਵਾਧੂ ਸਮਾਂ"
 msgid "hour(s)"
 msgstr "ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "ਘੰਟੇ"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "ਮਿੰਟ"
@@ -5279,7 +5320,7 @@ msgstr "ਮਿੰਟ"
 msgid "start of appointment"
 msgstr "ਰੁਝੇਵੇਂ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -5288,6 +5329,7 @@ msgid "A_dd"
 msgstr "ਜੋੜ੍ਹੋ(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
@@ -5315,7 +5357,7 @@ msgstr "ਨੱਥੀ ਵਿਸ਼ੇਸਤਾ"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1165
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5334,6 +5376,10 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ:"
 msgid "MIME type:"
 msgstr "MIME ਕਿਸਮ:"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+msgid "Selected Calendars for Alarms"
+msgstr "ਅਲਾਰਮ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
 "60 minutes\n"
@@ -5348,40 +5394,35 @@ msgstr ""
 "10 ਮਿੰਟ\n"
 "05 ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "<b>Publishing</b>"
-msgstr "<b>ਪ੍ਰਕਾਸ਼ਨ</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u ਅਤੇ %d ਨੂੰ ਈ-ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਵਿੱਚੋਂ ਉਪਭੋਗਤਾ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।<i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">ਚੇਤਾਵਨੀ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">ਮੂਲ ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ਸਧਾਰਨ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">ਕੰਮ ਸੂਚੀ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">ਸਮਾਂ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">ਕੰਮ ਹਫ਼ਤਾ</span>"
 
@@ -5394,24 +5435,18 @@ msgid "Display"
 msgstr "ਦਰਿਸ਼"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "ਯੋਗ(_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:7
+#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5421,13 +5456,13 @@ msgstr ""
 "ਘੰਟੇ\n"
 "ਦਿਨ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5445,20 +5480,26 @@ msgstr ""
 "ਸਨਿੱਚਰਵਾਰ\n"
 "ਐਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Publishing Table"
-msgstr "ਸਾਰਣੀ ਪਰਾਕਸ਼ਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
+msgid "Pick a color"
+msgstr "ਰੰਗ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "ਐਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "ਸ਼ਨਿਚੱਰਵਾਰ"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "ਅਲਾਰਮ ਸੂਚਨਾ ਲਈ ਕਲੰਡਰ ਚੁਣੋ"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_o)"
@@ -5468,8 +5509,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤੀ ਦਰਿਸ਼ ਵਿੱਚ ਹਫਤੇ ਦੇ ਦਿਨ ਵੇਖਾਓ(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
 
@@ -5486,52 +5527,49 @@ msgid "Template:"
 msgstr "ਨਮੂਨਾ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "ਸਮਾਂ-ਖੇਤਰ(_z):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
-msgstr "ਸਮਾਂ-ਫਾਰਮਿਟ:"
+msgstr "ਸਮਾਂ-ਫਾਰਮੈਟ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "W_eek starts:"
-msgstr "ਹਫਤਾ ਸ਼ੁਰੂ(_e):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
+#. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "ਹਫਤਾ ਸ਼ੁਰੂ(_k):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "ਕਾਰਜੀ ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ਘੰਟੇ (ਸਵੇਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "_Add URL"
-msgstr "URL ਸ਼ਾਮਿਲ(_A)"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "ਇਕਾਈਆਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ(_A)"
@@ -5544,85 +5582,85 @@ msgstr "ਮਹੀਨਾ ਦਰਿਸ਼ ਵਿੱਚ ਹਫਤਾ-ਅੰਤ ਸਮ�
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼ੁਰੂ(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "ਸ਼ੁੱਕਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪੂਰਨ ਕੰਮ ਇਸ ਬਾਅਦ ਓਹਲੇ ਕਰੋ(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "ਸੋਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "ਸ਼ਨਿਚੱਰ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤੇ ਅਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਕਾਤ ਵੇਖਾਓ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "ਸਮਾਂ ਵੰਡ(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "ਮੰਗਲ(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "ਬੁੱਧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "ਹਰ ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
+#: ../calendar/gui/dialogs/calendar-setup.c:288
 msgid "Copy calendar contents locally for offline operation"
 msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਨਕਲ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Copy task list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਨਕਲ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Copy memo list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਨਕਲ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "ਰੰਗ(_o):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "ਕੰਮ ਸੂਚੀ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "ਮੀਮੋ ਸੂਚੀ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "ਕੰਮ ਸੂਚੀ ਗੁਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:449
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ"
 
@@ -5634,11 +5672,6 @@ msgstr "ਕੈਲੰਡਰ ਸ਼ਾਮਿਲ"
 msgid "Add Task List"
 msgstr "ਕੰਮ ਸੂਚੀ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "ਰੰਗ ਚੁਣੋ"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "ਕੈਲੰਡਰ ਸ਼ਾਮਿਲ(_A)"
@@ -5648,18 +5681,19 @@ msgid "_Add Task List"
 msgstr "ਕੰਮ ਸੂਚੀ ਸ਼ਾਮਿਲ(_A)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_R):"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "ਹਫਤੇ"
@@ -5708,160 +5742,164 @@ msgstr "%s  ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ਤੁਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤੀ ਹੈ, ਸੰਪਾਦਕ ਬੰਦ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
 msgstr "ਜਾਂਚ ਗਲਤੀ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2270
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2281
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "ਨੱਥੀ ਸੁਨੇਹਾ - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:200
-#: ../calendar/gui/dialogs/comp-editor.c:370 ../composer/e-msg-composer.c:2830
-#: ../composer/e-msg-composer.c:3009
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3034
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਨੱਥੀ ਸੁਨੇਹੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:800
 msgid "Could not update object"
-msgstr "ਇਕਾਈ ਦਾ ਨਵੀਨੀਕਰਨ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
+msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
+#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> ਨੱਥੀ"
 msgstr[1] "<b>%d</b> ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:958
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:961
-#: ../calendar/gui/dialogs/comp-editor.c:1401
+#: ../calendar/gui/dialogs/comp-editor.c:978
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../calendar/gui/dialogs/event-page.c:1861
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3573
+#: ../composer/e-msg-composer.c:3597
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3576
+#: ../composer/e-msg-composer.c:3600
 msgid "_Add attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "ਨੱਥੀ ਬਟਨ: ਕਿਰਪਾ ਕਰਕੇ ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
+#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../mail/em-format-html-display.c:2063
+msgid "Show Attachments"
+msgstr "ਨੱਥੀ ਵੇਖਾਓ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1467
+msgid "Press space key to toggle attachment bar"
+msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2028
-#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2117
 msgid "Edit Appointment"
 msgstr "ਰੁਝੇਵਾਂ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/comp-editor.c:2077
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2123
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../calendar/gui/dialogs/comp-editor.c:2079
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਰੁਝੇਵਾਂ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2040
-#: ../calendar/gui/dialogs/comp-editor.c:2083
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2129
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2042
-#: ../calendar/gui/dialogs/comp-editor.c:2085
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2045
-#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:2134
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ਜਰਨਲ ਇੰਦਰਾਜ਼ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2056
-#: ../calendar/gui/dialogs/comp-editor.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2144
 msgid "No summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2608
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
-#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
-#: ../widgets/misc/e-attachment-bar.c:341
+#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2734
-#: ../calendar/gui/dialogs/comp-editor.c:2758
+#: ../calendar/gui/dialogs/comp-editor.c:2741
+#: ../calendar/gui/dialogs/comp-editor.c:2795
+#: ../calendar/gui/dialogs/comp-editor.c:2819
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "ਜੇਕਰ ਨਵੀਨੀਕਰਨ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
+msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2782
+#: ../calendar/gui/dialogs/comp-editor.c:2843
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
@@ -5938,202 +5976,216 @@ msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ:"
 msgid "Enter Delegate"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਦਿਓ"
 
-#: ../calendar/gui/dialogs/event-editor.c:531
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "ਰੁਝੇਵੇਂ(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:13
+#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
-#: ../calendar/gui/dialogs/event-page.c:876
-#: ../calendar/gui/dialogs/task-page.c:444
-msgid "Or_ganizer"
-msgstr "ਪ੍ਰਬੰਧਕ(_g)"
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2717
+msgid "This event has alarms"
+msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
+
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "ਕੈਲੰਡਰ(_n):"
+
+#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.c:446
+msgid "Or_ganizer:"
+msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:919
 msgid "_Delegatees"
-msgstr "ਪਰਤੀਨਿਧ(_D)"
+msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:921
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1073
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1076
+#: ../calendar/gui/dialogs/event-page.c:1092
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1252
+#: ../calendar/gui/dialogs/event-page.c:1270
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1275
+#: ../calendar/gui/dialogs/event-page.c:1293
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1282
+#: ../calendar/gui/dialogs/event-page.c:1300
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/meeting-page.c:464
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "ਚੁਣੇ ਪ੍ਰਬੰਧਕ ਦਾ ਖਾਤਾ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1443
-#: ../calendar/gui/dialogs/meeting-page.c:470
-#: ../calendar/gui/dialogs/task-page.c:911
+#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1458
-#: ../calendar/gui/dialogs/meeting-page.c:485
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1862
-#: ../calendar/gui/dialogs/meeting-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1184
+#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "ਸ਼ਾਮਿਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2553
+#: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2808
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2816
+#: ../calendar/gui/dialogs/event-page.c:2928
 #, 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:2824
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 msgstr[1] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 
+#: ../calendar/gui/dialogs/event-page.c:2952
+msgid "Customize"
+msgstr "ਪਸੰਦ"
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2957
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀ"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "ਮੁਲਾਕਾਤ ਤੋਂ 1 ਦਿਨ ਪਹਿਲਾਂ"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ 1 ਘੰਟਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ 15 ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "ਮੁਲਾਕਾਤ ਤੋਂ 1 ਦਿਨ ਪਹਿਲਾਂ"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "ਦਰਸ਼ਕ(_N)..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "ਪਸੰਦ(_u)"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ਵਰਗ(_t)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "ਕੈਲੰਡਰ(_n):"
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "ਅਲਾਰਮ ਸੋਧ:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "ਵੇਰਵਾ(_e):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "ਘਟਨਾ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "ਟਿਕਾਣਾ(_i):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "ਪ੍ਰਬੰਧਕ(_O):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "ਸੰਖੇਪ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "ਵੇਰਵਾ(_D):"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "ਅਲਾਰਮ ਸੈੱਟ(_S)\t"
+msgid "_Alarm"
+msgstr "ਅਲਾਰਮ(_A)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "ਸਮਾਂ(_T):"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
 msgstr "ਲਈ"
 
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
 msgid "until"
 msgstr "ਜਦ ਤੱਕ"
 
-#: ../calendar/gui/dialogs/meeting-page.c:306
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>ਪਰਤੀਨਿਧ(_g)</b>"
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "ਪ੍ਰਤੀਨਿਧ(_G)"
 
-#: ../calendar/gui/dialogs/meeting-page.c:310
-msgid "<b>From:</b>"
-msgstr "<b>ਵਲੋਂ:</b>"
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:316
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
-#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
-#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀ"
+#  * From
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "ਵਲੋਂ:"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6172,14 +6224,14 @@ msgstr "ਮੈਂਬਰ"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:502
+#: ../calendar/gui/e-meeting-list-view.c:503
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:514
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6206,47 +6258,22 @@ msgstr "ਪ੍ਰਬੰਧਕ"
 msgid "Organizer:"
 msgstr "ਪ੍ਰਬੰਧਕ:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/gui/dialogs/memo-page.c:490
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">ਅਧਾਰ</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "ਵਰਗੀਕਰਨ(_f):"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
-msgid "Confidential"
-msgstr "ਗੁਪਤ"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Private"
-msgstr "ਨਿੱਜੀ"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
-msgid "Public"
-msgstr "ਸਰਵਜਨਕ"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ਸਮੂਹ(_G):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "IM ਪਰਸੰਗ(_M):"
 
@@ -6318,51 +6345,98 @@ msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਰੁਝੇਵੇਂ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
 msgstr "ਆਵਰਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#. 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:928
 msgid "on"
 msgstr "ਚਾਲੂ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [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/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (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:1003
 msgid "third"
 msgstr "ਤੀਜਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (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:1008
 msgid "fourth"
 msgstr "ਚੌਥਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (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:1013
 msgid "last"
 msgstr "ਆਖਰੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#. 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:1039
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "1ਲੇ ਤੋਂ 10ਵਾਂ"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "11ਵੇਂ ਤੋਂ 20ਵਾਂ"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "21ਵੇਂ ਤੋਂ 31ਵਾਂ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
 msgstr "ਦਿਨ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#. 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:1219
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1371
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
 msgid "Date/Time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
@@ -6379,27 +6453,37 @@ msgstr "<b>ਨਮੂਨਾ</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>ਦੁਹਰਾਓ</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "ਹਰੇਕ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
 msgstr "ਇਹ ਰੁਝੇਵਾਂ ਮੁੜ ਹੈ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "ਮਹੀਨਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "ਹਫਤਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
@@ -6408,7 +6492,7 @@ msgstr "ਸਾਲ"
 msgid "Completed date is wrong"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:523
+#: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "ਵੈਬ ਸਫਾ"
 
@@ -6425,46 +6509,46 @@ msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "ਉਚਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:228
 #: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "ਨਿਊਨਤਮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1015
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
 
@@ -6477,7 +6561,7 @@ msgid "Stat_us:"
 msgstr "ਸਥਿਤੀ(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
 
@@ -6494,24 +6578,20 @@ msgstr "ਪਹਿਲ(_P):"
 msgid "_Web Page:"
 msgstr "ਵੈਬ ਸਫ਼ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:437
-msgid "_Group"
-msgstr "ਗਰੁੱਪ(_G)"
-
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1614
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
@@ -6520,10 +6600,6 @@ msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ
 msgid "Categor_ies..."
 msgstr "ਵਰਗ(_i)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "ਵੇਰਵਾ(_e):"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "ਪ੍ਰਬੰਧਕ(_g):"
@@ -6542,7 +6618,7 @@ msgstr "ਮਿਆਦ(_D):"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>ਕੈਲੰਡਰ ਵਿਹਲਾ/ਰੁਝਿਆ(_a)</b>"
+msgstr "<b>ਕੈਲੰਡਰ ਵੇਹਲਾ/ਰੁਝਿਆ(_a)</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
@@ -6554,7 +6630,7 @@ msgstr "<b>ਪ੍ਰਕਾਸ਼ਣ ਟਿਕਾਣਾ(_L)</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਪ੍ਰਕਾਸ਼ਨ ਵਿਵਸਥਾ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪ੍ਰਕਾਸ਼ਨ ਸਥਾਪਨ"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
@@ -6565,7 +6641,7 @@ msgid "_Manual"
 msgstr "ਦਸਤੀ(_M)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ(_P):"
 
@@ -6583,112 +6659,127 @@ msgstr "ਉਪਭੋਗਤਾ ਨਾਂ(_U):"
 msgid "_Weekly"
 msgstr "ਹਫਤਾਵਾਰੀ(_W)"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ਦਿਨ"
 msgstr[1] "%d ਦਿਨ"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#: ../calendar/gui/e-alarm-list.c:405
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:408
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ਘੰਟਾ"
 msgstr[1] "%d ਘੰਟੇ"
 
-#: ../calendar/gui/e-alarm-list.c:410
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:414
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ਮਿੰਟ"
 msgstr[1] "%d ਮਿੰਟ"
 
-#: ../calendar/gui/e-alarm-list.c:415
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:420
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ਸਕਿੰਟ"
 msgstr[1] "%d ਸਕਿੰਟ"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
 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:476
+#: ../calendar/gui/e-alarm-list.c:478
 #, 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:481
+#: ../calendar/gui/e-alarm-list.c:483
 #, 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:488
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ਤੇ ਮੁਲਾਕਤ ਸ਼ੁਰੂ"
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. 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:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ਰੁਝੇਵੇਂ ਦੇ ਅੰਤ ਤੋ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. 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:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "ਰੁਝੇਵੇਂ ਤੋ ਬਾਅਦ %s %s "
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "ਰੁਝੇਵੇ ਦਾ ਅੰਤ %s"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. 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:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s, %s ਤੇ"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. 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:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "ਅਣਪਛਾਤੀ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2826
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:201
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
 msgstr "ਮੀਮੋ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "ਸੰਖੇਪ:"
@@ -6705,9 +6796,9 @@ msgstr "ਮਿਆਦ:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:908
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
@@ -6715,6 +6806,21 @@ msgstr "ਸਥਿਤੀ:"
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+msgid "Public"
+msgstr "ਸਰਵਜਨਕ"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr "ਨਿੱਜੀ"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr "ਗੁਪਤ"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
@@ -6731,17 +6837,17 @@ msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
-msgstr "ਵਿਹਲਾ"
+msgstr "ਵੇਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:608
+#: ../calendar/gui/e-cal-model-tasks.c:603
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6751,196 +6857,191 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:809
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ਨਹੀ"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1150
-#: ../calendar/gui/e-itip-control.c:1291
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:690
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "ਅਣਪਛਾਤਾ"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "ਆਵਿਰਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
+#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
+#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
 msgid "Select folder to save selected attachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
+#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ ਚਿੱਤਰ %s"
 
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
-#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "ਇਸ ਤਰਾਂ ਸੰਭਾਲੋ(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "ਪਿੱਠਭੂਮੀ ਬਣਾਉ(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:272
+#: ../calendar/gui/e-cal-popup.c:274
 msgid "_Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
+#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ਨਾਲ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:527
-msgid "Task Table"
-msgstr "ਕੰਮ ਸਾਰਣੀ"
-
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
-msgstr "ਇਕਾਈ ਦਾ ਨਵੀਨੀਕਰਨ ਜਾਰੀ ਹੈ"
+msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
-#: ../composer/e-msg-composer.c:1339
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫਾ ਖੋਲੋ(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1539
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ਛਾਪੋ(_P)..."
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ਕੱਟੋ(_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1185
-#: ../calendar/gui/e-calendar-view.c:1542
-#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ਚਿਪਕਾਓ(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1191
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1192
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਪੂਰੇ ਹੋਏ ਨਿਰਧਾਰਿਤ ਕਰੋ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1197
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "ਚੁਣੇ ਕੰਮ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1430
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ਕੰਮ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -6950,7 +7051,7 @@ msgstr "ਕੰਮ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 msgid "% Complete"
 msgstr "% ਮੁਕੰਮਲ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "ਮੁਕੰਮਲ"
 
@@ -6975,105 +7076,120 @@ msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ"
 msgid "Task sort"
 msgstr "ਕੰਮ ਕਰਮਬੱਧ"
 
-#: ../calendar/gui/e-calendar-view.c:1267
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "ਇਕਾਈਆਂ ਭੇਜੋ"
 
-#: ../calendar/gui/e-calendar-view.c:1269
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "ਇਕਾਈਆਂ ਦੀ ਨਕਲ"
 
-#: ../calendar/gui/e-calendar-view.c:1533
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "ਨਵਾਂ ਰੁਝੇਵਾਂ(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1534
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "ਨਵੇ ਸਾਰੇ ਦਿਨ ਦੇ ਰੁਝੇਵੇਂ(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1535
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1536
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1546
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "ਪ੍ਰਚਲਿਤ ਦਰਿਸ਼(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1548
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "ਅੱਜ ਚੁਣੋ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "ਮਿਤੀ ਚੁਣੋ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਨਕਲ(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1566
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1567
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
-msgstr "ਪਰਤੀਨਿਧ ਮੀਟਿੰਗ(_D)..."
+msgstr "ਪ੍ਰਤੀਨਿਧ ਮੀਟਿੰਗ(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1568
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1574
+#: ../calendar/gui/e-calendar-view.c:1612
+msgid "_Reply"
+msgstr "ਜਵਾਬ(_R)"
+
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
+
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1951
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2034
+#, c-format
+msgid "Organizer: %s"
+msgstr "ਪ੍ਰਬੰਧਕ: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1965 ../calendar/gui/print.c:2339
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:115
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7084,7 +7200,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar 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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
@@ -7095,412 +7215,408 @@ msgstr "%02i ਮਿੰਟ ਵੰਡ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
-#: ../calendar/gui/e-itip-control.c:762
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾਂ (ਗੁੰਝਲਦਾਰ ਆਵਰਤੀ)"
 
-#: ../calendar/gui/e-itip-control.c:773
+#: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
-#: ../calendar/gui/e-itip-control.c:780
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " ਅਤੇ "
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱਚੋਂ"
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:812
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹੀਨੇ"
 msgstr[1] "ਮਹੀਨੇ ਵਿੱਚ %d ਵਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:819
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#: ../calendar/gui/e-itip-control.c:830
+#: ../calendar/gui/e-itip-control.c:827
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "ਕੁੱਲ %d ਵਾਰ"
 msgstr[1] "ਕੁੱਲ %d ਵਾਰ "
 
-#: ../calendar/gui/e-itip-control.c:839
+#: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
 msgstr ", ਤੇ ਸਮਾਪਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:863
+#: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:910
+#: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:967
+#: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "iCalendar ਗਲਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
-#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
-#: ../plugins/itip-formatter/itip-view.c:337
+#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1090
+#: ../calendar/gui/e-itip-control.c:1084
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਤੇ ਮੁੜ ਵਿਚਾਰ ਕਰੋ ਅਤੇ ਮੇਨੂ ਤੋਂ ਤੱਦ ਕੋਈ ਕਾਰਵਾਈ ਚੁਣੋ।"
 
-#: ../calendar/gui/e-itip-control.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../calendar/gui/itip-utils.c:546
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/itip-utils.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "ਸਵੀਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਸਵੀਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1224
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ,ਇਹ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦੀ ਹੈ।"
+msgstr "ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1232
-msgid "The task has been cancelled, however it could not be found in your task lists"
-msgstr "ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ,ਇਹ ਤੁਹਾਡੀ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦਾ ਹੈ"
+#: ../calendar/gui/e-itip-control.c:1226
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ ਤੁਹਾਡੀ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1305
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "ਮੀਟਿੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ %s ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1314
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "ਮੀਟਿੰਗ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
-msgstr "ਮੀਟਿੰਗ ਨਵੀਨੀਕਰਨ"
+msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ਨਵੀਨੀਤਮ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦੀ ਹੈ।"
+msgstr "<b>%s</b> ਨਵੀਂ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update Request"
-msgstr "ਮੀਟਿੰਗ ਨਵੀਨੀਕਰਨ ਬੇਨਤੀ"
+msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ ਮੰਗ"
 
-#: ../calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "ਮੀਟਿੰਗ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1342
 #, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
+msgid "<b>%s</b> has canceled a meeting."
+msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1349
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1343
+msgid "Meeting Cancelation"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਨਾ ਬੇਸਮਝ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "ਗਲਤ ਮੀਟਿੰਗ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ਨੇ %s ਨੂੰ ਕਾਰਜ ਪੂਰਾ ਕਰਨ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ਤੁਹਾਨੂੰ ਇੱਕ ਕੰਮ ਲਈ ਕਹਿ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
 msgstr "ਕੰਮ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ਇੱਕ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Update"
-msgstr "ਕੰਮ ਨਵੀਨੀਕਰਨ"
+msgstr "ਕੰਮ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ਤਾਜੀ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update Request"
-msgstr "ਕੰਮ ਨਵੀਨੀਕਰਨ ਬੇਨਤੀ"
+msgstr "ਕੰਮ ਅੱਪਡੇਟ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1411
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਲਈ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "ਕੰਮ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1419
 #, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1426
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1420
+msgid "Task Cancelation"
 msgstr "ਕੰਮ ਰੱਦੀਕਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "ਗਲਤ ਕੰਮ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ਨੇ ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
+msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
-msgstr " ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> ਨੇ ਤੁਹਾਡੀ ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
+msgstr "<b>%s</b> ਨੇ ਤੁਹਾਡੀ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਬੇਨਤੀ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ਨੇ ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
+msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆਂ ਜਵਾਬ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
-msgstr "ਗਲਤ ਵਿਹਲਾ/ਰੁਝਿਆ ਸੁਨੇਹਾ"
+msgstr "ਗਲਤ ਵੇਹਲਾ/ਰੁਝਿਆ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1552
+#: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
 msgstr "ਸੁਨੇਹਾ ਆਪਣੇ ਸਹੀਂ ਸਰੂਪ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਨਾ-ਸਹਾਇਕ ਬੇਨਤੀਆਂ ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1644
+#: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਇੱਕ ਜਾਇਜ ਕੈਲੰਡਰ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1676
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਕੋਈ ਵੀ ਵੇਖਣਯੋਗ ਕੈਲੰਡਰ ਇਕਾਈ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1910
+#: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "ਨਵੀਨੀਕਰਮ ਪੂਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:1938
+#: ../calendar/gui/e-itip-control.c:1932
 msgid "Object is invalid and cannot be updated\n"
-msgstr "ਇਕਾਈ ਗਲਤ ਹੈ ਅਤੇ ਨਵੀਨੀਕਰਨ ਕੀਤਾ ਜਾ ਸਕਿਆ\n"
+msgstr "ਇਕਾਈ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:1948
+#: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਿਲ ਕਰਨਾ ਹੈ?"
 
-#: ../calendar/gui/e-itip-control.c:1960
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "ਗਲਤ ਸਥਿਤੀ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਨਵੀਨੀਕਰਨ ਸੰਭਵ ਨਹੀਂ ਹੈ!\n"
+msgstr "ਗਲਤ ਹਾਲਤ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ\n"
 
-#: ../calendar/gui/e-itip-control.c:1980
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "ਦਰਸ਼ਕ ਦੀ ਸਥਿਤੀ ਦਾ ਨਵੀਨੀਕਰਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
+msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:2010
-msgid "Removal Complete"
-msgstr "ਹਟਾਉਣ ਦੀ ਕਾਰਵਾਈ ਪੂਰੀ"
-
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
 msgstr "ਇਕਾਈ ਭੇਜੀ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr " ਇਕਾਈ ਨੂੰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2165
+#: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "ਕਾਰਵਾਈ ਚੁਣੋ"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2202
 msgid "Update"
-msgstr "ਨਵੀਨੀਕਰਨ"
+msgstr "ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2230
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "ਸਵੀਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "ਆਰਜ਼ੀ ਸਵੀਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਭੇਜੋ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update respondent status"
-msgstr "ਜਵਾਬ ਦੇਣ ਵਾਲਿਆਂ ਦੀ ਸਥਿਤੀ ਦਾ ਨਵੀਨੀਕਰਨ"
+msgstr "ਜਵਾਬ ਦੇਣ ਵਾਲਿਆਂ ਦੀ ਹਾਲਤ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
@@ -7542,99 +7658,99 @@ msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 msgid "date-start"
 msgstr "ਸ਼ੁਰੂਆਤ ਮਿਤੀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "ਪ੍ਰਧਾਨ"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "ਲੋੜੀਦੀ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:803
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:806
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "ਲੋਡ਼ੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:816
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/itip-utils.c:555
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/itip-utils.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:463
+#: ../calendar/gui/e-meeting-list-view.c:464
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "ਕਾਰਵਾਈ ਅਧੀਨ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7642,93 +7758,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452
-#: ../widgets/misc/e-dateedit.c:1736
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤੋਂ ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "ਸੰਪਰਕ(_t)..."
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr "ਦਰਸ਼ਕ(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "ਚੋਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ ਕੰਮ-ਘੰਟੇ ਹੀ ਵੇਖਾਉ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "ਆਕਾਰ ਵੱਡਾ ਵੇਖਾਓ(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਨਵੀਨੀਕਰਨ(_U)"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਅੱਪਡੇਟ(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "ਸਵੈ-ਚੋਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਸਰੋਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਇੱਕ ਸਰੋਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "ਲੋਡ਼ੀਦੇ ਵਿਅਕਤੀ(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "ਲੋਡ਼ੀਦੇ ਲੋਕ ਤੇ ਇੱਕ ਸਰੋਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ(_E):"
 
-#: ../calendar/gui/e-memo-table.c:276
-msgid "Memo Table"
-msgstr "ਮੀਮੋ ਸਾਰਣੀ"
-
-#: ../calendar/gui/e-memo-table.c:872
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
@@ -7736,8 +7845,8 @@ msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 msgid "Memo sort"
 msgstr "ਮੀਮੋ ਕ੍ਰਮਬੱਧ"
 
-#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
-#: ../calendar/gui/gnome-cal.c:2565
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7746,16 +7855,16 @@ msgstr ""
 "%s ਤੇ ਗਲਤੀ:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:776
+#: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
 msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:861
+#: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
 msgid "Deleting selected objects..."
 msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
@@ -7764,26 +7873,26 @@ msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹ�
 msgid "Enter the password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
-#: ../calendar/gui/e-tasks.c:871
+#: ../calendar/gui/e-tasks.c:866
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:958
+#: ../calendar/gui/e-tasks.c:953
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1203
+#: ../calendar/gui/e-tasks.c:1198
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1253
+#: ../calendar/gui/e-tasks.c:1248
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
 #: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "ਸਮਾਂ-ਖੇਤਰ ਬਟਨ"
+msgid "Select Timezone"
+msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 
 #  strftime format %d = day of month, %B = full
 #  month name. You can change the order but don't
@@ -7791,42 +7900,42 @@ 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:329 ../calendar/gui/print.c:1510
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:792
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "ਨਵੀਵੀਕਰਨ ਸਵਾਲ"
 
-#: ../calendar/gui/gnome-cal.c:2240
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "ਦਰਿਸ਼ ਸੋਧ(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "ਸੋਧ ਝਲਕ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2246
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2408
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ਤੇ ਰੁਝੇਵੇਂ ਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../calendar/gui/gnome-cal.c:2427
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਲੋਡ ਕਰੋ"
 
-#: ../calendar/gui/gnome-cal.c:2531
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "%s ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:3449
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -7886,129 +7995,130 @@ msgstr "ਸਤੰਬਰ"
 msgid "_Select Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_S)"
 
-#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
-#: ../calendar/gui/itip-utils.c:440
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:387
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "ਜਰਨਲ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:639
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:688
 msgid "Updated"
 msgstr "ਨਵੀਨ"
 
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:696
 msgid "Refresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
 
-#: ../calendar/gui/itip-utils.c:577
+#: ../calendar/gui/itip-utils.c:700
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸੁਝਾਅ"
 
-#: ../calendar/gui/itip-utils.c:648
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "ਵਿਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../calendar/gui/itip-utils.c:658
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
 
-#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ਨਕਲ"
 
-#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: ../calendar/gui/memos-component.c:452
+#: ../calendar/gui/memos-component.c:453
 msgid "Properties..."
 msgstr "ਵਿਸ਼ੇਸਤਾਵਾਂ..."
 
-#: ../calendar/gui/memos-component.c:525
+#: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮੀਮੋ"
 msgstr[1] "%d ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
-#: ../mail/mail-component.c:559
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d ਚੁਣਿਆ"
 msgstr[1] ", %d ਚੁਣੇ"
 
-#: ../calendar/gui/memos-component.c:574
+#: ../calendar/gui/memos-component.c:575
 msgid "Failed upgrading memos."
 msgstr "ਮੀਮੋ ਅੱਪਗਰੇਡ ਅਸਫ਼ਲ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/memos-component.c:870
+#: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ਮੀਟਿੰਗ ਅਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਮੀਮੋ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/memos-component.c:883
+#: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
 msgstr "ਮੀਮੋ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/memos-component.c:974
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "ਮੀਮੋ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1156
 msgid "_Memo"
 msgstr "ਮੀਮੋ(_M)"
 
-#: ../calendar/gui/memos-component.c:1159
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਇਕਾਈ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "ਨਵਾਂ ਮੀਮੋ ਸੂਚੀ"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1164
 msgid "Memo l_ist"
 msgstr "ਮੀਮੋ ਸੂਚੀ(_I)"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 
@@ -8016,7 +8126,7 @@ msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਛਾਪੋ"
 
-#: ../calendar/gui/migration.c:156
+#: ../calendar/gui/migration.c:162
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8027,7 +8137,7 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ, ਜਦ ਤੱਕ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਫੋਲਡਰ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੀ ਹੈ..."
 
-#: ../calendar/gui/migration.c:160
+#: ../calendar/gui/migration.c:166
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8040,322 +8150,329 @@ msgstr ""
 
 #  FIXME: set proper domain/code
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldb ਤੋਂ ਪੁਰਾਣੀ ਵਿਵਸਥਾ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
+msgstr "evolution/config.xmldb ਤੋਂ ਪੁਰਾਣੇ ਸਥਾਪਨ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:782
+#: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ਕੈਲੰਡਰ `%s' ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/print.c:492
+#. Can't be zero
+#: ../calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d ਸਕਿੰਟ)"
+
+#: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1ਹਿਲਾਂ"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "2nd"
 msgstr "2ਜਾ"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "3rd"
 msgstr "3ਜਾ"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "4th"
 msgstr "4ਵਾਂ"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
 msgid "5th"
 msgstr "5ਵਾਂ"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "6th"
 msgstr "6ਵਾਂ"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "7th"
 msgstr "7ਵਾਂ"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "8th"
 msgstr "8ਵਾਂ"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "9th"
 msgstr "9ਵਾਂ"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
 msgid "10th"
 msgstr "10ਵਾਂ"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "11th"
 msgstr "11ਵਾਂ"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "12th"
 msgstr "12ਵਾਂ"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "13th"
 msgstr "13ਵਾਂ"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "14th"
 msgstr "14ਵਾਂ"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
 msgid "15th"
 msgstr "15ਵਾਂ"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "16th"
 msgstr "16ਵਾਂ"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "17th"
 msgstr "17ਵਾਂ"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "18th"
 msgstr "18ਵਾਂ"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "19th"
 msgstr "19ਵਾਂ"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
 msgid "20th"
 msgstr "20ਵਾਂ"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "21st"
 msgstr "21ਵਾਂ"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "22nd"
 msgstr "22ਵਾਂ"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "23rd"
 msgstr "23ਵਾਂ"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "24th"
 msgstr "24ਵਾਂ"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
 msgid "25th"
 msgstr "25ਵਾਂ"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "26th"
 msgstr "26ਵਾਂ"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "27th"
 msgstr "27ਵਾਂ"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "28th"
 msgstr "28ਵਾਂ"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "29th"
 msgstr "29ਵਾਂ"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
 msgid "30th"
 msgstr "30ਵਾਂ"
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:499
 msgid "31st"
 msgstr "31ਵਾਂ"
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "ਐਤ"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "ਸੋਮ"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "ਮੰਗਲ"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "ਬੁੱਧ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "ਵੀਰ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "ਸ਼ੁੱਕਰ"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "ਸ਼ਨਿਚੱਰ"
 
 #. Day
-#: ../calendar/gui/print.c:1926
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "ਚੁਣਿਆ ਦਿਨ (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1951 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1952
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1956 ../calendar/gui/print.c:1958
-#: ../calendar/gui/print.c:1959
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1963
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "ਚੁਣਿਆ ਹਫ਼ਤਾ (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1971
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "ਚੁਣਿਆ  ਮਹੀਨਾ (%b %Y)"
 
 #  Year
 #. Year
-#: ../calendar/gui/print.c:1978
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "ਚੁਣਿਆ ਸਾਲ (%Y)"
 
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "ਰੁਝੇਵੇਂ"
 
-#: ../calendar/gui/print.c:2309
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "ਕੰਮ"
 
-#: ../calendar/gui/print.c:2331
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
 
-#: ../calendar/gui/print.c:2382
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "ਸਥਿਤੀ: %s"
 
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2411
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "ਵਰਗ: %s"
 
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
-#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
-#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "ਛਾਪ ਦਾ ਨਮੂਨਾ"
 
-#: ../calendar/gui/print.c:2623
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "ਇਕਾਈ ਛਾਪੋ"
 
-#: ../calendar/gui/tasks-component.c:440
+#: ../calendar/gui/tasks-component.c:441
 msgid "_New Task List"
 msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ(_N)"
 
-#: ../calendar/gui/tasks-component.c:516
+#: ../calendar/gui/tasks-component.c:517
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ਕੰਮ"
 msgstr[1] "%d ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:565
+#: ../calendar/gui/tasks-component.c:566
 msgid "Failed upgrading tasks."
-msgstr "ਕੰਮ ਨਵੀਨੀਕਰਨ ਅਸਫਲ"
+msgstr "ਕੰਮ ਅੱਪਗਰੇਡ ਅਸਫਲ ਹੈ।"
 
-#: ../calendar/gui/tasks-component.c:876
+#: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ਮੀਟਿੰਗ ਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਕਾਰਜ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/tasks-component.c:889
+#: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
 msgstr "ਕੰਮ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/tasks-component.c:989
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "ਕੰਮ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "ਨਵਾਂ ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਦਿਓ"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_d)"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ "
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "ਕੰਮ ਸੂਚੀ(_i)"
 
-#: ../calendar/gui/tasks-component.c:1190
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "ਨਵੀ ਕੰਮ ਸੂਚੀ ਬਣਾਉ"
 
-#: ../calendar/gui/tasks-control.c:435
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8367,11 +8484,11 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਕੰਮਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "ਕੰਮ ਛਾਪੋ"
 
@@ -8398,8 +8515,8 @@ msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
 #: ../calendar/importers/icalendar-importer.c:521
-msgid "Reminder!!"
-msgstr "ਯਾਦ-ਪੱਤਰ!!"
+msgid "Reminder!"
+msgstr "ਯਾਦ-ਪੱਤਰ!"
 
 #: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
@@ -9951,25 +10068,25 @@ msgid "Pacific/Yap"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਯਾਪੀ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
+#: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0f ਕੇ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
+#: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%.0f ਮੈਗਾ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
+#: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0f ਗੈਗਾ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
+#: ../widgets/misc/e-attachment-bar.c:986
 msgid "Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ"
 
@@ -9978,27 +10095,27 @@ msgstr "ਨੱਥੀ ਪੱਟੀ"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "ਭੇਜਣ ਲ਼ਈ ਨਿਯਤ"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
@@ -10009,7 +10126,7 @@ msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਲਈ ਇੱਥੇ ਕਲਿ�
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "ਜਵਾਬ(_R):"
 
@@ -10017,38 +10134,38 @@ msgstr "ਜਵਾਬ(_R):"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "ਵਲੋਂ(_o):"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸੁਨੇਹੇ ਦੀ ਨਕਲ ਪ੍ਰਾਪਤ ਕਰੇ"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10058,16 +10175,16 @@ msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲ�
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "ਭੇਜੋ(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
 #  * Post-To
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "ਭੇਜੋ:"
 
@@ -10079,57 +10196,62 @@ msgstr "ਨੱਥੀ(_t)"
 msgid "Insert Attachment"
 msgstr "ਨੱਥੀ ਸ਼ਾਮਲ"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰੀ ਸੁਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+msgid "Hide _Attachment Bar"
+msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3843
+msgid "Show _Attachment Bar"
+msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ"
 
-#: ../composer/e-msg-composer.c:1392
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "ਫਾਇਲ਼ ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../composer/e-msg-composer.c:1400
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "ਸੰਪਾਦਕ ਤੋਂ ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../composer/e-msg-composer.c:1678
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ ਸੁਨੇਹਾ"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1713
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "ਫਾਇਲ ਖੋਲੋ"
 
-#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "ਸਵੈ-ਨਿਰਮਤ"
 
-#: ../composer/e-msg-composer.c:2243
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-msg-composer.c:2497 ../composer/e-msg-composer.c:3701
-#: ../composer/e-msg-composer.c:3704
-msgid "Compose a message"
-msgstr "ਇੱਕ ਸੁਨੇਹਾ ਲਿਖੋ"
-
-#: ../composer/e-msg-composer.c:3819
-msgid "_Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ(_A)"
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
+msgid "Compose Message"
+msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4911
+#: ../composer/e-msg-composer.c:4952
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10164,7 +10286,7 @@ msgstr "ਕਿਉਕਿ &quot;{0}&quot;, ਤੁਹਾਨੂੰ ਵੱਖਰੀ�
 #  system:no-save-file secondary
 #  system:no-load-file secondary
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "ਕਿਉਕਿ &quot; {1}&quot;।"
 
@@ -10207,18 +10329,14 @@ msgid "Do you want to recover unfinished messages?"
 msgstr "ਕੀ ਤੁਸੀਂ ਨਾ ਸਮਾਪਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "ਪ੍ਰਾਪਤ ਨਾ ਕਰੋ"
-
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ਡਾਊਨਲੋਡ ਜਾਰੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ਸਵੈ-ਚਾਲਿਤ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ ਕਿਉਕਿ &quot;{1}&quot;"
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -10226,15 +10344,11 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਉਸ ਸਮੇਂ ਅਚਾਨਕ ਬੰਦ ਹੋ ਗਈ ਸੀ, ਜਦੋਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਲਿਖ ਰਹੇ ਸੀ।ਪੱਤਰ ਮੁੜ-ਪ੍ਰਾਪਤ "
 "ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ ਉਸ ਜਗਾਂ ਤੋਂ ਮੁੜ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਸਹਾਈ ਹੋ ਸਕਦਾ ਹੈ, ਜਿੱਥੋ ਛੱਡਿਆ ਸੀ।"
 
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr "ਪ੍ਰਾਪਤ"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "ਫਾਇਲ `{0}' ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ ਅਤੇ ਸੁਨੇਹੇ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -10242,7 +10356,7 @@ msgstr ""
 "ਇਸ ਡਾਇਰੈਕਟਰੀ ਦੇ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਜਾਂ ਤਾਂ ਸਾਰੀਆਂ ਫਾਇਲਾਂ ਇੱਕ ਇੱਕ ਕਰਕੇ ਸ਼ਾਮਿਲ ਕਰੋ ਜਾਂ "
 "ਡਾਇਰੈਕਟਰੀ ਦਾ ਇੱਕ ਸੁਕੰਚਿਤ ਬਣਾਉ ਤੇ ਇਹਨਾਂ ਨੂੰ ਨੱਥੀ ਕਰ ਦਿਓ।"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10254,28 +10368,36 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਯਕੀਨ ਬਣਾ ਲਵੋਂ ਕਿ ਤੁਹਾਡੇ ਕੋਲ gtkhtml ਅਤੇ libgtkhtml ਦਾ ਸਹੀਂ ਵਰਜਨ ਇੰਸਟਾਲ "
 "ਹੈ।"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr "ਸਿਰਨਾਵਾਂ ਚੋਣਕਾਰ ਕੰਟਰੋਲ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਤੋਂ ਅਸਫਲ।"
 
 #  mail-composer:recover-autosave title
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "ਨਾ-ਸਮਾਪਤ ਸੁਨੇਹੇ ਲੱਭੇ ਹਨ"
 
 #  mail-composer:exit-unsaved title
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "ਚੇਤਾਵਨੀ: ਸੋਧਿਆ ਸੁਨੇਹਾ"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "ਤੁਸੀਂ ਇਸ ਸੁਨੇਹੇ ਨਾਲ `{0}' ਫਾਇਲ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "ਪੱਤਰ ਲਿਖਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਖਾਤਾ ਸੰਰਚਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Do not Recover"
+msgstr "ਪ੍ਰਾਪਤ ਨਾ ਕਰੋ(_D)"
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Recover"
+msgstr "ਪ੍ਰਾਪਤ(_R)"
+
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)"
@@ -10286,9 +10408,13 @@ msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)"
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਸਮੂਹਵੇਅਰ ਸਰੂਪ"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr "ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਂਇਟ"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10335,8 +10461,8 @@ msgid "I am currently out of the office"
 msgstr "ਇਸ ਸਮੇਂ ਮੈਂ ਦਫਤਰ ਵਿੱਚ ਕੰਮ ਕਰ ਰਿਹਾ ਹਾਂ"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "ਨਹੀਂ, ਸਥਿਤੀ ਤਬਦੀਲ ਨਹੀਂ"
+msgid "No, Do not Change Status"
+msgstr "ਨਹੀਂ, ਹਾਲਤ ਨਾ ਬਦਲੋ"
 
 #: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
@@ -10430,10 +10556,10 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਸਵਾਲ"
 
 #  setup a dummy error
 #. setup a dummy error
-#: ../e-util/e-error.c:442
+#: ../e-util/e-error.c:443
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">ਅੰਦਰੂਨੀ ਗਲਤੀ, ਅਣਪਛਾਤੀ ਗਲਤੀ '%s' ਬੇਨਤੀ</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ, ਅਣਜਾਣ ਗਲਤੀ '%s' ਬੇਨਤੀ"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10451,7 +10577,7 @@ msgstr "ਕੀ ਤੁਸੀਂ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹੁੰਦ�
 msgid "File exists &quot;{0}&quot;."
 msgstr "ਫਾਇਲ ਬੰਦ &quot;{0}&quot;।"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(_O)"
 
@@ -10530,21 +10656,20 @@ msgid "Choose a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "ਲਾਜ਼ਮੀ"
 
 #  forest green
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "ਕਰਨ-ਲਈ"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "ਬਾਅਦ ਵਿੱਚ"
 
@@ -10552,48 +10677,52 @@ msgstr "ਬਾਅਦ ਵਿੱਚ"
 msgid "Test"
 msgstr "ਜਾਂਚ"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:799
 msgid "_Search name:"
 msgstr "ਖੋਜ ਨਾਂ(_S):"
 
-#: ../filter/filter-rule.c:819
+#: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
 msgstr "ਇਕਾਈਆਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
 msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
 msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
 
-#: ../filter/filter-rule.c:860
+#: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "ਇਕਾਈਆਂ ਖੋਜ:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr "ਜਵਾਬ"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr "ਜਵਾਬ ਤੇ ਮੁੱਢਲੇ"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "ਕੋਈ ਜਵਾਬ ਜਾਂ ਮੁੱਢਲਾ ਨਹੀਂ"
+
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "ਸ਼ਾਮਿਲ ਭਾਗ"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:348
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
@@ -10620,7 +10749,7 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ ਗੁੰਮ ਹੈ।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "ਨਾਂ ਗੁੰਮ ਹੈ।"
 
@@ -10705,15 +10834,15 @@ msgstr "ਸਮਾਂ ਜੋ ਤੁਸੀਂ ਨਿਰਧਾਰਿਤ ਕੀਤ�
 msgid "years"
 msgstr "ਸਾਲ"
 
-#: ../filter/rule-editor.c:292
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../filter/rule-editor.c:368
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸੋਧ"
 
-#: ../filter/rule-editor.c:735
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "ਨਿਯਮ ਨਾਂ"
 
@@ -10760,18 +10889,19 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਪਸੰਦ ਕੰਟਰੋਲ"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
-#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਖਾਤਾ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
@@ -10779,12 +10909,12 @@ msgstr "ਪੱਤਰ ਪਸੰਦ"
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../mail/em-account-editor.c:395
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/em-account-editor.c:402
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10797,94 +10927,90 @@ msgstr ""
 "ਜੋ ਕਿ %s ਲਈ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ\n"
 "ਅਤੇ ਸਵੀਕਾਰ ਕਰਨ ਲਈ ਜਾਂਚ ਬਕਸੇ ਤੇ ਕਲਿੱਕ ਕਰੋ\n"
 
-#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-account-editor.c:768
+#: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "ਈ-ਪੱਤਰ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:1979
+#: ../mail/em-account-editor.c:2012
 msgid "Automatically check for _new mail every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਦੀ ਜਾਂਚ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "ਈ-ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "ਸੁਰੱਖਿਆ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2412
+#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Checking for New Mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਖਾਤਾ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2737 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਖਾਤਾ ਸਹਾਇਕ"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
+#: ../mail/em-account-prefs.c:409
 msgid "Disable"
 msgstr "ਅਯੋਗ"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:411
 msgid "Enable"
 msgstr "ਯੋਗ"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:456
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[ਮੂਲ]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:451
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
-#: ../mail/em-account-prefs.c:511
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "ਖਾਤਾ ਨਾਂ"
 
-#: ../mail/em-account-prefs.c:513
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../mail/em-account-prefs.c:518
-msgid "Mail Accounts Table"
-msgstr "ਪੱਤਰ ਖਾਤਾ ਸਾਰਣੀ"
-
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:966
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "ਬੇ-ਨਾਂ"
 
@@ -10900,18 +11026,18 @@ msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ --------"
 
-#: ../mail/em-composer-utils.c:1657
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 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 em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1704
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11049,7 +11175,7 @@ msgstr "ਇਹ ਨਹੀਂ"
 msgid "is not Flagged"
 msgstr "ਨਾ-ਨਿਸ਼ਾਨ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ਫਜ਼ੂਲ"
@@ -11058,8 +11184,7 @@ msgstr "ਫਜ਼ੂਲ"
 msgid "Junk Test"
 msgstr "ਕੂੜ ਜਾਂਚ"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ਲੇਬਲ"
 
@@ -11167,12 +11292,12 @@ msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ"
 msgid "Stop Processing"
 msgstr "ਕਾਰਵਾਈ ਰੋਕੋ"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
@@ -11185,24 +11310,26 @@ msgstr "ਸਥਿਤੀ ਨਾ-ਨਿਰਧਾਰਨ"
 msgid "<b>Then</b>"
 msgstr "<b>ਤਦ</b>"
 
-#: ../mail/em-folder-browser.c:143
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
+msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "ਕੁੱਲ ਸਨੇਹਾ:"
+msgstr[0] "ਕੁੱਲ ਸਨੇਹੇ:"
 msgstr[1] "ਕੁੱਲ ਸਨੇਹੇ:"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "ਨਾ ਪੜਿਆ ਸੁਨੇਹਾ:"
+msgstr[0] "ਨਾ ਪੜੇ ਸੁਨੇਹੇ:"
 msgstr[1] "ਨਾ ਪੜਿਆ ਸੁਨੇਹੇ:"
 
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
@@ -11219,35 +11346,36 @@ msgstr "ਬਣਾਓ"
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
 #: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
-#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
-#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
@@ -11265,12 +11393,12 @@ msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਨਕਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
@@ -11279,7 +11407,7 @@ msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਨਕਲ ਕੀਤ�
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸੁਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 
@@ -11287,16 +11415,16 @@ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 msgid "_Move to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱਚ ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
@@ -11317,11 +11445,11 @@ msgstr "ਭੇਜੋ(_M)..."
 msgid "_New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_E)"
 
@@ -11340,34 +11468,21 @@ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 msgid "C_opy"
 msgstr "ਨਕਲ(_o)"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "ਫੋਲਡਰ \"%s\" ਦਾ ਨਾਂ-ਤਬਦੀਲ ਕਰੋ:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "ਫੋਲਡਰ ਨਾਂ ਤਬਦੀਲ"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
-
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "ਫੋਲਡਰ `%s' ਬਣਾਓ"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਫੋਲਡਰ ਕਿੱਥੇ ਬਣਾਇਆ ਜਾਵੇ:"
 
@@ -11375,17 +11490,12 @@ msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਫੋਲਡਰ ਕਿੱਥੇ ਬ�
 msgid "_Reply to Sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _All"
-msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
-
-#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
@@ -11393,11 +11503,11 @@ msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 msgid "U_ndelete"
 msgstr "ਨਾ-ਹਟਾਏ(_n)"
 
-#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)..."
 
@@ -11429,6 +11539,14 @@ msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "ਲੇਬਲ(_L)"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "ਕੋਈ ਨਹੀਂ(_N)"
+
 #: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
@@ -11475,202 +11593,203 @@ msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਤੇ ਫਿਲਟਰ ਲਗਾਓ(_M)"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2117
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "ਸੁਨੇਹਾ ਛਾਪੋ"
 
-#: ../mail/em-folder-view.c:2273
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
 msgstr "ਸਬੰਧ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:2821
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
 
 #  message-search popup match count string
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:729
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:730
+#: ../mail/em-format-html-display.c:757
 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:731 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:731
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:732
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਹਨ"
 
-#: ../mail/em-format-html-display.c:732
+#: ../mail/em-format-html-display.c:759
 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:738 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "ਨਾ-ਇਕ੍ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:765
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਇਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ ਸਕਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "ਇਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
 
-#: ../mail/em-format-html-display.c:739
+#: ../mail/em-format-html-display.c:766
 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 "
+"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:740 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "ਇਕ੍ਰਪਿਟਡ"
 
-#: ../mail/em-format-html-display.c:740
+#: ../mail/em-format-html-display.c:767
 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:741 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "ਇਕ੍ਰਿਪਟ, ਸਖਤ"
 
-#: ../mail/em-format-html-display.c:741
+#: ../mail/em-format-html-display.c:768
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"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:842 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:857
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1145
+#: ../mail/em-format-html-display.c:1172
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ਤੇ ਸਮਾਪਤ"
 
-#: ../mail/em-format-html-display.c:1153
+#: ../mail/em-format-html-display.c:1180
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1156
+#: ../mail/em-format-html-display.c:1183
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1216
+#: ../mail/em-format-html-display.c:1243
 msgid "_View Inline"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਦਰਿਸ਼(_V)"
 
-#: ../mail/em-format-html-display.c:1217
+#: ../mail/em-format-html-display.c:1244
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1218
+#: ../mail/em-format-html-display.c:1245
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1219
+#: ../mail/em-format-html-display.c:1246
 msgid "Show _Original Size"
 msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
 
-#: ../mail/em-format-html-display.c:1596
-msgid "Attachment Button"
-msgstr "ਨੱਥੀ ਬਟਨ"
+#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1803
+#: ../mail/em-format-html-display.c:1872
 msgid "Select folder to save all attachments..."
 msgstr "ਸਭ ਨੱਥੀਆਂ ਨੂੰ ਫੋਲਡਰ 'ਚ ਸੰਭਾਲੋ"
 
-#: ../mail/em-format-html-display.c:1850
-msgid "Save Selected..."
-msgstr "ਚੁਣੇ ਸੰਭਾਲੋ..."
+#: ../mail/em-format-html-display.c:1919
+msgid "_Save Selected..."
+msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1917
+#: ../mail/em-format-html-display.c:1986
 #, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
 msgstr[0] "%d ਨੱਥੀ"
 msgstr[1] "%d ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1980
-msgid "Toggle Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਤਬਦੀਲ"
+#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+msgid "S_ave"
+msgstr "ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:2004
+msgid "S_ave All"
+msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
+
+#: ../mail/em-format-html-display.c:2065
 msgid "No Attachment"
 msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
 
-#: ../mail/em-format-html-display.c:1985
-msgid "Save All"
-msgstr "ਸਭ ਸੰਭਾਲੋ"
-
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
@@ -11685,91 +11804,92 @@ msgstr "%s ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 msgid "Valid signature but cannot verify sender"
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਨਾਲ ਨਹੀਂ"
 
-#: ../mail/em-format-html.c:880
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "ਨਿਕਾਰਾ ਬਾਹਰੀ-ਭਾਗ"
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:944
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮੋਟ ਡਾਟਾ(%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟਾ (\"%s\" ਕਿਸਮ) ਲ਼ਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:1181
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਪ੍ਰਤੀਰੂਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "ਵਲੋਂ"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ਵੱਲ"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #  pseudo-header
 #. pseudo-header
-#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1000
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1613
+#: ../mail/em-format-html.c:1615
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #  translators: strftime format for local time equivalent in Date header display, without day
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
-#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
@@ -11779,27 +11899,27 @@ msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
-msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮਿਟ"
+msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -11819,7 +11939,7 @@ msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-migrate.c:1208
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11830,74 +11950,74 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
 
-#: ../mail/em-migrate.c:1647
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ਫੋਲਡਰ `%s' ਨੂੰ `%s' ਵਿੱਚ ਨਕਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1858
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ਤੇ ਉਪਲੱਬਧ ਪੱਤਰ-ਬਕਸਿਆਂ ਦੀ ਜਾਂਚ ਲਈ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2062
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਪੁਰਾਣੇ ਡਾਟੇ `%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2076
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖੀ ਡਾਟਾ ਡਾਇਰੈਕਟਰੀ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2105
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਡਾਟਾ `%s' ਦੀ ਨਕਲ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ਸਥਾਨਕ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' ਤੇ ਸਥਾਨਕ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2730
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਵਸਥਾ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ "
+"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਥਾਪਨ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ "
 "ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
 
-#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "ਸੂਚੀ ਨੂੰ ਜਵਾਬ(_L)"
 
-#: ../mail/em-popup.c:619
+#: ../mail/em-popup.c:620
 msgid "_Open Link in Browser"
 msgstr "ਹਮੇਸ਼ਾ ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲੋ(_O)"
 
-#: ../mail/em-popup.c:620
+#: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
-#: ../mail/em-popup.c:621
-msgid "_Add to Addressbook"
-msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਵਿੱਚ ਜੋੜੋ(_A)"
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ 'ਚ ਜੋੜੋ(_A)"
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -11921,28 +12041,28 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਸਰਵਰ ਚੁਣੋ।"
 msgid "No server has been selected"
 msgstr "ਕੋਈ ਸਰਵਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
 
-#: ../mail/em-utils.c:123
-msgid "Don't show this message again."
-msgstr "ਇਹ ਸੁਨੇਹਾ ਮੈਨੂੰ ਮੁੜ ਨਾ ਵੇਖਾਓ।"
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
+msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ।"
 
-#: ../mail/em-utils.c:356
-msgid "Filters"
-msgstr "ਫਿਲਟਰ"
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../mail/em-utils.c:671
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ..."
 
-#: ../mail/em-utils.c:720
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "ਸਿਰਨਾਵਾਂ ਜੋੜ੍ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1204
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹਾ"
@@ -12175,8 +12295,8 @@ msgid "Message Window default width"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "ਸੁਨੇਹਾ-ਦਰਿਸ਼ ਸ਼ੈਲੀ( ਸਧਾਰਨ, ਪੂਰਾ ਸਿਰਲੇਖ, ਸਰੋਤ)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "ਸੁਨੇਹਾ-ਝਲਕ ਸ਼ੈਲੀ (\"ਸਧਾਰਨ\", \"ਪੂਰਾ ਸਿਰਲੇਖ\", \"ਸਰੋਤ\")"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -12314,7 +12434,7 @@ msgid ""
 "mail view."
 msgstr ""
 "ਇਸ ਕੀ ਵਿੱਚ XML ਢਾਂਚਾ ਨਿਰਧਾਰਿਤ ਪਸੰਦੀਦਾ ਸਿਰਲੇਖਾਂ ਦੀ ਸੂਚੀ ਸ਼ਾਮਿਲ ਹੈ ਅਤੇ ਕੀ ਇਹ ਵੇਖਾਏ ਜਾਣ "
-"ਜਾਂ ਨਾ। XML ਢਾਂਚੇ ਦਾ ਫਾਰਮਿਟ ਹੈ &lt; ਸਿਰਲੇਖ ਯੋਗ&gt; - ਨਿਰਧਾਰਿਤ ਕਰੋ ਜੇਕਰ ਪੱਤਰ ਦਰਿਸ਼ ਵਿੱਚ "
+"ਜਾਂ ਨਾ। XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਸਿਰਲੇਖ ਯੋਗ&gt; - ਨਿਰਧਾਰਿਤ ਕਰੋ ਜੇਕਰ ਪੱਤਰ ਦਰਿਸ਼ ਵਿੱਚ "
 "ਤੁਸੀਂ ਸਿਰਲੇਖ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
@@ -12445,22 +12565,17 @@ msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
-msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ ਫਾਰਮਿਟ ਫੋਲਡਰ ਆਯਾਤਕਾਰ"
+msgstr "ਬਰੇਸਕਲੀ ਪੱਤਰ-ਬਕਸਾ ਫਾਰਮੈਟ ਫੋਲਡਰ ਆਯਾਤਕਾਰ"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252
-msgid "Importing..."
-msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../plugins/startup-wizard/startup-wizard.c:237
 #: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
@@ -12470,7 +12585,7 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬਕਸਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/importers/mail-importer.c:377
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "ਜਾਂਚ ਜਾਰੀ ਹੈ %s"
@@ -12542,7 +12657,7 @@ msgstr "ਨੈੱਟਸਕੇਪ ਡਾਟਾ ਆਯਾਤ ਕੀਤਾ ਜਾ �
 
 #: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
-msgstr "ਵਿਵਸਥਾ"
+msgstr "ਸਥਾਪਨ"
 
 #: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
@@ -12592,82 +12707,107 @@ msgstr "%s ਪੱਤਰ ਸੂਚੀ"
 msgid "Add Filter Rule"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-component.c:520
+#: ../mail/mail-component.c:521
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹਟਾਇਆ"
 msgstr[1] "%d ਹਟਾਏ"
 
-#: ../mail/mail-component.c:522
+#: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ਕੂੜ"
 msgstr[1] "%d ਕੂੜ"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫਟ"
 msgstr[1] "%d ਡਰਾਫਟ"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭੇਜਿਆ"
 msgstr[1] "%d ਭੇਜੇ"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭੇਜਿਆ"
 msgstr[1] "%d ਨਾ-ਭੇਜੇ"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ਕੁੱਲ"
 msgstr[1] "%d ਕੁੱਲ"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d ਨਾ-ਪੜਿਆ"
 msgstr[1] ", %d ਨਾ ਪੜੇ"
 
-#: ../mail/mail-component.c:778
+#: ../mail/mail-component.c:779
 msgid "New Mail Message"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-component.c:779
+#: ../mail/mail-component.c:780
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ(_M)"
 
-#: ../mail/mail-component.c:780
+#: ../mail/mail-component.c:781
 msgid "Compose a new mail message"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../mail/mail-component.c:786
+#: ../mail/mail-component.c:787
 msgid "New Mail Folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ"
 
-#: ../mail/mail-component.c:787
+#: ../mail/mail-component.c:788
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ(_F)"
 
-#: ../mail/mail-component.c:788
+#: ../mail/mail-component.c:789
 msgid "Create a new mail folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:933
 msgid "Failed upgrading Mail settings or folders."
-msgstr "ਪੱਤਰ ਵਿਵਸਥਾ ਜਾਂ ਫੋਲਡਰ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"
+msgstr "ਪੱਤਰ ਸਥਾਪਨ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "ਖਾਸ(_m)"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "ਕੰਮ(_W)"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "ਨਿੱਜੀ(_P)"
+
+#  forest green
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "ਕਰਨ ਲਈ(_T)"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "ਬਾਅਦ 'ਚ(_L)"
 
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
@@ -12832,10 +12972,6 @@ msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਪੱਤਰ ਭੇਜਣ ਸਮੇਂ ਮੈ�
 msgid "Attach original message"
 msgstr "ਅਸਲੀ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "ਨੱਥੀ"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "ਖੁਸ਼ ਚਿੱਤਰ ਸਵੈ-ਚਾਲਿਤ ਸ਼ਾਮਿਲ ਕਰੋ(_s)"
@@ -12906,7 +13042,7 @@ msgstr ""
 "ਹੁਣ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਰਾਹੀ ਪੱਤਰ ਭੇਜ ਤੇ ਪ੍ਰਾਪਤ ਕਰ\n"
 "ਸਕਦੇ ਹੋ।\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਵਿਵਸਥਾ ਲਾਗੂ ਕਰਨ ਲਈ \"ਲਾਗੂ\" ਦਬਾਓ।"
+"ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਸਥਾਪਨ ਲਾਗੂ ਕਰਨ ਲਈ \"ਲਾਗੂ ਕਰੋ\" ਦਬਾਓ।"
 
 #: ../mail/mail-config.glade.h:66
 msgid "De_fault"
@@ -12932,6 +13068,11 @@ msgstr "ਸਮਾਪਤ"
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(_F):"
 
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "ਯੋਗ(_n)"
+
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "ਈ-ਪੱਤਰ ਖਾਤਾ"
@@ -12953,80 +13094,84 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰੀ ਜਾਣ ਵਾਲੇ ਪੱਤਰਾਂ ਨੂੰ ਇਕ੍ਰਿਪਸ਼ਨ(ਮੂਲ ਹੀ)(_g)"
 
 #: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr "ਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ(_x):"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "ਫੋਂਟ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱਚ ਪ੍ਰਤੀਰੂਪ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "ਪੂਰਾ ਨਾਂ(_E):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML ਪੱਤਰ"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "ਸਿਰਲੇਖ"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮੋਟ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "ਸਤਰ ਵਿੱਚ"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ਸਾਰਣੀ"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "ਪੱਤਰ ਸੰਰਚਨਾ"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "ਪੱਤਰ ਸਿਰਲੇਖ ਸਾਰਣੀ"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "ਪੱਤਰ-ਬਕਸਾ ਟਿਕਾਣਾ"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "ਸੁਨੇਹਾ ਲੇਖਕ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ਸੂਚਨਾ: ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਪਹਿਲੀਂ ਵਾਰ ਲਾਗਆਨ ਨਹੀਂ ਕਰਦੇ, ਤੁਹਾਡੇ ਕੋਲੋਂ ਗੁਪਤ-ਕੋਡ ਪੁਛਿਆ ਨਹੀਂ ਜਾਵੇਗਾ"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "ਸੰਗਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "ਨਵੇਂ ਪੱਤਰ ਆਉਣ ਤੇ ਆਵਾਜ਼ ਚਲਾਓ(_v)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13034,7 +13179,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਅੱਗੇ ਦਿੱਤੀ ਥਾਂ ਵਿੱਚ ਇਸ ਖਾਤੇ ਬਾਰੇ ਵਰਣਨ ਕਰਦੀ ਜਾਣਕਾਰੀ ਦਿਓ।\n"
 "ਇਹ ਨਾਂ ਸਿਰਫ਼ ਵੇਖਾਉਣ ਲਈ ਹੀ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13042,7 +13187,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਯਕੀਨੀ "
 "ਨਹੀਂ ਹੋ ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 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 "
@@ -13051,114 +13196,110 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈਪੱਤਰ ਸਿਰਨਾਵਾਂ ਦਿਓ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ, "
 "ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਈਪੱਤਰ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਲਿਖੀਆਂ ਚੋਣਾਂ ਵਿੱਚੋਂ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸੂਚਿਤ ਕਰੋ, ਜਦੋਂ ਵੀ ਸੁਨੇਹੇ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ, ਜੋ ਕਿ Bcc ਪ੍ਰਾਪਤਕਰਨ ਵਾਲਿਆਂ ਲਈ ਹੋਵੇ(_o)"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "ਅਸਲੀ ਸੁਨੇਹੇ ਦਾ ਵੇਰਵਾ"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ(_m)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ(_p)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "ਚੁਣੋ(_e)..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "ਮਿਆਰੀ ਫੋਂਟ(_t):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "ਚੁਣੋ(_l)..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "ਛਾਪਣ ਲਈ HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "ਛਾਪਣ ਲਈ HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "ਸੁਨੇਹਾ ਰਸੀਦਾਂ ਭੇਜੋ:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਫੋਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲਈ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "ਸਰਵਰ ਕਿਸਮ(_T): "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "ਦਸਤਖਤ(_u):"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "ਦਸਤਖਤ ਸਾਰਣੀ"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "ਖਾਸ ਫਾਇਲ ਨਾਂ(_f):"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_erminal Font:"
-msgstr "ਟਰਮੀਨਲ ਫੋਟ(_e):"
-
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "ਕਿਸਮ(_y): "
@@ -13187,7 +13328,7 @@ msgstr ""
 "ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਖਾਤੇ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\""
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "ਉਪਭੋਗਤਾ ਨਾਂ(_n):"
 
@@ -13218,8 +13359,8 @@ msgid "_Do not notify me when new mail arrives"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਆਉਣ ਤੇ ਮੈਨੂੰ ਸੂਚਿਤ ਨਾ ਕਰੋ(_D)"
 
 #: ../mail/mail-config.glade.h:158
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਤੇ ਦਸਤਖਤ ਨਾ ਕਰੋ(ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ)(_D)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ) (_D)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
@@ -13246,8 +13387,8 @@ msgid "_Path:"
 msgstr "ਮਾਰਗ(_P):"
 
 #: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "ਸੰਪਰਕ ਨੂੰ HTML ਸੁਨੇਹਾ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ, ਜੋ ਕਿ ਸੰਪਰਕ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹਨ(_P)"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "HTML ਸੁਨੇਹਾ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ, ਜੋ ਕਿ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹਨ (_P)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13261,23 +13402,24 @@ msgstr "ਜਵਾਬ ਸ਼ੈਲੀ(_R):"
 msgid "_Script:"
 msgstr "ਸਕ੍ਰਿਪਟ(_S):"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "ਸਜੀਵਤਾ ਵੇਖਾਓ(_S)"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "ਚਿੱਤਰ ਸਜੀਵਤਾ ਵੇਖਾਓ(_S)"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "ਹੋਰ ਕਾਰਜ ਵਾਂਗ ਉਹੀ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "ਰੰਗ"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "ਵੇਰਵਾ"
 
@@ -13383,26 +13525,26 @@ msgstr "ਸਭ ਸਥਾਨਕ ਕੇ ਸਰਗਰਮ ਫੋਲਡਰਾਂ ਨ�
 msgid "with all local folders"
 msgstr "ਸਭ ਸਥਾਨਕ ਫੋਲਡਰ ਨਾਲ"
 
-#: ../mail/mail-folder-cache.c:860
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "ਪਿੰਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %s"
 
-#: ../mail/mail-ops.c:103
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "ਫੋਲਡਰ ਤੇ ਫਿਲਟਰ ਲਗਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:564
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13411,114 +13553,114 @@ msgstr ""
 "%s ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s\n"
 "ਸਥਾਨਿਕ`Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
 
-#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ਸਥਾਨਿਕ `Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2d ਵਿੱਚੋਂ %1d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:759
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸੁਨੇਹੇ %2d ਵਿੱਚੋਂ %1d ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
-msgstr "ਰੱਦ ਕੀਤਾ"
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
+msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:860
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:945
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:945
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਨਕਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1168
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ"
 
-#: ../mail/mail-ops.c:1211
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "ਫੋਲਡਰ %s ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1283
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "ਸੰਭਾਲ %s ਖੋਲੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/mail-ops.c:1361
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "ਫੋਲਡਰ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1455
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ਖਾਤਾ '%s' ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1521
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ਖਾਤਾ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1576
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "ਤਾਜ਼ਾ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "ਨਿਕਾਲਾ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "ਸਥਾਨਕ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1744
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ਸੁਨੇਹਾ %s ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1854
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1940
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1990
+#: ../mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13527,7 +13669,7 @@ msgstr ""
 "ਆਉਟਪੁੱਟ ਫਾਇਲ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2018
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13536,11 +13678,11 @@ msgstr ""
 "ਸੁਨੇਹਾ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2089
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
-#: ../mail/mail-ops.c:2101
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13549,66 +13691,51 @@ msgstr ""
 "ਆਉਟਪੁੱਟ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2111
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾਟਾ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
 
-#: ../mail/mail-ops.c:2261
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ਨਾਲੋਂ ਵੱਖ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2261
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ਨਾਲ ਮੁੜ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2377
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "ਸੇਵਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
 #: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+msgid "Canceling..."
 msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "ਸਰਵਰ: %s,  ਕਿਸਮ: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "ਮਾਰਗ: %s, ਕਿਸਮ: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "ਕਿਸਮ: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "ਭੇਜੋ ਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:425
 msgid "Updating..."
-msgstr "ਨਵੀਨੀਕਰਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgstr "ਅੱਪਡੇਟ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:709
 msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:604
+#: ../plugins/exchange-operations/exchange-config-listener.c:681
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
@@ -13702,9 +13829,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
-msgstr "&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ।  {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ ਭੇਜੋ?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
+msgstr ""
+"&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ "
+"ਭੇਜਣੀ ਹੈ?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
@@ -13731,202 +13860,218 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ਕੀ ਤੁਸੀਂ ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
 #: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਖਾਤਾ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ ਅਤੇ ਇਸ ਦੇ ਸਭ ਪਰਾਕਸੀਆਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ਕੀ ਤੁਸੀਂ {0} ਸੁਨੇਹੇ ਇੱਕ ਸਮੇਂ ਹੀ ਖੋਲਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਮੇਸ਼ਾ ਲਈ ਸਮਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲ਼ਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ HTML ਫਾਰਮਿਟ ਵਿੱਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ HTML ਫਾਰਮੈਟ ਵਿੱਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਸੁਨੇਹਾ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "ਕੀ ਤੁਸੀਂ ਪੱਤਰ ਨੂੰ ਵਿਸ਼ੇ ਬਿਨਾਂ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "ਕਿਉਕਿ &quot;{0}&quot;।"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "ਕਿਉਕਿ &quot;{2}&quot;।"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "ਖਾਲੀ ਦਸਤਖਤ"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "ਸਰੋਤ &quot;{1}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "ਸਰੋਤ &quot;{2}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "ਨਿਯਤ &quot;{2}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
-"ਲਾਇਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤੁਸੀਂ "
-"ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਇਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
+"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। "
+"ਤੁਸੀਂ ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; ਦਾ ਨਾਂ &quot;{1}&quot; ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+msgstr "&quot;{0}&quot; ਦਾ ਨਾਂ &quot;{1}&quot; ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਨਾ-ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ਖਾਤੇ ਲਈ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੀਆਂ ਨਹੀਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "ਡਾਇਰੈਕਟਰੀ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ&quot;{0}&quot; ਸੈਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਗੁਪਤ-ਕੋਡ ਅੱਖਰ ਪ੍ਰਤੀ "
 "ਸੰਵੇਦਨਸ਼ੀਲ ਹੈ, ਤੁਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "ਦਸਤਖਤੀ ਫਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "ਖਾਤਾ ਹਟਾਓ?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰਨੀਆਂ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "ਨਾ ਹਟਾਓ"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "ਅਯੋਗ ਨਾ ਕਰੋ"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Don't delete"
-msgstr "ਹਟਾਉ ਨਾ"
-
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "ਗੁਪਤ-ਕੋਡ ਭਰੋ।"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "ਫਿਲਟਰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ।"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "ਕਾਰਵਾਈ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "{0} ਦੌਰਾਨ ਗਲਤੀ।"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਸ ਉੱਪਰ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਹ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਿਆ ਤਾਂ ਤੁਸੀਂ ਇਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮੁੜ-ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਫੋਲਡਰ ਹਟਾ ਦਿੱਤਾ ਤਾਂ, ਇਸ ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰਾਂ ਦੇ ਸਾਰੇ ਭਾਗ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਸਭ ਪਰਾਕਸੀ ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
+
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13934,11 +14079,11 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਖਾਤਾ ਜਾਣਕਾਰੀ ਅਤੇ ਸਭ ਪਰਾਕਸੀ ਜਾਣਕਾਰੀ ਨੂੰ\n"
 "ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਅੱਗੇ ਗਏ, ਖਾਤਾ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13946,19 +14091,19 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ "
 "ਕੀਤਾ ਜਾਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਗਲਤ"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲਟਰ ਸਵੈ-ਚਾਲਿਤ ਹੀ ਨਵੀਨੀਕ੍ਰਿਤ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13969,35 +14114,35 @@ msgstr ""
 "ਸਿਰਲੇਖ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-"
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ 'ਚ ਸਭ ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "ਫੋਲਡਰ ਗੁੰਮ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਚੁਣਿਆ।"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "ਇੱਕੋ ਸਮੇਂ ਇੰਨੇ ਸੁਨੇਹੇ ਖੋਲਣ ਲ਼ਈ ਲੰਮਾ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਖਾਤਾ ਵਿਵਸਥਾ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14005,7 +14150,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਵੱਲ ਲਈ ਜਾਇਜ ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਦਿਓ। ਤੁਸੀਂ ਵੱਲ ਤੇ ਕਲਿੱਕ ਕਰਕੇ ਈਪੱਤਰ ਸਿਰਨਾਵਾਂ ਖੋਜ "
 "ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14017,48 +14162,48 @@ msgstr ""
 "{0}\n"
 "ਕਿਸੇ ਤਰਾਂ ਭੇਜੋ?"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "ਪੁਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "ਕਿਊਰਿੰਗ ਸਰਵਰ"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "ਪੜਨ ਰਸੀਦ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਸਵੈ-ਚਾਲਤ ਹੀ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "ਰਸੀਦ ਭੇਜੋ"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14066,7 +14211,7 @@ msgstr ""
 "ਸਿਸਟਮ ਫੋਲਡਰ Ximian ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ "
 "ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14082,7 +14227,7 @@ msgstr ""
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #  mail:vfolder-updated secondary
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14096,7 +14241,7 @@ msgstr ""
 "     &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14110,23 +14255,23 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:104
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
+"The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ ਕਾਰਜ &quot;sendmail &quot; ਕਾਰਜ ਰਾਹੀ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਸੀ। sendmail "
-"ਨੇ ਹੇਠ ਲਿਖੀ ਗਲਤੀ ਦਿੱਤੀ ਹੈ: ਸਥਿਤੀ 67: ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ-ਬਕਸਾ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ। ਸੁਨੇਹੇ ਵਿੱਚ ਗਲਤੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਮੁੜ ਭੇਜੋ।"
+"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ ਕਾਰਜ &quot;sendmail &quot; ਕਾਰਜ ਰਾਹੀ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਸੀ। Sendmail "
+"ਨੇ ਹੇਠ ਲਿਖੀ ਗਲਤੀ ਦਿੱਤੀ ਹੈ: ਹਾਲਤ 67: ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
+"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ-ਬਕਸਾ (Outbox) ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ। ਸੁਨੇਹੇ ਵਿੱਚ ਗਲਤੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਮੁੜ ਭੇਜੋ।"
 
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
-msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ ਅਤੇ ਚੱਲਣਯੋਗ ਵੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਅਤੇ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14134,7 +14279,7 @@ msgstr ""
 "ਇਹ ਫੋਲਡਰ ਲੁਪਤ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਖੋਜ\n"
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14142,64 +14287,74 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਖਾਤੇ ਨਾਲ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ "
 "ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:106
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹਨ।"
+#: ../mail/mail.error.xml.h:110
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ਸਰਵਰ ਇਸ ਤਰਾਂ ਦੀ ਪ੍ਰਮਾਣਿਤ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਅਤੇ ਸਭ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਈ ਵੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ "
+"ਜਾਣਗੇ।"
+
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਸਿਸਟਮ ਡਰਾਫਟ ਵਰਤਿਆ ਜਾਵੇ?"
+msgstr ""
+"ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ "
+"ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "ਲਾਇਸੈਂਸ ਫਾਇਲ ਪੜਨ ਵਿੱਚ ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "ਮੂਲ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "ਤੁਸੀਂ ਸਾਰੀ ਲਾਜ਼ਮੀ ਜਾਣਕਾਰੀ ਭਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਈ ਨਾ-ਭੇਜੇ ਸੁਨੇਹੇ ਹਨ, ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਤਰਾਂ ਵੀ ਬਾਹਰ ਆਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਮੇਂ ਦੋ ਖਾਤੇ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਖੋਜ ਫੋਲਡਰ ਦਾ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14208,98 +14363,98 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸਰੋਤ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।\n"
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚੁਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਸਥਾਨਿਕ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ ਚੁਣ ਕੇ।"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "ਤੁਹਾਡਾ ਸਰਵਰ &quot;{0}&quot; 'ਤੇ &quot;{0}&quot; ਦੇ ਤੌਰ ਤੇ ਲਾਗਿੰਨ ਅਸਫਲ"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:127
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "ਤੁਹਾਡਾ ਸੁਨੇਹਾ &quot;{0}&quot; ਵਿਸ਼ੇ ਨਾਲ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "ਖੋਲ੍ਹੋ(_A)"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "ਨਿਕਾਰਾ(_E)"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਲੋ(_O)"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹੁ ਨਾ-ਵੇਖੇ ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "ਬਹੁ-ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1012
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "ਨਿਊਨਤਮ"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "ਘੱਟ"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "ਜਿਆਦਾ"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "ਅਧਿਕਤਮ"
 
-#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "ਅੱਜ %l:%M %p"
 
-#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2055
-msgid "Message List"
-msgstr "ਸੁਨੇਹਾ ਸੂਚੀ"
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr "ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:3400
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
@@ -14356,11 +14511,11 @@ msgstr "ਅੱਗੇ"
 msgid "No Response Necessary"
 msgstr "ਕੋਈ ਜਵਾਬ ਲੋੜੀਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ"
 
@@ -14370,47 +14525,47 @@ msgstr "ਮੁੜ-ਜਾਂਚ"
 
 #: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
-msgstr "ਪੱਤਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਪੱਤਰ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
-msgstr "ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਸੁਨੇਹੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
-msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਸੁਨੇਹੀਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
-msgstr "ਭੇਜਣਾ ਵਾਲਾ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
-msgstr "ਵਿਸ਼ਾ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਵਿਸ਼ੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
-msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਾ ਸ਼ਾਮਿਲ ਹੈ"
+msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
 msgstr "ਲੋਕਲ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionallity for local address books."
-msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+msgid "Provides core functionality for local address books."
+msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
 msgstr ""
-"ਇੱਕ ਫਾਰਮਿਟ ਪਲੱਗਿੰਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗਿੰਨ ਨੂੰ ਸਤਰ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ "
+"ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਸਤਰ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ "
 "ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr "ਆਡੀਓ ਇੰਲਾਇਨ ਪਲੱਗਿੰਨ"
+msgstr "ਆਡੀਓ ਇੰਲਾਇਨ ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
@@ -14446,62 +14601,54 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਵਿਵਸਥਾ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪਰਾਪਤ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪਰਾਪਤ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
-msgstr "ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪਰਾਪਤੀ ਪਲੱਗਿੰਨ"
+msgstr "ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪ੍ਰਾਪਤੀ ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
-msgstr "ਬੈਕਅੱਪ ਵਿਵਸਥਾ..."
+msgstr "ਬੈਕਅੱਪ ਸਥਾਪਨ..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਵਿਵਸਥਾ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪ੍ਰਾਪਤ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪ੍ਰਾਪਤ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
-msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ ਵਿਵਸਥਾ..."
+msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ ਸਥਾਪਨ..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਸਵੈ-ਚਾਲਤ ਸੰਪਰਕ"
 
-#: ../plugins/bbdb/bbdb.c:419
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">ਸਵੈ-ਚਾਲਤ ਸੰਪਰਕ</span>"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:454
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "ਪੱਤਰ ਦੇ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਖੁਦ ਹੀ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਇੰਦਰਾਜ਼ ਬਣਾ ਲਵੋ(_A)"
 
-#: ../plugins/bbdb/bbdb.c:450
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">ਤਰੁੰਤ ਸੁਨੇਹਾਦਾਰ ਸੰਪਰਕ</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
-msgstr "ਨਿਯਮਤ ਤੌਰ ਤੇ ਮੇਰੇ ਤਰੁੰਤ ਸੁਨੇਹੇਦਾਰ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਮਕਾਲੀ ਕਰਦੇ ਰਹੋ"
+#: ../plugins/bbdb/bbdb.c:490
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "ਨਿਯਮਤ ਤੌਰ ਤੇ ਗੇਮ (gaim) ਤਰੁੰਤ ਸੁਨੇਹੇਦਾਰ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਮਕਾਲੀ ਕਰਦੇ ਰਹੋ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
 msgstr "ਭਾਈ ਸੂਚਨਾ ਨਾਲ ਸਮਕਾਲੀ ਕਰੋ(_b)"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "ਸਵੈ-ਚਾਲਤ ਸੰਪਰਕ"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "ਜਿਵੇਂ ਹੀ ਤੁਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ "
 "ਸਿਰਨਾਵੇਂ ਵਿੱਚ ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਹਾਡੀ ਬੱਡੀ ਸੂਚੀ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ "
@@ -14511,6 +14658,14 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "_SSL ਵਰਤੋਂ"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ"
@@ -14519,6 +14674,10 @@ msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ"
 msgid "Provides core functionality for local calendars."
 msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
 
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ (_S)"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP ਕੈਲੰਡਰ"
@@ -14585,7 +14744,7 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"ਇੱਕ ਪਾਠ ਪਲੱਗਿੰਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ "
+"ਇੱਕ ਪਾਠ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ "
 "ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
@@ -14618,8 +14777,8 @@ msgstr "ਕੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣਾ �
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ"
+msgid "Mark as _default folder"
+msgstr "ਮੂਲ ਫੋਲਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -14669,11 +14828,11 @@ msgid ""
 "password authentication."
 msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਗੁਪਤ-ਕੋਡ ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "ਦਫਤਰੋਂ ਬਾਹਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14681,72 +14840,72 @@ msgstr ""
 "ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸੁਨੇਹਾ ਸਵੈ-ਚਾਲਿਤ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ\n"
 "ਜਾਵੇਗਾ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਤੋਂ ਬਾਹਰ ਹਾਂ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਵਿੱਚ ਹਾਂ"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਖਾਤੇ ਲਈ ਗੁਪਤ-ਕੋਡ ਤਬਦੀਲ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "ਗੁਪਤ-ਕੋਡ ਤਬਦੀਲ"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
-msgstr "ਐਕਸਚੇਜ਼ ਖਾਤੇ ਲਈ ਪਰਤੀਨਿਧ ਵਿਵਸਥਾ ਪਰਬੰਧਨ"
+msgstr "ਐਕਸਚੇਜ਼ ਖਾਤੇ ਲਈ ਪ੍ਰਤੀਨਿਧ ਸਥਾਪਨ ਪਰਬੰਧਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
-msgstr "ਪਰਤੀਨਿਧ ਸਹਾਇਕ"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਸਹਾਇਕ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "ਫੁਟਕਲ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "ਸਭ ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰਾਂ ਦਾ ਅਕਾਰ ਵੇਖਾਓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "ਐਕਸ਼ਚੇਜ਼ ਵਿਵਸਥਾ"
+msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਥਾਪਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:619
-msgid "_OWA Url:"
-msgstr "_OWA Url:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:833
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਕਿਸਮ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:847
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -14785,15 +14944,20 @@ msgstr "ਨਵਾਂ ਗੁਪਤ-ਕੋਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਗੁਪਤ-ਕੋਡ ਹੁਣੇ ਬਦਲੋ।"
 
+#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
+
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
 msgid "Custom"
 msgstr "ਪਸੰਦੀਦਾ"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
-msgstr "ਪਰਤੀਨਿਧ ਅਧਿਕਾਰ"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਅਧਿਕਾਰ"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
@@ -14803,43 +14967,43 @@ msgstr "%s ਲਈ ਅਧਿਕਾਰ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
-msgstr "ਇਸ ਲਈ ਪਰਤੀਨਿਧ:"
+msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr "ਕੀ ਪਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
+msgstr "ਕੀ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਦੀ ਲਈ ਪਹੁੰਚ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਖੁਦ ਨੂੰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ %s ਪਰਤੀਨਿਧ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ %s ਪ੍ਰਤੀਨਿਧ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
-msgstr "ਪਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
-msgstr "ਪਰਤੀਨਿਧਾਂ ਸੂਚੀ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
+msgstr "ਪ੍ਰਤੀਨਿਧਾਂ ਸੂਚੀ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
-msgstr "ਪਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
-msgstr "ਪਰਤੀਨਿਧ ਸੂਚੀ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਸੂਚੀ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
@@ -14857,7 +15021,7 @@ msgstr "ਸੰਪਰਕ(_n):"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
-msgstr "ਪਰਤੀਨਿਧ"
+msgstr "ਪ੍ਰਤੀਨਿਧ"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
@@ -14881,7 +15045,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "ਪਰਤੀਨਿਧ ਨਿੱਜੀ ਇਕਾਈਆਂ ਨੂੰ ਵੇਖ ਨਹੀਂ ਸਕਦੇ ਹਨ(_D)"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਨਿੱਜੀ ਇਕਾਈਆਂ ਨੂੰ ਵੇਖ ਨਹੀਂ ਸਕਦੇ ਹਨ(_D)"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -14898,15 +15062,15 @@ msgstr "ਕੰਮ(_T):"
 msgid "Permissions..."
 msgstr "ਅਧਿਕਾਰ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "ਫੋਲਡਰ ਨਾਂ"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ਹੋਰ ਉਪਭੋਗੀ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣਾਓ"
@@ -14916,32 +15080,48 @@ msgid "Exchange Folder Tree"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "ਗੁਪਤ-ਕੋਡ ਮਿਆਦ ਖਾਤਮਾ ਚੇਤਾਵਨੀ..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ 7 ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "ਗੁਪਤ-ਕੋਡ ਤਬਦੀਲ(_C)"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "ok_button"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User:"
 msgstr "ਉਪਭੋਗੀ ਜੋੜੋ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User"
 msgstr "ਉਪਭੋਗੀ ਸ਼ਾਮਲ"
 
@@ -15006,7 +15186,7 @@ msgid "Select User"
 msgstr "ਉਪਭੋਗੀ ਚੁਣੋ"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15021,9 +15201,7 @@ msgstr "ਹੋਰ ਉਪਭੋਗੀ ਦੇ ਕੈਲੰਡਰ ਦੇ ਮੈਂ�
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr ""
-"ਇੱਕ ਪਲੱਗਿੰਨ, ਜੋ ਕਿ ਐਕਸ਼ਚੇਜ਼ ਖਾਤੇ ਨਾਲ ਸਬੰਧਤ ਖਾਸ ਕਾਰਵਾਈਆਂ ਅਤੇ ਫੀਚਰ ਦੇ ਸਮੂਹ ਨੂੰ "
-"ਹੈਂਡਲ ਕਰਦੀ ਹੈ।"
+msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਐਕਸ਼ਚੇਜ਼ ਖਾਤੇ ਨਾਲ ਸਬੰਧਤ ਖਾਸ ਕਾਰਵਾਈਆਂ ਅਤੇ ਫੀਚਰ ਦੇ ਸਮੂਹ ਨੂੰ ਹੈਂਡਲ ਕਰਦੀ ਹੈ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15073,7 +15251,7 @@ msgstr "ਸਰਵਰ {0} ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
-msgstr "ਪਰਤੀਨਿਧ ਲਈ ਫੋਲਡਰ ਅਧਿਕਾਰਾਂ ਨੂੰ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਲਈ ਫੋਲਡਰ ਅਧਿਕਾਰਾਂ ਨੂੰ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
@@ -15085,7 +15263,7 @@ msgstr "ਸਰਵਰ {0} ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
-msgstr "{0} ਨੂੰ ਪਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
+msgstr "{0} ਨੂੰ ਪ੍ਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
@@ -15115,10 +15293,10 @@ msgstr "ਐਕਸਚੇਜ਼ ਖਾਤਾ ਆਫਲਾਇਨ ਹੈ।"
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
@@ -15129,8 +15307,8 @@ msgstr ""
 "ਐਕਸਚੇਜ਼ ਕੁਨੈਕਟਰ ਨੂੰ ਐਕਸਚੇਜ਼ ਸਰਵਰ ਉਤੇ ਕੁਝ ਸਹੂਲਤਾਂ ਲਈ\n"
 "ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ, ਜੋ ਕਿ ਅਯੋਗ ਜਾਂ ਬੰਦ ਜਾਪਦੀਆਂ ਹਨ।\n"
 "(ਇਹ ਅਕਸਰ ਬਿਨਾਂ ਕਾਰਨ ਹੀ ਹੋ ਸਕਦਾ ਹੈ)। ਤੁਹਾਡੇ\n"
-"ਐਕਸਚੇਜ਼ ਪਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਨੂੰ ਜਾਈਮੀਨ ਕੁਨੈਕਟਰ ਦੀ ਵਰਤੋਂ\n"
-"ਕਰਨ ਦੇਣ ਥਈ ਇਹ ਸਹੂਲਤਾਂ ਨੂੰ ਯੋਗ ਕਰਨਾ\n"
+"ਐਕਸਚੇਜ਼ ਪਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਨੂੰ ਈਵੇਲੂਸ਼ਨ ਕੁਨੈਕਟਰ ਦੀ ਵਰਤੋਂ\n"
+"ਕਰਨ ਦੇਣ ਲਈ ਇਹ ਸਹੂਲਤਾਂ ਨੂੰ ਯੋਗ ਕਰਨਾ\n"
 "ਪਵੇਗਾ।\n"
 "\n"
 "ਆਪਣੇ ਐਕਸਚੇਜ਼ ਪਰਸ਼ਾਸਕ ਨੂੰ ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ\n"
@@ -15142,7 +15320,7 @@ msgstr ""
 #  FIXME: domain/code
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
-msgstr "ਪਰਤੀਨਿਧ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ ਹੋਇਆ ਹੈ।"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ ਹੋਇਆ ਹੈ।"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
@@ -15158,7 +15336,7 @@ msgid "Folder offline"
 msgstr "ਫੋਲਡਰ ਆਫਲਾਇਨ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "ਸਧਾਰਨ ਗਲਤੀ"
 
@@ -15227,7 +15405,7 @@ msgstr "ਐਕਸਚੇਜ਼ ਸਰਵਰ ਐਕਸਚੇਜ਼ ਕੁਨੈਕ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 "ਸਰਵਰ ਐਕਸ਼ਚੇਜ਼ 5.5 ਨਾਲ ਚੱਲ ਰਿਹਾ ਹੈ। ਐਕਸ਼ਚੇਜ਼ ਕੁਨੈਕਟਰ ਮਾਈਕਰੋਸਾਫਟ\n"
@@ -15257,7 +15435,7 @@ msgstr "ਉਪਭੋਗੀ ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂ�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
-msgstr "ਪਰਤੀਨਿਧ ਨੂੰ ਸੋਧਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਸੋਧਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
@@ -15276,15 +15454,15 @@ msgid "Unsupported operation"
 msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
+msgid "You are nearing your quota available for storing mail on this server."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਰਵਰ ਉੱਤੇ ਆਪਣੇ ਪੱਤਰ ਸੰਭਾਲਣ ਲਈ ਕੋਟਾ ਭਰਨ ਦੇ ਨੇੜੇ ਹੋ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr "ਤੁਸੀਂ ਆਪਣੇ ਆਪ ਨੂੰ ਪਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾ ਸਕਦੇ"
+msgstr "ਤੁਸੀਂ ਆਪਣੇ ਆਪ ਨੂੰ ਪ੍ਰਤੀਨਿਧ ਨਹੀਂ ਬਣਾ ਸਕਦੇ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+msgid "You have exceeded your quota for storing mail on this server."
 msgstr "ਤੁਸੀਂ ਇਸ ਸਰਵਰ ਉੱਤੇ ਪੱਤਰ ਸੰਭਾਲਣ ਲਈ ਆਪਣੇ ਕੋਟੇ ਤੋਂ ਵੱਧ ਗਏ ਹੋ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
@@ -15293,23 +15471,23 @@ msgstr "ਤੁਸੀਂ ਇਕਹੇਰਾ ਐਕਸ਼ਚੇਜ਼ ਖਾਤਾ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
-msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0}ਕਿਬਾ। ਕੁਝ ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕੁਝ ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਕੁਝ ਪੱਤਰ ਹਟਾਉਣ ਨਾਲ ਕੁਝ ਥਾਂ ਸਾਫ਼ ਕਰੋ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
-msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0}ਕਿਬਾ। ਤੁਸੀਂ ਹੁਣ ਸਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr "ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਹੁਣ ਸ਼ਾਇਦ ਪੱਤਰ ਭੇਜ ਜਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
 msgstr ""
-"ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0}ਕਿਬਾ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕੁਝ ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ "
-"ਨਹੀਂ ਜਾਦਾ ਹੈ।"
+"ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਵਰਤੋਂ : {0} ਕਿਬਾ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਪੱਤਰ ਨੂੰ ਭੇਜ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਕੁਝ ਪੱਤਰਾਂ ਨੂੰ ਹਟਾਇਆ "
+"ਨਹੀਂ ਜਾਂਦਾ ਹੈ।"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15321,7 +15499,7 @@ msgstr "{0} ਨੂੰ ਪਹੁੰਚ ਕੰਟਰੋਲ ਸੂਚੀ ਵਿੱ�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਪਰਤੀਨਿਧ ਹੈ"
+msgstr "{0} ਪਹਿਲਾਂ ਹੀ ਪ੍ਰਤੀਨਿਧ ਹੈ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
@@ -15358,18 +15536,18 @@ msgstr "ਗਰੁੱਪਵਾਈਜ ਖਾਤਾ ਸੈਟਅੱਪ"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "ਕੂੜਾ ਵਿਵਸਥਾ"
+msgstr "ਕੂੜਾ ਸਥਾਪਨ"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>ਕੂੜਾ ਪੱਤਰ ਵਿਵਸਥਾ</b>"
+msgstr "<b>ਕੂੜਾ ਪੱਤਰ ਸਥਾਪਨ</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "ਕੂੜਾ ਪੱਤਰ ਵਿਵਸਥਾ..."
+msgstr "ਕੂੜਾ ਪੱਤਰ ਸਥਾਪਨ..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
 msgstr "<b>ਕੂੜਾ ਸੂਚੀ:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15378,7 +15556,7 @@ msgstr "ਈ-ਪੱਤਰ:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "ਕੂੜਾ ਪੱਤਰ ਵਿਵਸਥਾ"
+msgstr "ਕੂੜਾ ਪੱਤਰ ਸਥਾਪਨ"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -15398,14 +15576,14 @@ msgid "Add Send Options to groupwise messages"
 msgstr "ਸਮੂਹੀਕ੍ਰਿਤ ਸੁਨੇਹਿਆਂ ਲਈ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr "ਗਰੁੱਪਵਾਇਜ ਖਾਤਿਆਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਗਰੁੱਪਵਾਇਜ ਖਾਤਿਆਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
@@ -15416,11 +15594,11 @@ msgid "Accept Tentatively"
 msgstr "ਅਜ਼ਮਾਇਸੀ ਆਰਜ਼ੀ"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
+msgid "<b>Users:</b>"
 msgstr "<b>ਉਪਭੋਗੀ :</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
@@ -15437,7 +15615,7 @@ msgid "_Contacts..."
 msgstr "ਸੰਪਰਕ(_C)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
 msgstr "ਸੂਚਨਾ ਸੁਨੇਹਾ ਪਸੰਦ(_C)"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
@@ -15501,14 +15679,6 @@ msgstr "ਲਿਖੋ(_W)"
 msgid "Proxy"
 msgstr "ਪਰਾਕਸੀ"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "ਤਖਤੀ੧"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>ਖਾਤਾ ਨਾਂ</b>"
@@ -15519,7 +15689,7 @@ msgstr "ਪਰਾਕਸੀ ਲਾਗਿੰਨ"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:502
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15529,46 +15699,71 @@ msgstr "%s ਗੁਪਤ ਕੋਡ ਭਰੋ %s ਲਈ(ਉਪਭੋਗਤਾ %s)"
 msgid "_Proxy Login..."
 msgstr "ਪਰਾਕਸੀ ਲਾਗਿੰਨ(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ਜੇਕਰ ਖਾਤਾ ਆਨਲਾਇਨ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ਜੇਕਰ ਖਾਤਾ ਯੋਗ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "ਉਪਭੋਗਤਾ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr "ਉਪਭੋਗਤਾ ਦਿਓ ਅਤੇ ਅਧਿਕਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਫੋਲਡਰ(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "ਸਾਂਝ"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Track Message Status..."
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ ਟਰੈਕ..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
-msgstr "ਹੁਲਾ ਕੈਲੰਡਰ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਹੁਲਾ ਕੈਲੰਡਰ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
 msgstr "ਹੂਲਾ ਖਾਤਾ ਸੈੱਟਅੱਪ"
 
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr "ਕੈਲੰਡਰ ਆਯਾਤ(_I)"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr "ਕੰਮ ਆਯਾਤ(_I)"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+msgid "Import ICS"
+msgstr "ICS ਆਯਾਤ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+msgid "Select Task List"
+msgstr "ਕੰਮ ਸੂਚੀ ਚੁਣੋ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+msgid "Select Calendar"
+msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "ਆਯਾਤ(_I)"
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
-msgstr "iCalendar ਫਾਰਮਿਟ (.ics)"
+msgstr "iCalendar ਫਾਰਮੈਟ (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
@@ -15618,91 +15813,128 @@ msgstr "ਕੈਲੰਡਰ/ਕਰਨ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ/ਕਰਨ ਲਈ ਵਾਂਗ ਡਾਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "'%s' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ 'ਚ ਅਸਫਲ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
+
+#  FIXME: domain/code
+#: ../plugins/itip-formatter/itip-formatter.c:488
+msgid "Unable to find any calendars"
+msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:495
+msgid "Unable to find this meeting in any calendar"
+msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:499
+msgid "Unable to find this task in any task list"
+msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:503
+msgid "Unable to find this journal entry in any journal"
+msgstr "ਕਿਸੇ ਵੀ ਜਰਨਲ ਵਿੱਚ ਇਹ ਜਰਨਲ ਇੰਦਰਾਜ਼ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:529
+msgid "Searching for an existing version of this appointment"
+msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਸਵੀਕਾਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
 msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "ਸੰਗਠਕ ਨੇ ਪਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
-
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
-msgstr "ਪਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
+msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
-msgstr "ਪਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
+msgid "Sent a cancelation notice to the delegate"
+msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:909
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ਗਲਤ ਸਥਿਤੀ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਨਵੀਨੀਕਰਨ ਸੰਭਵ ਨਹੀਂ ਹੈ!"
+msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ ਨਹੀਂ ਹੈ।"
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar) ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇਕਾਈ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾਸ ਕੰਮ ਜਾਂ ਵਿਹਲਾ/ਰੁਝਿਆਂ ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾਸ ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਇਕਾਈਆਂ ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15710,330 +15942,381 @@ msgstr "ਇਹਨਾਂ ਸਭ ਇਕਾਈਆਂ ਤੇ ਕਾਰਵਾਈ ਕ�
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">ਅਪਵਾਦ ਖੋਜ</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "ਅਪਵਾਦ ਖੋਜ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "ਅਪਵਾਦ ਖੋਜ ਸਾਰਣੀ"
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:33
-#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "ਅੱਜ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "ਅੱਜ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:192
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "ਅੱਜ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "ਅੱਜ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:211
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr "ਕੱਲ੍ਹ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr "ਕੱਲ੍ਹ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:221
 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:225
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ਕੱਲ੍ਹ %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:249
 #, 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:253
+#: ../plugins/itip-formatter/itip-view.c:254
 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:257
+#: ../plugins/itip-formatter/itip-view.c:258
 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:262
+#: ../plugins/itip-formatter/itip-view.c:263
 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:266
+#: ../plugins/itip-formatter/itip-view.c:267
 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:275
+#: ../plugins/itip-formatter/itip-view.c:276
 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:281
+#: ../plugins/itip-formatter/itip-view.c:282
 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:285
+#: ../plugins/itip-formatter/itip-view.c:286
 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:290
+#: ../plugins/itip-formatter/itip-view.c:291
 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:294
+#: ../plugins/itip-formatter/itip-view.c:295
 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:300
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %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:314
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ਤੁਹਾਡੇ ਨਾਲ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜ਼ਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ਤਾਜ਼ੀ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਵਾਪਸੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਹੇਠ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਇੱਕ ਮੀਟਿੰਗ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਤਬਦੀਲੀ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪਰਾਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਲਈ %s ਲਈ ਜਿੰਮੇਵਾਰੀ ਦੀ ਮੌਜੂਦਗੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> ਨੇ ਤੁਹਾਨੂੰ ਕੰਮ ਸੌਂਪਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਮੌਜੂਦਾ ਕੰਮ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:431
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> ਮੌਜੂਦਾ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਪਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਬਾਰੇ ਜਵਾਬੀ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr "<b>%s</b> ਨੇ %s ਰਾਹੀਂ ਅੱਗੇ ਦਿੱਤਾ ਜਾਰੀ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੁਝਾਅ ਭੇਜੇ ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> ਨੇ %s ਅੱਗੇ ਦਿੱਤੇ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤੇ ਜਾਰੀ ਕੰਮ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "ਕੈਲੰਡਰ ਖੋਲੋ(_O))"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr "ਮਨਜ਼ੂਰ(_A)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Tentative all"
+msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Tentative"
+msgstr "ਆਰਜ਼ੀ(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:715
+msgid "_Accept all"
+msgstr "ਸਭ ਮਨਜ਼ੂਰ(_A)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+msgid "_Send Information"
+msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr "ਅੱਪਡੇਟ(_U)"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:891
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:900
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:916
-#: ../plugins/itip-formatter/itip-view.c:966
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "ਟਿੱਪਣੀ:"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:980
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_p)"
 
-#: ../plugins/itip-formatter/itip-view.c:989
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_p)"
 
@@ -16043,14 +16326,14 @@ msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਪਾਠ/ਕੈਲੰਡਰ ਭਾਗ �
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Itip ਫਾਰਮਿਟਰ"
+msgstr "Itip ਫਾਰਮੈਟਰ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot; ?"
 msgstr ""
-"&quot;{0}&quot; ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ। ਕੀ ਤੁਸੀਂ ਪਰਤੀਨਿਧ &quot;{1}&quot; ਨੂੰ ਜੋੜਨਾ "
+"&quot;{0}&quot; ਮੀਟਿੰਗ ਲਈ ਅਧਿਕਰਿਤ ਹੈ। ਕੀ ਤੁਸੀਂ ਪ੍ਰਤੀਨਿਧ &quot;{1}&quot; ਨੂੰ ਜੋੜਨਾ "
 "ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16093,7 +16376,7 @@ msgstr "ਕੋਈ ਸਟੋਰੇਜ਼ ਉਪਲੱਬਧ ਨਹੀਂ"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "ਪੱਤਰ ਡਾਟੇ ਨੂੰ ਰਿਮੋਟ ਤੋਂ ਵਰਤਣ ਲਈ ਇੱਕ CORBA ਇੰਟਰਫੇਸ ਸਥਾਪਨ ਲਈ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਪੱਤਰ ਡਾਟੇ ਨੂੰ ਰਿਮੋਟ ਤੋਂ ਵਰਤਣ ਲਈ ਇੱਕ CORBA ਇੰਟਰਫੇਸ ਸਥਾਪਨ ਲਈ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 msgid "Mail Remote"
@@ -16103,7 +16386,7 @@ msgstr "ਪੱਤਰ ਰਿਮੋਟ"
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr "ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਤੋਂ ਮੀਟਿੰਗਾਂ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਤੋਂ ਮੀਟਿੰਗਾਂ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -16117,9 +16400,10 @@ msgstr "ਮੀਟਿੰਗ ਲਈ ਪੱਤਰ"
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗ ਤੋਂ ਕੰਮ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗ ਤੋਂ ਕੰਮ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr "ਕੰਮ 'ਚ ਬਦਲੋ(_v)"
 
@@ -16127,6 +16411,10 @@ msgstr "ਕੰਮ 'ਚ ਬਦਲੋ(_v)"
 msgid "Mail to task"
 msgstr "ਕੰਮ ਲਈ ਪੱਤਰ"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਨਵੇਂ ਕੰਮ 'ਚ ਬਦਲੋ"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact list _owner"
@@ -16303,7 +16591,7 @@ msgstr "ਕੈਲੰਡਰ ਆਫਲਾਇਨ ਵਰਤੋਂ ਲਈ ਨਿਸ�
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "ਮੋਨੋ ਪਲੱਗਿੰਨ ਦੇ ਸਥਾਪਨ ਲਈ ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਮੋਨੋ ਪਲੱਗ-ਇਨ ਦੇ ਸਥਾਪਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
@@ -16323,63 +16611,52 @@ msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "ਇੱਕ ਪਲੱਗਿੰਨ, ਜੋ ਕਿ ਪਲੱਗਿੰਨਾਂ ਨੂੰ ਯੋਗ ਅਤੇ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਲੱਗ-ਇਨਾਂ ਨੂੰ ਯੋਗ ਅਤੇ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr "ਪਲੱਗਿੰਨ ਪਰਬੰਧਕ"
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
+msgstr "ਪਲੱਗ-ਇਨ ਮੈਨੇਜਰ"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr "ਪਲੱਗਿੰਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
+msgstr "ਪਲੱਗ-ਇਨ ਆਯੋਗ ਤੇ ਚਾਲੂ"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr "ਪਲੱਗਿੰਨ"
+msgid "_Plugins"
+msgstr "ਪਲੱਗ-ਇਨ(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "ਲੇਖਕ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "ਮਾਰਗ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "ਪਲੱਗਿੰਨ ਪ੍ਰਬੰਧਕ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ਸੂਚਨਾ: ਕੁਝ ਤਬਦੀਲੀਆਂ ਮੁੜ ਚਾਲੂ ਹੋਣ ਤੱਕ ਪ੍ਰਭਾਵੀ ਨਹੀਂ ਹੋ ਸਕਦੀਆਂ ਹਨ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
-msgstr "ਪਲੱਗਿੰਨ"
+msgstr "ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"ਇੱਕ ਜਾਂਚ ਪਲੱਗਿੰਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮਿਟ ਪਲੱਗਿੰਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML ਪੱਤਰਾਂ "
+"ਇੱਕ ਜਾਂਚ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML ਪੱਤਰਾਂ "
 "ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "\n"
-"ਇਹ ਪਲੱਗਿੰਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਨਕਲ ਕੋਡ ਹੀ ਹੈ।\n"
+"ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਝਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -16411,8 +16688,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "ਲੇਖਕ ਤੋਂ ਪੱਤਰ ਛਾਪਣ ਲਈ ਇੱਕ ਚੋਣ ਦਿੰਦਾ ਹੈ"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "ਛਾਪਣ ਦਰਿਸ਼(_v)"
@@ -16445,7 +16722,7 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:371
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "ਕੀ ਤੁਸੀਂ URL ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
@@ -16468,14 +16745,18 @@ msgstr ""
 "ਦਸਤੀ (ਕਾਰਵਾਈ ਮੇਨੂ ਰਾਹੀਂ)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "ਪੋਰਟ(_o):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
 msgstr "ਪਰਕਾਸ਼ਣ ਟਿਕਾਣਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
 msgstr "ਪਰਕਾਸ਼ਨ ਆਵਿਰਤੀ(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -16493,11 +16774,11 @@ msgstr ""
 "ਸੁਰੱਖਿਅਤ WebDAV (HTTPS)\n"
 "ਪਸੰਦੀਦਾ ਟਿਕਾਣਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
 msgstr "ਸੇਵਾ ਕਿਸਮ(_T): "
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
 msgstr "ਫਾਇਲ(_F):"
 
@@ -16505,7 +16786,7 @@ msgstr "ਫਾਇਲ(_F):"
 msgid "_Publish as:"
 msgstr "ਇੰਜ ਪਰਕਾਸ਼ਤ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -16513,21 +16794,25 @@ msgstr ""
 "iCal\n"
 "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ਸ਼ਾਮਿਲ)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
-msgstr "ਸਾ ਕੂੜਾ-ਪਲੱਗਿੰਨ"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
+"Spamassassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੂੜਾ ਪੱਤਰ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ Spamassassin "
+"ਇੰਸਟਾਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr "ਕੂੜਾ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੂੜਾ ਸੁਨੇਹਿਆਂ ਬਾਰੇ ਸਿਖੋ"
+msgid "Spamassassin junk plugin"
+msgstr "Spamassassin ਕੂੜਾ ਪਲੱਗ-ਇਨ"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਨੱਥੀ ਸਭ ਦਸਤਾਵੇਜ਼ ਜਾਂ ਭਾਗਾਂ ਨੂੰ ਇੱਕੋ ਵਾਰ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਪਲੱਗਿੰਨ ਹੈ।"
+msgstr "ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਨੱਥੀ ਸਭ ਦਸਤਾਵੇਜ਼ ਜਾਂ ਭਾਗਾਂ ਨੂੰ ਇੱਕੋ ਵਾਰ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -16551,7 +16836,7 @@ msgid "MIME Type"
 msgstr "MIME ਕਿਸਮ"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -16564,8 +16849,8 @@ msgid "%F %T"
 msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
@@ -16600,8 +16885,8 @@ msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+msgid "URL"
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -16613,7 +16898,7 @@ msgstr "ਸੋਧਿਆ"
 
 #: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
-msgstr "CSV ਫਾਰਮਿਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ"
+msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ"
 
 #: ../plugins/save-calendar/csv-format.c:559
 msgid "Prepend a header"
@@ -16633,20 +16918,20 @@ msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ:"
 
 #: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
-msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਮੁੱਲ਼ ਫਾਰਮਿਟ (.csv)"
+msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਮੁੱਲ਼ ਫਾਰਮੈਟ (.csv)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "ਡਿਸਲ 'ਤੇ ਸੰਭਾਲੋ(_D)"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਜਾਂ ਕੰਮਾਂ ਨੂੰ ਡਿਸਕ 'ਤੇ ਸੰਭਾਲੋ।"
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ(_S)"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
@@ -16658,10 +16943,10 @@ msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
-msgstr "RDF ਫਾਰਮਿਟ (.rdf)"
+msgstr "RDF ਫਾਰਮੈਟ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚੁਣੋ"
 
@@ -16674,14 +16959,18 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "ਵੇਖਣ ਲਈ ਇੱਕ ਇੱਕਲੇ ਕੈਲੰਡਰ ਜਾਂ ਕੰਮ ਸਰੋਤ ਨੂੰ ਚੁਣੋ।"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
-msgstr "ਇਸ ਮਹੀਨੇ ਦਾ ਕੈਲੰਡਰ ਹੀ ਵੇਖਾਓ(_S)"
+msgid "Show _only this Calendar"
+msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖਾਓ(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
-msgstr "ਇਹ ਕੰਮ ਸੂਚੀ ਹੀ ਵੇਖਾਓ(_S)"
+msgid "Show _only this Task List"
+msgstr "ਸਿਰਫ਼ ਇਹ ਕੰਮ ਸੂਚੀ ਹੀ ਵੇਖਾਓ(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "ਸ਼ੁਰੂਆਤੀ ਸਹਾਇਕ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਵਾਲੀ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਹਾਇਕ"
 
@@ -16710,13 +16999,13 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਆਯਾਤ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "ਵੱਲੋਂ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "ਡਾਟਾ ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
@@ -16756,7 +17045,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਜਾਂਚ ਭਾਗ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr "ਮੌਜੂਦਾ ਪ੍ਰਿੰਟਰ ਵਿਵਸਥਾ ਲਈ ਗਨੋਮ ਪ੍ਰਿੰਟਰ ਵੇਰਵਾ"
+msgstr "ਮੌਜੂਦਾ ਪ੍ਰਿੰਟਰ ਸਥਾਪਨ ਲਈ ਗਨੋਮ ਪ੍ਰਿੰਟਰ ਵੇਰਵਾ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -16788,72 +17077,84 @@ msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਮਕਾਲ
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
-msgstr "ਪ੍ਰਿੰਟਰ ਵਿਵਸਥਾ..."
+msgstr "ਪ੍ਰਿੰਟਰ ਸਥਾਪਨ..."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਵਾਰਤਾਲਾਪ ਛੱਡੋ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
-msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ"
-
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖਾ ਦੀ ਮੂਲ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
-msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਨਵੀਨੀਕਰਨ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ "
+"(ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 "ਝਰੋਖਾ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਹੈ। \"ਪਾਠ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਸੰਦ-ਪੱਟੀ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਸੰਦ-ਪੱਟੀ"
-"\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਸੰਦ-ਪੱਟੀ ਵਿਵਸਥਾ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਨਿਰਧਾਰਿਤ ਕੀਤੀ ਜਾਵੇਗੀ।"
+"\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਸੰਦ-ਪੱਟੀ ਸਥਾਪਨ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਨਿਰਧਾਰਿਤ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "ਸੰਦਪੱਟੀ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਢੰਗ ਨਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਵੇਗਾ, ਨਾਕਿ ਆਨਲਾਇਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਕਾਸ ਵਰਜਨ ਵਾਰਤਾਲਾਪ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਝਰੋਖਾ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਸ਼ੈਲੀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
@@ -16869,8 +17170,8 @@ msgstr "ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਦਬਾਓ"
 msgid "Click OK to close these connections and go offline"
 msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕਰਨ ਲਈ ਅਤੇ ਆਫਲਾਇਨ ਜਾਣ ਲਈ OK ਦਬਾਓ"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(ਬਿਨਾਂ ਸਿਰਲੇਖ)"
 
@@ -16920,19 +17221,15 @@ msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
 #: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
-msgstr "ਪੁਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਵਿਵਸਥਾ ਆਯਾਤ ਕਰੋ"
+msgstr "ਪੁਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਆਯਾਤ ਕਰੋ"
 
 #: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "ਇੱਕ ਇਕਹੇਰੀ ਫਾਇਲ ਆਯਾਤ ਕਰੋ(_s)"
 
-#: ../shell/e-shell-importer.c:703
-msgid "_Import"
-msgstr "ਆਯਾਤ(_I)"
-
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿਵਸਥਾ"
+msgid "Evolution Preferences"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਪਸੰਦ"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -16974,41 +17271,37 @@ msgstr "ਬੱਗ-ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸ
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ (amanpreetalam@yahoo.com)\n"
 "ਪੰਜਾਬ ਲੀਨਕਸ ਤਕਨਾਲੋਜੀ (http://punlinux.sf.net)"
 
-#: ../shell/e-shell-window-commands.c:547
-msgid "Groupware Suite"
-msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
-
-#: ../shell/e-shell-window-commands.c:778
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "ਆਨਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:791 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "ਆਫਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:804
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ"
 
-#: ../shell/e-shell-window.c:370
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:368
+msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:385
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:383
+msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਇਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:775
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
@@ -17017,24 +17310,24 @@ msgstr "%s ਲਈ ਤਬਦੀਲ"
 msgid "Uknown system error."
 msgstr "ਅਣਪਛਾਤੀ ਸਿਸਟਮ ਗਲਤੀ।"
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ਕਿਬਾ"
 
-#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ"
 
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "OAF ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ"
 
-#: ../shell/e-shell.c:1275
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨਹੀਂ ਲੱਭਾ ਹੈ"
 
@@ -17137,7 +17430,7 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
 #: ../shell/main.c:261
-msgid "Don't tell me again"
+msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
 #: ../shell/main.c:471
@@ -17162,7 +17455,7 @@ msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱ�
 
 #: ../shell/main.c:487
 msgid "Disable loading of any plugins."
-msgstr "ਕੋਈ ਪਲੱਗਿੰਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
+msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
 #: ../shell/main.c:518
 #, c-format
@@ -17194,13 +17487,13 @@ msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
-"ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਗੁਪਤ-ਕੋਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ "
-"ਪਈ ਤਾਂ ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
+"ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਭੁੱਲਣ ਨਾਲ ਸਭ ਗੁਪਤ-ਕੋਡਾਂ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਹਾਨੂੰ ਜਦੋਂ ਉਹਨਾਂ ਦੀ ਲੋੜ ਪਈ ਤਾਂ "
+"ਮੁੜ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
 
 #  shell:upgrade-nospace primary
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
-msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਥੋੜੀ ਡਿਸਕ ਥਾਂ ਹੈ"
+msgstr "ਅੱਪਗਰੇਡ ਲਈ ਲੋੜੀਦੀ ਡਿਸਕ ਥਾਂ ਨਹੀਂ ਹੈ।"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
@@ -17209,7 +17502,7 @@ msgstr "ਕੀ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਉਣਾ ਹੈ?"
 #  shell:upgrade-remove-1-4-confirm secondary
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17224,38 +17517,38 @@ msgstr ""
 "ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖੁਦ ਜਾਂਚ "
 "ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪੁਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
 "\n"
-"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ "
-"ਨਾ ਵਰਤੋਂ।\n"
+"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, "
+"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ ਨਾ ਵਰਤੋਂ।\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੇ ਡਾਟਾ ਕਿਸੇ ਵੱਖਰੇ ਟਿਕਾਣੇ ਉੱਤੇ ਸੰਭਾਲਿਆ ਸੀ।\n"
 "\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ "
-"ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਤੇ &quot;"
-"evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ "
+"ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ "
+"ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
-msgstr "ਪੁਰਾਣੇ ਵਰਜਨ ਤੇ ਨਵੀਨੀਕਰਨ ਅਸਫਲ: {0}"
+msgstr "ਪੁਰਾਣੇ ਵਰਜਨ ਉੱਤੇ ਅੱਪਗਰੇਡ ਅਸਫਲ: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"ਤੁਹਾਡੇ ਡਾਟਾ ਤੇ ਵਿਵਸਥਾ ਦੇ ਨਵੀਨੀਕਰਨ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ {1} ਉਪਲੱਬਧ "
-"ਹੈ।\n"
+"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ "
+"{1} ਉਪਲੱਬਧ ਹੈ।\n"
 "\n"
 "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਹੋਰ ਥਾਂ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
 
@@ -17315,9 +17608,9 @@ msgid ""
 msgstr ""
 "ਸਰਟੀਫਿਕੇਟ '%s' ਇੱਕ CA ਸਰਟੀਫਿਕੇਟ ਹੈ\n"
 "\n"
-"ਵਿਸ਼ਵਾਸ ਵਿਵਸਥਾ ਵਿੱਚ ਸੋਧ:"
+"ਵਿਸ਼ਵਾਸ ਸਥਾਪਨ ਵਿੱਚ ਸੋਧ:"
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -17326,7 +17619,7 @@ msgstr ""
 "ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾਂ ਕਰਦੇ ਹੋ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ "
 "ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -17337,26 +17630,26 @@ msgstr ""
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:379
-#: ../smime/gui/certificate-manager.c:387
-#: ../smime/gui/certificate-manager.c:599
-#: ../smime/gui/certificate-manager.c:607
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
 msgstr "ਅਯਾਤ ਕਰਨ ਲਈ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..."
 
 #: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:476
-#: ../smime/gui/certificate-manager.c:694
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਾਂ"
 
 #: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:494
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "ਮਕਸਦ"
 
 #: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "ਕਰਮ ਅੰਕ"
 
@@ -17364,26 +17657,26 @@ msgstr "ਕਰਮ ਅੰਕ"
 msgid "Expires"
 msgstr "ਮਿਆਦ"
 
-#: ../smime/gui/certificate-manager.c:485
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ"
 
-#: ../smime/gui/certificate-viewer.c:342
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਰਸ਼ਕ: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "`%s' ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਡਾਟਾਬੇਸ ਲਈ ਨਵਾਂ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "ਨਵਾਂ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
@@ -17467,7 +17760,7 @@ msgstr ""
 "ਕਿਸੇ ਕੰਮ ਲਈ ਇਸ CA ਤੇ ਭਰੋਸਾ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਵੇਖ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ "
 "ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
@@ -17505,7 +17798,7 @@ msgstr "ਸੋਧ"
 
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
-msgstr "ਈ-ਪੱਤਰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਵਿਵਸਥਾ"
+msgstr "ਈ-ਪੱਤਰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਸਥਾਪਨ"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
@@ -17543,11 +17836,11 @@ msgstr "ਸੰਗਠਨ ਇਕਾਈ (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "SSL ਕਲਾਂਇਟ ਸਰਟੀਫਿਕੇਟ"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"
 
@@ -17593,210 +17886,170 @@ msgstr "CA ਭਰੋਸਾ ਸੋਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:654
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
 msgstr "ਇਕ੍ਰਿਪਟ"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "ਵਰਜਨ"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "ਵਰਜਨ 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "ਵਰਜਨ 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ਇਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਕੁੰਜੀ ਵਰਤੋਂ"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "ਨੈੱਟਸਕੇਪ ਸਰਟੀਫਿਕੇਟ ਕਿਸਮ"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਕੀ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "ਪੂਰਬ"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ਇਕਾਈ ਪਛਾਣਕਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "ਐਲੋਗਰਿਥਮ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "ਐਲੋਗਰਿਥਮ ਪੈਰਾਮੀਟਰ"
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵਜਨਕ ਕੀ ਜਾਣਕਾਰੀ"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼ੇ ਦਾ ਸਰਵਜਨਕ ਕੀ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼ੇ ਦੀ ਸਰਵਜਨਕ ਕੀ"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "ਗਲਤੀ: ਕਾਰਜ ਵਾਧੇ ਲਈ ਅਸਫਲ"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "ਆਬਜੈਕਟ ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr "ਈ-ਪੱਤਰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "ਨਾ-ਇਨਕਾਰ"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr "ਕੀ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "ਡਾਟਾ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr "ਕੁੰਜੀ ਇਕਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "ਘਾਤਕ ਨਹੀਂ"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "ਜਾਰੀ ਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ਜਾਰੀ ਕਰਤਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਮੁੱਲ"
 
@@ -17812,27 +18065,27 @@ msgstr "PKCS12 ਫਾਇਲ ਲਈ ਗੁਪਤ-ਕੋਡ:"
 msgid "Imported Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਲਿਆਓ"
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਨੱਥੀ।"
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "ਨੱਥੀ ਦੇ ਵਿੱਚ ਸ਼ਾਮਿਲ ਭਾਗ ਦੀ ਕਿਸਮ"
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "ਪੱਤਰ ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਫਾਇਲ਼ ਨਾਂ"
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "ਨੱਥੀ ਦਾ ਵੇਰਵਾ"
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "ਨੱਥੀ ਨੂੰ ਮੂਲ ਰੂਪ ਵਿੱਚ ਇੱਕ ਰੇਖਾ ਵਿੱਚ ਹੀ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "ਸੁਨੇਹੇ ਲਈ ਮੂਲ ਵਿਸ਼ਾ"
 
@@ -17849,118 +18102,210 @@ msgstr "'%s' ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ:
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਵਿਸ਼ੇਸ਼ਤਾ (_B)"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਤਬਦੀਲ"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "ਸਭ ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਨਕਲ (_p)..."
+
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "ਸੰਪਰਕ ਝਲਕ(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਭਾਗਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰੋ"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "ਚੁਣੇ ਦੀ ਨਕਲ"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "ਨਵਾਂ ਸਿਰਨਾਵਾਂ-ਕਿਤਾਬ ਫੋਲਡਰ ਬਣਾਓ"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ਕੱਟੋ"
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "ਚੁਣੇ ਕੱਟੋ"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ ਹਟਾਓ(_e)"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "ਚੁਣਿਆ ਫੋਲਡਰ ਹਟਾਓ"
+
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "ਸਭ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜੋ(_v)..."
+
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰਾਂ ਵਿੱਚ ਭੇਜੋ..."
+msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ..."
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "ਫੋਲਡਰ ਭੇਜੋ..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ਚਿਪਕਾਉ"
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਚਿਪਕਾਓ"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "ਛਾਪਣ ਵਾਲੇ ਸੰਪਰਕ ਵੇਖਾਓ"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਛਾਪੋ"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦਾ ਨਾਂ-ਤਬਦੀਲ"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "ਸਿਰਨਾਵਾਂ ਕਿਤਾਬ VC_ard ਵਾਂਗ ਸੰਭਾਲੋ"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "ਚੁਣੇ ਸੰਪਰਕ ਨੂੰ VCard ਰਾਹੀ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ VCard ਵਾਂਗ ਸੰਭਾਲੋ"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "ਸਭ ਚੁਣੋ"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "ਸਭ ਚੁਣੋ(_A)"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਚੁਣੋ"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ।"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਭੇਜੋ।"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "ਸੰਪਰਕ ਦਰਿਸ਼ ਝਰੋਖਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "ਰੋਕੋ(_o)"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "ਲੋਡ ਕਰਨ ਨੂੰ ਰੋਕੋ"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "ਮੌਜੂਦਾ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "ਕਾਰਵਾਈ(_A)"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਨਕਲ(_C)..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "ਫੋਲਡਰ ਸੰਪਰਕਾਂ ਦੀ ਇੱਥੇ ਨਕਲ(_C)"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "ਸੰਪਰਕ ਹਟਾਓ(_D)"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "ਸੰਪਰਕ ਨੂੰ ਅੱਗੇ(_F)..."
+msgstr "ਸੰਪਰਕ ਨੂੰ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "ਸਭ ਚੁਣੋ(_S)"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)..."
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "ਫੋਲਡਰ ਸੰਪਰਕ ਇੱਥੇ ਭੇਜੋ(_M)"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+msgid "_New"
+msgstr "ਨਵਾਂ(_N)"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "ਨਾਂ ਤਬਦੀਲ(_R)"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "ਸੰਪਰਕ ਨੂੰ VCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "ਫੋਲਡਰ ਸੰਪਰਕ ਨੂੰ VCard ਰਾਹੀਂ ਵਾਂਗ ਸੰਭਾਲੋ (_S)"
+
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
@@ -17969,135 +18314,143 @@ msgid "Day"
 msgstr "ਦਿਨ"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ"
+msgid "Delete _all Occurrences"
+msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "ਰੁਝੇਵਾਂ ਹਟਾਓ"
+msgid "Delete all occurrences"
+msgstr "ਸਭ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ"
+msgid "Delete the appointment"
+msgstr "ਰੁਝੇਵਾਂ ਹਟਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "ਜਾਉ"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "ਪਿੱਛੇ ਜਾਉ"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "ਅੱਗੇ ਜਾਉ"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "ਸੂਚੀ"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "ਛਾਪਣ ਲਈ ਕੈਲੰਡਰ ਦਾ ਦਰਿਸ਼"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "ਇਹ ਕੈਲੰਡਰ ਛਾਪੋ"
 
-#: ../ui/evolution-calendar.xml.h:22 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "ਨਿਚੋੜ(_e)"
 
-#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "ਪੁਰਾਣੇ ਰੁਝੇਵਾਂ ਅਤੇ ਮੀਟਿੰਗਾਂ ਵਿੱਚ ਸੋਧ"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ(_D)"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_T)"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "ਖਾਸ ਮਿਤੀ ਚੁਣੋ"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "ਅੱਜ ਚੁਣੋ"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "ਸੂਚੀ ਦੀ ਤਰਾਂ ਵੇਖੋ"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "ਇੱਕ ਦਿਨ ਵੇਖਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "ਇੱਕ ਮਹੀਨਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "ਇੱਕ ਹਫ਼ਤਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "ਕਾਰਜਕਾਰੀ ਹਫਤਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-calendar.xml.h:34
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "ਮੌਜੂਦਾ ਰੁਝੇਵਾਂ ਦੇਖੋ"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "ਕੰਮ ਹਫਤਾ"
 
-#: ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "ਰੁਝੇਵੇ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "ਚੁਣਿਆ ਪਾਠ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
-#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
+#: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr "ਚੋਣ ਦੀ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr "ਚੋਣ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਲਈ ਕੱਟੋ"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੇਪੋ"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਨਕਲ ਕਰੋ"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "ਸਭ ਚੁਣੋ(_A)"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "ਸਾਰਾ ਪਾਠ ਚੁਣੋ"
 
@@ -18118,8 +18471,8 @@ msgid "Click here to save the current window"
 msgstr "ਮੌਜੂਦਾ ਝਰੋਖਾ ਸੰਭਾਲਣ ਲਈ ਦਬਾਓ"
 
 #: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
-msgstr "ਉਪਲੱਬਧ ਝਲਕ ਵੇਖਣ ਲਈ ਦਬਾਓ"
+msgid "Click here to view help available"
+msgstr "ਉਪਲੱਬਧ ਸਹਾਇਤਾ ਵੇਖਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18132,28 +18485,27 @@ msgstr "ਉਪਲੱਬਧ ਝਲਕ ਵੇਖਣ ਲਈ ਦਬਾਓ"
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "ਨੱਥੀ(_a)..."
 
 #: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "ਸਹਾਇਤਾ(_H)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:48
-#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-editor.xml.h:20
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_I)"
 
@@ -18162,121 +18514,133 @@ msgid "_Options"
 msgstr "ਚੋਣ(_O)"
 
 #: ../ui/evolution-event-editor.xml.h:2
-msgid "All day Event"
-msgstr "ਸਭ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ"
+msgid "All Day Event"
+msgstr "ਸਭ ਦਿਨ ਘਟਨਾ"
 
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:3
+msgid "All _Day Event"
+msgstr "ਸਭ ਦਿਨ ਘਟਨਾਵਾਂ(_D)"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "ਗੁਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਨੂੰ ਸੈੱਟ ਜਾਂ ਨਾ-ਸੈੱਟ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣ ਸ਼ਾਮਲ"
 
-#: ../ui/evolution-event-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
 
-#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "ਪਬਲਿਕ(_b)"
 
-#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
 msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪਤਾ ਕਰੋ"
 
-#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "ਰੋਲ ਖੇਤਰ(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "ਸਮਾਂ-ਖੇਤਰ ਵੇਖਾਓ(_Z):"
-
 #: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as b_usy"
-msgstr "ਸਮਾਂ ਰੁਝੇ ਵਾਂਗ ਵੇਖਾਓ(_U)"
+msgid "Show time as _busy"
+msgstr "ਸਮਾਂ ਰੁਝੇ ਵਾਂਗ ਵੇਖਾਓ(_B)"
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਖ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਝਲਕ ਵਰਗ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:23
-msgid "Toggles whether to have All day Event"
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਾਰੇ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "_Alarms"
 msgstr "ਅਲਾਰਮ(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "_All day Event"
-msgstr "ਸਭ ਦਿਨ ਦੀਆਂ ਘਟਨਾਵਾਂ(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "ਵਰਗੀਕਰਨ(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "ਗੁਪਤ(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F)"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "ਨਿੱਜੀ(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "ਦੁਹਰਾ(_R)"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
 
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "ਮੇਰਾ ਈਵੇਲੂਸ਼ਨ ਪ੍ਰਚਲਣ"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ਮੌਜੂਦਾ ਮੇਲ ਕਾਰਵਾਈ ਰੱਦ ਕਰੋ"
@@ -18301,44 +18665,44 @@ msgstr "ਨਵੀਂ ਮੇਲ ਨੂੰ ਫਿਲਟਰ ਕਰਨ ਲਈ ਨਿ
 msgid "Empty _Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "ਫੋਲਡਰ(_o)"
 
 #: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "ਪੱਤਰ ਫਿਲਟਰ(_i)"
-
-#: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ(_P)"
 
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਵਿੱਚੋਂ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "ਫੋਲਡਰ ਖੋਜ(_o)"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr "ਸੁਨੇਹਾ ਦਰਿਸ਼ ਝਰੋਖਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਤੇ ਫੋਲਡਰਾਂ ਲਈ ਸਹਿਮਤੀ ਜਾਂ ਨਾ-ਸਹਿਮਤੀ"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)..."
 
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ(_M)"
+
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
@@ -18362,96 +18726,112 @@ msgstr "ਇਸ ਫੋਲਡਰ ਦਾ ਨਾਂ ਤਬਦੀਲ"
 msgid "Change the properties of this folder"
 msgstr "ਇਸ ਫੋਲਡਰ ਦੀਆਂ ਵਿਸ਼ੇਸਤਾਵਾਂ ਤਬਦੀਲ"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "ਸਭ ਮਾਮਲੇ ਸਮੇਟੋ(_T)"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "ਸਭ ਸੁਨੇਹਾ ਮਾਮਲੇ ਸਮੇਟੋ"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "ਸਭ ਮਾਮਲੇ ਫੈਲਾਓ(_x)"
+
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "ਮਿਟਾਓ(_x)"
 
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
-msgstr "ਮਾਮਲੇ ਨਾਲ ਗਰੁੱਪ(_T)"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "ਸਭ ਸੁਨੇਹਾ ਮਾਮਲੇ ਫੈਲਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਓਹਲੇ(_e)"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "ਹਟਾਏ ਸੁਨੇਹੇ ਓਹਲੇ(_D)"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "ਪੜੇ ਸੁਨੇਹੇ ਓਹਲੇ(_R)"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "ਹਟਾਏ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਰੇਖਾ ਵੇਖਾਉਣ ਦੀ ਬਜਾਏ ਓਹਲੇ ਕਰੋ"
 
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mar_k Messages as Read"
-msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆ ਬਣਾਓ(_K)"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਓ(_K)"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਚਿਪਕਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹਟਾਏ ਸੁਨੇਹੇ ਇਸ ਫੋਲਡਰ ਵਿੱਚੋਂ ਹਟਾ ਦਿਓ"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "ਇਹ ਫੋਲਡਰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select Message _Thread"
 msgstr "ਸੁਨੇਹਾ ਮਾਮਲਾ ਵੇਖਾਓ(_T)"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਚੁਣੋ(_A)"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr "ਸਭ ਤੇ ਸਿਰਫ਼ ਉਹੀ ਸੁਨੇਹੇ ਚੁਣੋ ਜੋ ਕਿ ਮੌਜੂਦਾ ਸਮੇਂ ਨਹੀਂ ਚੁਣੇ"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ਇੱਕੋ ਮਸਲੇ ਦੇ ਸਾਰੇ ਸੁਨੇਹੇ ਚੁਣੇ ਸੁਨੇਹੇ ਬਣਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
 msgstr "ਸਾਰੇ ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਚੁਣੋ"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
 msgstr "ਲੁਕਵੇਂ ਸੁਨੇਹੇ ਵੇਖਾਓ(_o)"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr "ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਓਹਲੇ ਸੁਨੇਹੇ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr "ਸਾਰੇ ਪੜੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਓਹਲੇ ਕਰੋ"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਓਹਲੇ ਕਰੋ"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr "ਮਸਲਾ ਸੁਨੇਹਾ ਸੂਚੀ"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr "ਮਾਮਲੇ ਨਾਲ ਗਰੁੱਪ(_G)"
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "ਸੁਨੇਹਾ(_M)"
@@ -18497,10 +18877,14 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ �
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੇ ਭੇਜਣ ਵਾਲੇ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਨੂੰ ਇੱਕ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰੋ"
 
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਨਕਲ ਕਰੋ"
+
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "ਨਿਯਮ ਬਣਾਓ(_u)"
@@ -18537,6 +18921,10 @@ msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁ�
 msgid "Create a rule to filter messages with this subject"
 msgstr "ਇਸ ਵਿਸ਼ੇ ਨਾਲ ਸੰਬੰਧਿਤ ਸੁਨੇਹੇ ਵੱਖ ਕਰਨ ਲਈ ਇੱਕ ਨਿਯਮ ਬਣਾਓ"
 
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਭੇਜੋ"
+
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "ਪਾਠ ਆਕਾਰ ਘਟਾਓ"
@@ -18550,12 +18938,12 @@ msgid "Display the next message"
 msgstr "ਅਗਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "ਅਗਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
+msgid "Display the next thread"
+msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਮਸਲਾ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "ਅਗਲਾ ਨਾ-ਪੜਿਆ ਮਸਲਾ ਵੇਖਾਓ"
+msgid "Display the next unread message"
+msgstr "ਅਗਲਾ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
@@ -18594,8 +18982,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਬੇਕਾਰ ਸਥਿਤੀ ਲਈ ਜਾਂਚੋ"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕਰੋ"
+msgid "Flag selected messages for follow-up"
+msgstr "ਧਿਆਨ ਰੱਖਣ ਲਈ ਚੁਣੇ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -18630,221 +19018,225 @@ msgid "Mar_k as"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਪੜੇ ਬਣਾਉਣ ਲਈ ਚੁਣੋ"
+msgid "Mark the selected messages as having been read"
+msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਪੜੇ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਜਰੂਰੀ ਬਣਾਉਣ ਲਈ ਚੁਣੋ"
+msgid "Mark the selected messages as important"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਖਾਸ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਰੱਦੀ  ਬਣਾਉਣ ਲਈ ਚੁਣੋ"
+msgid "Mark the selected messages as junk"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕੂੜਾ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਰੱਦੀ ਨਾ ਬਣਾਉਣ ਲਈ ਚੁਣੋ"
+msgid "Mark the selected messages as not being junk"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕੂੜਾ-ਨਹੀਂ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਨਾ-ਪੜੇ ਬਣਾਉਣ ਲਈ ਚੁਣੋ"
+msgid "Mark the selected messages as not having been read"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਪੜ੍ਹੇ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਨਾ-ਜਰੂਰੀ ਬਣਾਓ"
+msgid "Mark the selected messages as unimportant"
+msgstr "ਚੁਣੇ ਸੁਨਹੇ ਨਾ-ਜ਼ਰੂਰੀ ਬਣਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਚੁਣੋ"
 
 #: ../ui/evolution-mail-message.xml.h:57
-msgid "Message Source"
-msgstr "ਸੁਨੇਹਾ ਸਰੋਤ"
+msgid "Move selected messages to another folder"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move selected message(s) to another folder"
-msgstr "ਚੁਣੇ ਸੁਨਹਿਆਂ ਨੂੰ ਹੋਰ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
-
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "ਨਵਾਂ ਖਾਸ ਸੁਨੇਹਾ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "ਅੱਗੇ ਮਸਲਾ(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖਣ ਲਈ ਝਰੋਖਾ ਖੋਲੋ"
 
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਵੇਂ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲ੍ਹੋ"
+
 #: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in a new window"
-msgstr "ਚੁਣਿਆ ਸੁਨੇਹਾ ਨਵੇਂ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲੋ"
+msgid "Open the selected messages in the composer for editing"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਸੋਧ ਲਈ ਰਚੇਤਾ (ਕੰਪੋਜ਼ਰ) ਵਿੱਚ ਖੋਲੋ"
 
 #: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in the composer for editing"
-msgstr "ਚੁਣਿਆ ਸੁਨੇਹਾ ਸੋਧ ਲਈ ਨਿਰਮਾਤਾ ਵਿੱਚ ਖੋਲੋ"
-
-#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱਛੇ ਨਾ-ਪੜਿਆ ਸੁਨੇਹਾ(_r)"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "ਸੁਨੇਹੇ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਚੇਪੋ"
+
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "ਫੋਲਡਰ ਲਈ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_t)"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "ਇੱਕ ਜਵਾਬ ਭੇਜੋ(_y)"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "ਸੁਨੇਹਾ ਸਰਵਜਨਕ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "ਸਰਵਜਨਕ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹਾ ਜਵਾਬ ਲਈ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਵੇਖਾਓ(_e)"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "ਛਾਪਣ ਵਾਲਾ ਸੁਨੇਹਾ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਛਾਪੋ"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "ਪਾਠ ਨੂੰ ਅਸਲੀ ਆਕਾਰ ਮੁਤਾਬਕ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
-msgstr "ਸੁਨੇਹੇ ਨੂੰ ਪਾਠ ਫਾਇਲ਼ ਦੇ ਤੌਰ ਤੇ ਸੰਭਾਲੋ"
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪਾਠ ਫਾਇਲ਼ ਦੇ ਤੌਰ ਉੱਤੇ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "ਸਨੇਹਿਆਂ ਤੋਂ ਖੋਜ ਫੋਲਡਰ"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼ੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_u)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "ਭੇਜਣ ਵਾਲੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_d)..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਪਾਠ ਦੀ ਖੋਜ"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "ਸਭ ਪਾਠ ਚੁਣੋ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "ਇੱਕ ਸੁਨੇਹੇ ਵਿੱਚ ਸਭ ਪਾਠ ਚੁਣੋ"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
-msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫਾ ਵਿਵਸਥਾ ਵੇਖਾਓ"
+msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫਾ ਸਥਾਪਨ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਕਰਸਰ ਝਪਕਦੀ ਵੇਖਾਓ"
 
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages in the normal style"
+msgstr "ਸੁਨੇਹੇ ਸਧਾਰਨ ਸ਼ੈਲੀ ਵਿੱਚ ਵੇਖਾਓ"
+
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr "ਸਧਾਰਨ ਸ਼ੈਲੀ ਰਲੇਖਾਂ ਨਾਲ ਪੱਤਰ ਵੇਖਾਓ"
+msgid "Show messages with all email headers"
+msgstr "ਸੁਨੇਹੇ ਸਭ ਈ-ਮੇਲ ਸਿਰਲੇਖਾਂ ਨਾਲ ਵੇਖਾਓ"
 
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
-msgstr "ਸਾਰੇ ਈਪੱਤਰ ਸਿਰਲੇਖਾਂ ਨਾਲ ਪੱਤਰ ਵੇਖਾਓ"
-
-#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਕੱਚੇ ਈਪੱਤਰ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "ਜ਼ੂਮ ਬਾਹਰ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Attached"
 msgstr "ਨੱਥੀ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "ਗੁਪਤ-ਲੇਖਣ ਢੰਗ(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "ਸੁਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "ਜਾਓ(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
 msgstr "ਖਾਸ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "ਸਤਰ ਵਿੱਚ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr "ਕੂੜਾ(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ(_L)"
 
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "ਸੁਨੇਹਾ ਸਰੋਤ(_M)"
+
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(_N)"
@@ -18954,7 +19346,7 @@ msgstr "ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਆਪਣੇ S/MIME ਇਕਰਿਪ�
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
-msgstr "ਫਾਰਮਿਟ(_m)"
+msgstr "ਫਾਰਮੈਟ(_m)"
 
 #: ../ui/evolution-message-composer.xml.h:9
 msgid "Get delivery notification when your message is read"
@@ -18964,124 +19356,133 @@ msgstr "ਜਦੋਂ ਤੁਹਾਡਾ ਸੁਨੇਹਾ ਪੜਿਆ ਜਾ�
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "ਸ਼ਾਮਿਲ(_i)"
+
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "PGP ਇਕਰਿਪਟ"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "PGP ਸਾਇਨ"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "R_equest Read Receipt"
 msgstr "ਪੜਨ ਰਸੀਦ ਦੀ ਮੰਗ(_E)"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME ਇਕਰਿਪਟ"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME ਸਾਇਨ"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "ਇੰਞ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
 msgstr "ਇੰਞ ਸੰਭਾਲੋ(_A)..."
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save as draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ..."
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨੂੰ ਵੱਖਰੇ ਨਾਂ ਨਾਲ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਖਾਸ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Send"
+msgstr "ਭੇਜੋ"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "ਪੱਤਰ HTML ਪ੍ਰਤੀਰੂਪ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Send this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Set the message priority to high"
 msgstr "ਸੁਨੇਹੇ ਦਾ ਦਰਜਾ ਵਧਾਓ"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
 msgstr "ਆਪਣੀ PGP ਕੀ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ਆਪਣੇ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ BCC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "_Bcc ਖੇਤਰ"
 
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "_Cc ਖੇਤਰ"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_Delete all"
 msgstr "ਸਭ ਹਟਾਉ(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_From Field"
 msgstr "ਵੱਲੋਂ(_F)"
 
@@ -19094,7 +19495,7 @@ msgid "_Post-To Field"
 msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:51
-msgid "_Prioritise Message"
+msgid "_Prioritize Message"
 msgstr "ਦਰਜਾ ਸੁਨੇਹਾ(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:52
@@ -19117,18 +19518,18 @@ msgstr "ਬੰਦ ਕਰੋ(_l)"
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ"
 
 #.
 #. <menuitem name="FileSave" verb="" _label="_Save"/>
 #.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_C)"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ਼ ਸੰਭਾਲੋ ਤੇ ਝਰੋਖਾ ਬੰਦ ਕਰ ਦਿਓ"
 
@@ -19164,24 +19565,28 @@ msgstr "ਉਲਟ ਚੋਣ(_I)"
 msgid "Click change / view the status details of the task"
 msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ / ਵੇਖੋ ਨੂੰ ਦਬਾਓ"
 
-#: ../ui/evolution-task-editor.xml.h:10
+#: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
 msgstr "ਹਾਲਤ ਵੇਰਵਾ"
 
-#: ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ"
 
 #: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "ਭੇਜਣ ਚੋਣ(_S)"
+
+#: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "ਹਾਲਤ ਵੇਰਵਾ(_S)"
 
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+msgid "Copy selected tasks"
 msgstr "ਚੁਣੇ ਕੰਮਾਂ ਦੀ ਨਕਲ"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Cut selected tasks"
 msgstr "ਚੁਣੇ ਕੰਮ ਕੱਟੋ"
 
 #: ../ui/evolution-tasks.xml.h:7
@@ -19201,8 +19606,8 @@ msgid "Mark selected tasks as complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨੂੰ ਲਿਖੋ ਕਿ ਸਮਾਪਤ"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਕਾਰਜ ਚਿਪਕਾਓ"
+msgid "Paste tasks from the clipboard"
+msgstr "ਕਲਿੱਪਬੋਰਡ ਵਿੱਚੋਂ ਕਾਰਜ ਚੇਪੋ"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -19234,7 +19639,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਬਾਰੇ..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਵਸਥਾ ਤਬਦੀਲ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਦੀ ਸਥਾਪਨ ਤਬਦੀਲ"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
@@ -19246,7 +19651,7 @@ msgstr "ਇਸ ਫੋਲਡਰ ਨੂੰ ਵੇਖਾਉਣ ਲਈ ਨਵਾਂ
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "ਝਰੋਖਾ ਬਟਨ ਵਿਹੜਾ ਸੰਦਪੱਟੀ ਵਿਵਸਥਾ ਨਾਲ ਵੇਖਾਓ"
+msgstr "ਝਰੋਖਾ ਬਟਨ ਵਿਹੜਾ ਸੰਦਪੱਟੀ ਸਥਾਪਨ ਨਾਲ ਵੇਖਾਓ"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -19265,17 +19670,17 @@ msgid "Exit the program"
 msgstr "ਕਾਰਜ ਤੋ ਬਾਹਰ"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "ਗੁਪਤ-ਕੋਡ ਹਟਾਓ(_P)"
-
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "ਯਾਦ ਕੀਤੇ ਗੁਪਤ-ਕੋਡ ਭੁੱਲ ਗਏ, ਇਸਕਰਕੇ ਮੁੜ ਮੰਗੇ ਜਾਣਗੇ"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਓਹਲੇ"
 
+#: ../ui/evolution.xml.h:13
+msgid "I_mport..."
+msgstr "ਆਯਾਤ(_m)..."
+
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "ਆਈਕਾਨ ਤੇ ਪਾਠ(_a)"
@@ -19313,6 +19718,14 @@ msgid "Show information about Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖਾਓ"
 
 #: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "ਬਾਹੀ(_B)"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "ਹਾਲਤ ਪੱਟੀ(_B)"
+
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ"
 
@@ -19320,75 +19733,75 @@ msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਦਿਓ(_B)"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱਗ ਬੱਡੀ ਵਰਤ ਕੇ ਬੱਗ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "ਅਸੀਂ ਆਫਲਾਈਨ ਕੰਮ ਕਰ ਰਹੇ ਹਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰੋ"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
 msgstr "ਸੰਦ-ਪੱਟੀ(_b)"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "ਸੰਦਪੱਟੀ ਸ਼ੈਲੀ(_b)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ/ਓਹਲੇ"
+
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ/ਓਹਲੇ"
 
-#: ../ui/evolution.xml.h:35
-msgid "_About Evolution..."
-msgstr "ਈਵੇਲੂਸ਼ਨ ਬਾਰੇ(_A)..."
+#: ../ui/evolution.xml.h:38
+msgid "_About"
+msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "ਝਰੋਖਾ ਬੰਦ(_C)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
+msgid "_Forget Passwords"
+msgstr "ਗੁਪਤ-ਕੋਡ ਭੁੱਲ ਜਾਓ(_F)"
+
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "ਬਟਨ ਓਹਲੇ(_H)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "ਆਈਕਾਨ ਹੀ(_I)"
 
-#: ../ui/evolution.xml.h:42
-msgid "_Import..."
-msgstr "ਆਯਾਤ(_I)..."
-
-#: ../ui/evolution.xml.h:43
-msgid "_New"
-msgstr "ਨਵਾਂ(_N)"
-
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "ਤਰੁੰਤ ਹਵਾਲਾ(_Q)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
+msgid "_Quit"
+msgstr "ਬਾਹਰ(_Q)"
+
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱਚਰ ਦਿੱਖ(_S)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "ਸਮਕਾਲੀ ਚੋਣ(_S)..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "ਸਿਰਫ਼ ਪਾਠ(_T)"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "ਹਾਲਤ ਪੱਟੀ ਵੇਖਾਓ(_V)"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "ਝਰੋਖਾ(_W)"
 
@@ -19461,7 +19874,7 @@ msgid "With _Status"
 msgstr "ਸਥਿਤੀ ਨਾਲ(_S)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -19499,26 +19912,26 @@ msgstr "ਭੰਡਾਰ"
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
-msgstr "%s ਲਈ ਦਰਿਸ਼ ਪਰਿਭਾਸ਼ਾ"
+msgstr "%s ਲਈ ਝਲਕ ਪਰਿਭਾਸ਼ਾ"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
 msgid "Define Views"
-msgstr "ਦਰਿਸ਼ ਪਰਿਭਾਸ਼ਾ"
+msgstr "ਝਲਕ ਪਰਿਭਾਸ਼ਾ"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "\"%s\" ਲਈ ਦਰਿਸ਼ ਪਰਿਭਾਸ਼ਿਤ"
+msgstr "\"%s\" ਲਈ ਝਲਕ ਪਰਿਭਾਸ਼ਿਤ"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
 msgstr "ਸੋਧ(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "ਸਾਰਣੀ"
 
@@ -19528,31 +19941,35 @@ msgstr "ਮੌਕਾ"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
-msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਸੰਭਾਲੋ"
+msgstr "ਮੌਜੂਦਾ ਝਲਕ ਸੰਭਾਲੋ"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Create new view"
-msgstr "ਨਵਾਂ ਦਰਿਸ਼ ਬਣਾਓ(_C)"
+msgstr "ਨਵਾਂ ਝਲਕ ਬਣਾਓ(_C)"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
-msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਤਬਦੀਲ(_R)"
+msgstr "ਮੌਜੂਦਾ ਝਲਕ ਤਬਦੀਲ(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "ਦਰਿਸ਼ ਸੋਧ"
 
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:588
 msgid "Save Custom View"
 msgstr "ਸੋਧ ਦਰਿਸ਼ ਸੰਭਾਲੋ"
 
-#: ../widgets/menus/gal-view-instance.c:591
+#: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "ਦਰਿਸ਼ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ..."
 
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "C_urrent View"
+msgstr "ਮੌਜੂਦਾ ਝਲਕ(_u)"
+
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "ਸੋਧ ਦਰਿਸ਼ ਸੰਭਾਲੋ..."
@@ -19563,11 +19980,11 @@ msgstr "ਫੈਕਟਰੀ"
 
 #: ../widgets/menus/gal-view-new-dialog.c:115
 msgid "Define New View"
-msgstr "ਨਵਾਂ ਦਰਿਸ਼ ਬਣਾਓ"
+msgstr "ਨਵੀਂ ਝਲਕ ਬਣਾਓ"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
-msgstr "ਨਵੇਂ ਦਰਿਸ਼ ਦਾ ਨਾਂ:"
+msgstr "ਨਵੀਂ ਝਲਕ ਦਾ ਨਾਂ:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
@@ -19575,83 +19992,79 @@ msgstr "ਝਲਕ ਦੀ ਕਿਸਮ"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
-msgstr "ਦਰਿਸ਼ ਦੀ ਕਿਸਮ:"
+msgstr "ਝਲਕ ਦੀ ਕਿਸਮ:"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "ਪਿੱਛੇ ਬਟਨ"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "ਮਹੀਨਾ ਕੈਲੰਡਰ"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "ਰੰਗ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GDK ਰੰਗ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "ਸਟਿਪਲ ਭਰੋ"
 
-#: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3014
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
@@ -19660,11 +20073,11 @@ msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 msgid "Spacing"
 msgstr "ਖਾਲੀ ਥਾਂ"
 
-#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "ਹੁਣ"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ਸਮੇਂ ਦਾ ਪ੍ਰਤੀਰੂਪ ਇਸਤਰਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ: %s"
@@ -19673,129 +20086,128 @@ msgstr "ਸਮੇਂ ਦਾ ਪ੍ਰਤੀਰੂਪ ਇਸਤਰਾਂ ਦਾ �
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਖਾਸ ਤੌਰ ਤੇ 0 ਤੇ 100 ਦੇ ਦਰਮਿਆਨ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "ਬਾਲਟਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "ਕੇਦਰੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "ਚੀਨ"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr "ਸਰੀਲਿਕ"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "ਗਰੀਕ"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "ਹੈਬਰਿਊ"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "ਜਾਪਾਨੀ"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "ਕੋਰੀਆ"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr "ਥਾਈ"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "ਤੁਰਕਿਸ਼"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "ਯੂਨੀਕੋਡ"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Western European, New"
 msgstr "ਪੱਛਮੀ ਯੂਰਪ, ਨਵਾਂ"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "ਮੂਲ"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 #: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "ਸਧਾਰਨ"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:102
 msgid "Ukrainian"
 msgstr "ਯੂਕਰੇਨ"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:105
 msgid "Visual"
 msgstr "ਦਿੱਖ"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "ਅਣਪਛਾਤਾ ਅੱਖਰ ਸਮੂਹ: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲਈ ਅੱਖਰ ਦਿਓ"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "ਹੋਰ..."
 
+#: ../widgets/misc/e-charset-picker.c:482
+msgid "Ch_aracter Encoding"
+msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
+
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:320
-msgid "Date and Time Entry"
-msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਇੰਦਰਾਜ਼"
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: ../widgets/misc/e-dateedit.c:339
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr "ਮਿਤੀ ਦੇਣ ਲ਼ਈ ਪਾਠ ਇੰਦਰਾਜ਼"
 
-#: ../widgets/misc/e-dateedit.c:340
-msgid "Text Date Entry"
-msgstr "ਪਾਠ ਮਿਤੀ ਇੰਦਰਾਜ਼"
-
-#: ../widgets/misc/e-dateedit.c:361
+#: ../widgets/misc/e-dateedit.c:362
 msgid "Click this button to show a calendar"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ"
 
-#: ../widgets/misc/e-dateedit.c:362
-msgid "Date Button"
-msgstr "ਮਿਤੀ ਬਟਨ"
-
-#: ../widgets/misc/e-dateedit.c:383
+#: ../widgets/misc/e-dateedit.c:384
 msgid "Combo box to select time"
 msgstr "ਸਮਾਂ ਚੁਣਨ ਲਈ ਲਟਕਦਾ ਬਕਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:384
-msgid "Time Combo Box"
-msgstr "ਸਮਾਂ ਲਟਕਦਾ ਬਕਸਾ"
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr "ਸਮਾਂ"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -19833,11 +20245,11 @@ msgstr "ਲੇਬਲ ਵਿਦਗਿਟ"
 msgid "A widget to display in place of the usual expander label"
 msgstr "ਆਮ ਫੈਲਾਓ ਲੇਬਲ ਦੀ ਥਾਂ ਤੇ ਇੱਕ ਵਿਦਗਿਟ ਵੇਖਾਓ"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "ਫੈਲਾਓ ਆਕਾਰ"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "ਫੈਲਾਉ ਤੀਰ ਦਾ ਆਕਾਰ"
 
@@ -19849,16 +20261,21 @@ msgstr "ਸੰਕੇਤਕ ਥਾਂ"
 msgid "Spacing around expander arrow"
 msgstr "ਫੈਲਾਓ ਤੀਰ ਦੁਆਲੇ ਖਾਲੀ ਥਾਓ"
 
-#: ../widgets/misc/e-filter-bar.c:201
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "ਤਕਨੀਕੀ ਖੋਜ"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:203
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "ਖੋਜ"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:226
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "ਖੋਜ ਸੰਭਾਲੋ"
 
@@ -19878,11 +20295,11 @@ msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
 msgid "Choose Image"
 msgstr "ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../widgets/misc/e-map.c:651
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨਕਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:653
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19902,55 +20319,55 @@ msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਮਕਾਲੀ:"
 msgid "Sync Categories:"
 msgstr "ਵਰਗ ਸਮਕਾਲੀ:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
 msgid "Reflow model"
 msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
-msgid "Search Text Entry"
-msgstr "ਖੋਜ ਪਾਠ ਇੰਦਰਾਜ਼"
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "ਸਾਫ਼(_C)"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "ਖੋਜ ਕਿਸਮ"
 
-#: ../widgets/misc/e-search-bar.c:893
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ਇਕਾਈ ID"
 
-#: ../widgets/misc/e-search-bar.c:900
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ਅਧੀਨਇਕਾਈ ID"
 
-#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "ਪਾਠ"
 
-#: ../widgets/misc/e-search-bar.c:987
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "ਹੁਣ ਖੋਜ(_N)"
 
@@ -19976,7 +20393,7 @@ msgstr "ਚੋਣ ਢੰਗ"
 msgid "Cursor Mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
-#: ../widgets/misc/e-send-options.c:524
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "ਹਟਾਉਣ ਤੇ(_l):"
 
@@ -20055,21 +20472,21 @@ msgstr ""
 "ਘੱਟ"
 
 #: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "ਸਮਾਂ(_i)"
-
-#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "ਜਦੋਂ ਸਵੀਕਾਰ ਹੋਵੇ(_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "ਜਦੋਂ ਮੁਕੰਮਲ(_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "ਜਦੋਂ ਇਨਕਾਰ ਹੋਵੇ(_n):"
 
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "ਵਿੱਚ(_t)"
+
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "ਬਾਅਦ(_A):"
@@ -20113,8 +20530,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
-msgstr "url ਤੇ ਜਾਣ ਲਈ ਇਸ ਨੂੰ ਦਬਾਓ"
+msgid "Click here to go to URL"
+msgstr "URL ਉੱਤੇ ਜਾਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -20152,23 +20569,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚੁਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1742
+#: ../widgets/table/e-cell-text.c:1744
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1751
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਰੇਖਾ"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1758
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1765
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1779
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -20216,7 +20633,6 @@ msgid "Sh_ow these fields in order:"
 msgstr "ਇਹ ਫੋਲਡਰ ਕਰਮ ਵਿੱਚ ਵੇਖਾਓ(_o):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "ਖੇਤਰ ਵੇਖਾਓ"
@@ -20224,7 +20640,7 @@ msgstr "ਖੇਤਰ ਵੇਖਾਓ"
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
-msgstr "ਦਰਿਸ਼ ਵਿੱਚ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਝਲਕ ਵਿੱਚ ਖੇਤਰ ਵੇਖਾਓ"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
@@ -20275,10 +20691,6 @@ msgstr "ਨਾ ਕ੍ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "ਨਾ ਵਰਗੀਕ੍ਰਿਤ"
 
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
-
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "ਇੰਞ ਗਰੁੱਪ(_G)..."
@@ -20288,16 +20700,16 @@ msgid "_Show these fields in order:"
 msgstr "ਇਹ ਫੋਲਡਰ ਲੜੀਬੱਧ ਵੇਖਾਓ(_S):"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "DnD ਕੋਡ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "ਪੂਰਾ ਸਿਰਲੇਖ"
 
@@ -20317,198 +20729,198 @@ msgstr ""
 "ਆਪਣੀ ਸਾਰਣੀ ਵਿੱਚ ਇੱਕ ਸਾਰਣੀ ਨੂੰ ਜੋੜਨ ਲਈ, ਇਸ\n"
 "ਨੂੰ ਉਸ ਜਗਾ ਉੱਤੇ ਸੁੱਟ ਦਿਓ, ਜਿੱਥੇ ਤੁਸੀਂ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d ਇਕਾਈ)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d ਇਕਾਈਆਂ)"
 
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d ਇਕਾਈ)"
 
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d ਇਕਾਈਆਂ)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "ਕੇਂਦਰ ਬਣਾਓ"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
 msgid "Selection model"
 msgstr "ਚੋਣ ਨਮੂਨਾ"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "ਮੁੱਢਲੀ ਲੰਬਾਈ"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "ਇਕਸਾਰ ਕਤਾਰ ਉਚਾਈ"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "ਸਥਿਰ"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਦੀ ਪਸੰਦ"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "ਵੱਧਦਾ ਕ੍ਰਮ"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "ਘੱਟਦਾ ਕ੍ਰਮ"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "ਨਾ-ਕ੍ਰਮਬੱਧ"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "ਇਸ ਖੇਤਰ ਨਾਲ ਸਮੂਹਬੱਧ"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "ਬਕਸੇ ਨਾਲ ਸਮੂਹ"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "ਇਹ ਕਾਲਮ ਹਟਾਓ"
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "ਕਾਲਮ ਸ਼ਾਮਲ..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "ਇਕਸਾਰ"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "ਵਧੀਆ ਅਨੁਕੂਲ"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
-msgstr "ਕਾਲਮ ਫਾਰਮਿਟ..."
+msgstr "ਕਾਲਮ ਫਾਰਮੈਟ..."
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਪਸੰਦ..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ਫੋਂਟ-ਸਮੂਹ"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "ਲੜੀ"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
 msgid "Table header"
 msgstr "ਸਾਰਣੀ ਸਿਰਲੇਖ"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
 msgid "Table model"
 msgstr "ਸਾਰਣੀ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "ਹਮੇਸ਼ਾ ਖੋਜੋ"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲਈ ਦਬਾਓ"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "ETree ਸਾਰਣੀ ਐਡਪਟਰ"
 
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ਖੋਜ"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "ਸਤਰਾਂ ਖਿੱਚੋ ਅਤੇ +/- ਫੈਲਾਓ"
 
@@ -20525,7 +20937,7 @@ msgid "This should test the minicard canvas item"
 msgstr "ਇਹ ਮਿੰਨੀਕਾਰਡ ਪਰਦਾ ਇਕਾਈ ਲਈ ਜਾਂਚ ਕਰਦਾ ਹੈ"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "ਘਟਨਾ ਪ੍ਰੋਸੈਂਸਰ"
 
@@ -20538,57 +20950,57 @@ msgid "GDKFont"
 msgstr "GDKFont"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "ਇਕਸਾਰ"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "ਅੰਡਾਕਾਰ ਵਰਤੋਂ"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "ਅੰਡਾਕਾਰ"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "ਸਤਰ ਲਪੇਟੋ"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "ਅੰਤਰਾਲ ਅੱਖਰ"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "ਅਧਿਕਤਮ ਸਤਰਾਂ"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "ਨਵੀਆਂ-ਕਤਾਰਾਂ ਸਵੀਕਾਰ"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "ਹਾਸ਼ੀਆਂ ਖਿੱਚੋ"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "ਪਿੱਠਭੂਮੀ ਬਣਾਓ"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "ਬਟਨ ਬਣਾਓ"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ"
 
@@ -20596,59 +21008,59 @@ msgstr "ਕਰਸਰ ਸਥਿਤੀ"
 msgid "Emulate label resize"
 msgstr "ਲੇਬਲ ਮੁੜ-ਅਕਾਰ ਸਮਰੂਪ"
 
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "ਗੂੜਾ"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "ਵਿੰਨੋ"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "ਅੰਕਰ"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "ਕਲਿੱਪ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "ਕਲਿੱਪ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "ਕਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "ਕਲਿੱਪ ਚਤਰਭੁਜ ਭਰੋ"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰੀ"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰੀ"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "ਪਾਠ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "ਪਾਠ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM ਪਰਸੰਗ"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "ਪੋਪਅੱਪ ਸੰਭਾਲੋ"
author	Amanpreet Singh Alam <aman@src.gnome.org>	2006-02-25 15:14:46 +0800
committer	Amanpreet Singh Alam <aman@src.gnome.org>	2006-02-25 15:14:46 +0800
commit	a915d220f70203959dc069e2f9beef174acd1a70 (patch)
tree	05552d4c17d656f0861a487712a4c06c4c9311a6 /po
parent	8ac649ab854d44add24f5464be3e2ee5d117437f (diff)
download	gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.gz gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.bz2 gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.lz gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.xz gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.tar.zst gsoc2013-evolution-a915d220f70203959dc069e2f9beef174acd1a70.zip