Updating Translation for Punjabi

author: A S Alam <aalam@users.sf.net> 2009-09-13 14:08:49 +0800
committer: A S Alam <aalam@users.sf.net> 2009-09-13 14:08:49 +0800
commit: fda6ddd97ce21108cb8462303b10cc9696d9b412 (patch)
tree: 806b5233e0ae35386da90c6c0271b90f0f8c8eb9 /po/pa.po
parent: 70ed8286d0293691e828ec46291fa1b0a549cc63 (diff)
download: gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.gz
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.bz2
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.lz
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.xz
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.zst
gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.zip
1 files changed, 6549 insertions, 5775 deletions
diff --git a/po/pa.po b/po/pa.po
index 81ac3a6c85..133d1ad36c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # A S Alam <aalam@users.sf.net>, 2004, 2005, 2006, 2007, 2009.
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2008, 2009.
@@ -10,38 +10,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n"
-"POT-Creation-Date: 2009-03-16 02:56+0000\n"
-"PO-Revision-Date: 2009-03-22 18:27+0000\n"
+"POT-Creation-Date: 2009-08-28 13:23+0000\n"
+"PO-Revision-Date: 2009-09-13 11:35+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjab-l10n@list.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
-msgstr[1] "ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
+msgstr[1] "1ਮੌਜੂਦਾ ਐਡਰੈੱਸ-ਬੁੱਕ ਫੋਲਡਰ %s ਵਿੱਚ %d ਕਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -59,32 +59,32 @@ msgstr "ਸੰਪਰਕ:  "
 msgid "evolution minicard"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮਿੰਨੀ-ਕਾਰਡ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "ਇਸ ਲਈ ਅਲਾਰਮ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "ਅੱਜ ਮੀਟਿੰਗ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: %s ਸੰਖੇਪ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਣ ਘਟਨਾ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "ਫੋਕਸ ਲਵੋ"
 
@@ -108,8 +108,8 @@ msgstr "ਅੱਜ 'ਤੇ ਜਾਓ"
 msgid "Go to Date"
 msgstr "ਮਿਤੀ 'ਤੇ ਜਾਓ"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਸੀਮਾ ਵੇਖਣ ਅਤੇ ਚੁਣਨ ਲਈ ਇੱਕ ਟੇਬਲ"
 
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -164,18 +164,18 @@ 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:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -183,10 +183,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -196,15 +196,15 @@ 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:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "ਗਨੋਮ ਕੈਲੰਡਰ"
 
@@ -216,11 +216,11 @@ msgstr "ਖੋਜ ਪੱਟੀ"
 msgid "evolution calendar search bar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਖੋਜ ਪੱਟੀ"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "ਜੰਪ ਬਟਨ"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
@@ -251,20 +251,20 @@ msgstr "ਪੋਪਅੱਪ"
 msgid "popup a child"
 msgstr "ਪੋਪਅੱਪ ਇੱਕ ਚਾਈਲਡ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "ਸੋਧ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "ਇਸ ਸੈੱਲ਼ ਸੋਧਣਾ ਸ਼ੁਰੂ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "ਤਬਦੀਲ"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "ਸੈੱਲ ਤਬਦੀਲ"
 
@@ -284,17 +284,17 @@ msgstr "ਸਮੇਟੋ"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ਇਸ ਸੈੱਲ ਵਿੱਚ ETree ਰੱਖਣ ਵਾਲੀ ਕਤਾਰ ਸਮੇਟੋ"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "ਟੇਬਲ ਸੈੱਲ"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "ਦਬਾਓ"
 
@@ -328,14 +328,6 @@ msgstr "ਡਿਫਾਲਟ ਐਕਟੀਵੇਟ"
 msgid "Popup Menu"
 msgstr "ਪੋਪਅੱਪ ਮੇਨੂ"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "ਅਟੈਚਮਿੰਟ ਬਾਰ ਬਦਲੋ"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "ਐਕਟੀਵੇਟ"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -387,10 +379,14 @@ msgid "Could not remove address book."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਹਟਾਉਣ ਵਿੱਚ ਅਸਫਲ।"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+#| msgid ""
+#| "Currently you can access only GroupWise System Address Book from "
+#| "Evolution. Please use some other GroupWise mail client once, to get your "
+#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "ਇਸ ਸਮੇਂ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਸਿਰਫ਼ ਗਰੁੱਪਵਾਇਜ਼ ਸਿਸਟਮ ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਹੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਕਿਰਪਾ ਕਰਕੇ "
 "ਕੋਈ ਹੋਰ ਗਰੁੱਪਵਾਇਜ਼ ਪੱਤਰ ਕਲਾਇਟ ਦੀ ਇੱਕ ਵਰਤੋਂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਗਰੁੱਪਵਾਇਜ਼ ਫਰੀਕਿਊਂਟ ਸੰਪਰਕ ਅਤੇ "
@@ -414,7 +410,7 @@ msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -568,104 +564,94 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "ਡਿਫਾਲਟ ਸਮਕਾਲੀ ਐਡਰੈੱਸ:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਐਡਰੈੱਸ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "ਸਵੈ-ਪੂਰਤੀ"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "ਸੰਪਰਕ(_o)"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#| msgid "Configure autocomplete here"
+msgid "Configure contacts and autocompletion here"
+msgstr "ਸੰਪਰਕ ਅਤੇ ਸਵੈ-ਪੂਰਨ ਸੰਰਚਨਾ ਇੱਥੇ ਦਿਓਓ"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਐਡਰੈੱਸ ਪੋਪਅੱਪ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਐਡਰੈੱਸ ਦਰਸ਼ਕ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਕਾਰਡ ਦਰਸ਼ਕ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਐਡਰੈੱਸ-ਬੁੱਕ ਭਾਗ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ਈਵੇਲੂਸ਼ਨ S/Mime ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਬੰਧਕ ਕੰਟਰੋਲ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "ਆਪਣੇ S/MIME ਸਰਟੀਫਿਕੇਟ ਇਥੇ ਰੱਖੋ"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -677,144 +663,189 @@ msgstr "ਇਸ ਕੰਪਿਊਟਰ ਉੱਤੇ"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "ਨਿੱਜੀ"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP ਸਰਵਰਾਂ ਉੱਤੇ"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰਕ(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "ਨਵੀਂ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "ਇੱਕ ਸੁਨੇਹਾ ਕਿਤਾਬ ਬਣਾਓ"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਰੱਖਣ ਵਿੱਚ ਅਸਫਲ।"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ "
+"ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "ਬੇਸ"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "ਕਿਸਮ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "ਆਫਲਾਈਨ ਓਪਰੇਸ਼ਨ ਲਈ ਬੁੱਕ ਸਮੱਗਰੀ ਕਾਪੀ ਕਰੋ(_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../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:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ "
+"ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"ਈਮੇਲ ਐਡਰੈੱਸ\" ਨਿਰਧਾਰਿਤ "
+"ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹੁੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। "
+"\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ "
+"ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ਵੇਰਵਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "ਤਬਦੀਲ ਹੋ ਰਿਹਾ ਹੈ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ਨੂੰ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ਸਰਵਰ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "ਆਟੋ-ਪੂਰਤੀ ਸੈਟਿੰਗ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -825,7 +856,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -835,7 +866,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -845,7 +876,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -856,18 +887,18 @@ msgstr ""
 "ਥਰੰਮੇ ਨਾਲ ਉਡੀਕ ਕਰੋ ਜੀ, ਜਦੋਂ ਤੱਕ ਕਿ ਫੋਲਡਰ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ।"
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "ਫੋਲਡਰ \"%s\" ਦਾ ਨਾਂ ਬਦਲੋ:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਬਦਲੋ"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "ਫੋਲਡਰ ਨਾਂ ਅੱਖਰ \"/\" ਨਹੀਂ ਰੱਖ ਸਕਦਾ"
 
@@ -880,19 +911,19 @@ msgid "Save As vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -900,11 +931,10 @@ msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
 
@@ -917,20 +947,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯੂਜ਼ਰ %s) ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
@@ -978,7 +1008,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "ਚੁਣੇ ਨਾਂ ਡਾਈਲਾਗ ਵਿੱਚ ਚੁਣੇ ਅਖੀਰੀ ਫੋਲਡਰ ਦਾ URI ਹੈ।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
@@ -993,10 +1023,25 @@ msgid "Whether to show the preview pane."
 msgstr "ਕੀ ਝਲਕ ਪੈਨ ਵੇਖਾਉਣੀ ਹੈ"
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "ਸਵੈ-ਪੂਰਤੀ"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "ਆਟੋ-ਪੂਰਾ ਕੀਤੇ ਸੰਪਰਕ ਦਾ ਐਡਰੈੱਸ ਹਮੇਸਾਂ ਵੇਖੋ"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "ਮਿਤੀ/ਸਮਾਂ ਫਾਰਮੈਟ"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#| msgid "Table model"
+msgid "Table column:"
+msgstr "ਟੇਬਲ ਕਾਲਮ:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "ਐਡਰੈਸ ਬੁੱਕ ਵਿੱਚ ਖੋਜ"
 
@@ -1005,21 +1050,19 @@ msgid "1"
 msgstr "੧"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "੩੨੬੮"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "੩੮੯"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "੫"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "੬੩੬"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>ਪ੍ਰਮਾਣਕਿਤਾ</b>"
@@ -1032,143 +1075,78 @@ msgstr "<b>ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>ਖੋਜ ਹੋ ਰਹੀ ਹੈ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>ਕਿਸਮ</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਿਲ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "ਹਮੇਸ਼ਾ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "ਅਣਜਾਣ"
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"ਅਗਿਆਤ\n"
+"ਈਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ\n"
+"ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "ਇਹ ਕਿਤਾਬ ਸੀਮਾ ਅੱਪੜ ਤੱਕ ਵੇਖੋ(_r)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "ਬੇਸਿਕ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "ਵੱਖਰਾ ਨਾਂ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਸਰਵਰ ਤੇ ਤੁਹਾਡੀ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਵਰਤੇਗਾ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "ਸਭ ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਵਰਤੋਂ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "ਲਾਗਇਨ(_g):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-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:287
-msgid "No encryption"
-msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "ਇੱਕ"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"ਇੱਕ\n"
+"ਸਬ"
 
-#. 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:295
-msgid "SSL encryption"
-msgstr "SSL ਇੰਕ੍ਰਿਪਸ਼ਨ"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL ਇੰਕ੍ਰਿਪਸ਼ਨ\n"
+"TLS ਇੰਕ੍ਰਿਪਸ਼ਨ\n"
+"ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "ਖੋਜ ਫਿਲਟਰ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "ਖੋਜ ਬੇਸ(_b):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "ਫਿਲਟਰ ਖੋਜ(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "ਖੋਜ ਫਿਲਟਰ"
-
-#: ../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 "
-"objectclass of the type \"person\"."
-msgstr ""
-"ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ "
-"ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
-
-#: ../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."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
-"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#| 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 objectclass of the type \"person\"."
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
-"TLS ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+"ਖੋਜ ਫਿਲਟਰ ਇੱਕ ਕਿਸਮ ਦੀਆਂ ਆਈਟਮਾਂ ਦੀ ਖੋਜ ਲਈ ਹਨ, ਜਦੋਂ ਕਿ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। ਜੇਕਰ "
+"ਇਸ ਵਿੱਚ ਸੋਧ ਨਾ ਕੀਤੀ ਗਈ ਤਾਂ,  ਮੂਲ ਖੋਜ ਨੂੰ \"ਵਿਅਕਤੀ\" ਕਿਸਮ ਨੂੰ ਮੰਨ ਕੇ ਖੋਜ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../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."
-msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਹਾਡਾ ਸਰਵਰ SSL ਜਾਂ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਇਸਦਾ ਅਰਥ ਹੈ ਤੁਹਾਡਾ "
-"ਕੁਨੈਕਸ਼ਨ ਅਣ-ਸੁਰੱਖਿਅਤ ਵੀ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਲਈ ਖਤਰਾ ਬਣ ਸਕਦੇ ਹੋ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "ਅਧੀਨ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "ਸਹਾਇਕ ਖੋਜ ਆਧਾਰ"
 
-#. 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:291
-msgid "TLS encryption"
-msgstr "TLS ਇੰਕ੍ਰਿਪਸ਼ਨ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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 "
@@ -1177,24 +1155,13 @@ msgstr ""
 "ਖੋਜ ਆਧਾਰ ਇੰਦਰਾਜ਼ ਦਾ ਵੱਖਰਾ ਨਾਂ (DN) ਹੁੰਦਾ ਹੈ, ਜਿਥੋਂ ਕਿ ਤੁਸੀਂ ਖੋਜ ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਨੂੰ "
 "ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਖੋਜ ਰੂਟ (root) ਡਾਇਰੈਕਟਰੀ ਤੋਂ ਸ਼ੁਰੂ ਹੋ ਜਾਵੇਗੀ।"
 
-#: ../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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"ਖੋਜ ਸੀਮਾ ਇਹ ਨਿਰਧਾਰਿਤ ਕਰਦੀ ਹੈ ਕਿ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਕਿੰਨੀ ਡੂੰਘਾਈ ਤੱਕ ਖੋਜ ਕੀਤੀ ਜਾਵੇ। "
-"\"sub\" ਸੀਮਾ ਨਾਲ ਖੋਜ ਆਧਾਰ ਦੇ ਹੇਠਾਂ ਸਭ ਆਈਟਮਾਂ ਦੀ ਜਾਂਚ ਕਰੇਗੀ। ਖੋਜ ਸੀਮਾਂ \"one\" ਨਾਲ "
-"ਤੁਹਾਡੇ ਆਧਾਰ ਤੋਂ ਇੱਕ ਪੱਧਰ ਤੱਕ ਜਾਂਚ ਕੀਤੀ ਜਾਵੇਗੀ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1202,16 +1169,7 @@ msgstr ""
 "ਇਹ ਅਧਿਕਤਮ ਇੰਦਰਾਜ਼ ਹਨ, ਜੋ ਕਿ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ। ਇਹ ਨੂੰ ਵਧੇਰੇ ਨਿਰਧਾਰਿਤ ਕਰਨ ਨਾਲ "
 "ਤੁਹਾਡੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਹੌਲੀ ਹੋ ਜਾਵੇਗੀ।"
 
-#: ../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 "
-"server."
-msgstr ""
-"ਇਹ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਲਈ ਇਸਤੇਮਾਲ ਕਰੇਗੀ। ਇਸ ਨੂੰ \"ਈਮੇਲ ਐਡਰੈੱਸ\" ਨਿਰਧਾਰਿਤ "
-"ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ldap ਸਰਵਰ ਲਈ ਬੇਪਛਾਣ ਪਹੁੰਚ ਲੋੜੀਦੀ ਹੋਵੇਗੀ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1219,86 +1177,61 @@ msgstr ""
 "ਇਹ ਇਸ ਸਰਵਰ ਦਾ ਨਾਂ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਫੋਲਡਰ ਸੂਚੀ ਵਿੱਚ ਵਿਖਾਈ ਦੇ ਰਿਹਾ ਹੈ। ਇਹ ਸਿਰਫ ਵੇਖਣ "
 "ਲਈ ਹੈ।"
 
-#: ../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 "
-"port you should specify."
-msgstr ""
-"ਇਹ LDAP ਸਰਵਰ ਦੀ ਉਹ ਪੋਰਟ ਹੈ, ਜਿਸ ਤੇ ਈਵੇਲੂਸ਼ਨ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਿਹਾ ਹੈ। ਇੱਕ ਸਟੈਂਡਰਡ ਪੋਰਟਾਂ "
-"ਦੀ ਸੂਚੀ ਉਪਲੱਬਧ ਹੈ। ਆਪਣੇ ਸਿਸਟਮ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕਿਹੜੀ ਪੋਰਟ ਨਿਰਧਾਰਿਤ ਕਰਨੀ ਹੈ।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਲ(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "ਡਾਊਨਲੋਡ ਸੀਮਾ(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਲੱਭੋ(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "ਲਾਗਇਨ ਢੰਗ(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "ਨਾਂ(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "ਪੋਰਟ(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "ਖੋਜ ਸੀਮਾ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "ਸਮਾਂ-ਸੀਮਾ(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "ਕਾਰਡ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
@@ -1323,44 +1256,43 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>ਫੁਟਕਲ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#| msgid "<b>Home</b>"
+msgid "<b>Notes</b>"
+msgstr "<b>ਨੋਟਿਸ</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>ਹੋਰ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>ਟੈਲੀਫੂਨ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ਵੈੱਬ ਐਡਰੈੱਸ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>ਕੰਮ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ਕੈਟਾਗਰੀ(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ"
 
@@ -1369,1276 +1301,259 @@ msgid "Full _Name..."
 msgstr "ਪੂਰਾ ਨਾਂ(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "ਚਿੱਤਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN ਮੈਸਜ਼ਰ"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "ਪੱਤਰ ਐਡਰੈੱਸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "ਆਮ ਨਾਂ(_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਇਜ਼"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "ਨੋਟ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "ਟੈਲੀਫੋਨ"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "ਕੰਮ"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "ਐਡਰੈੱਸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "ਸਹਾਇਕ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "ਜਨਮ-ਦਿਨ(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "ਕੈਲੰਡਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "ਸ਼ਹਿਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "ਕੰਪਨੀ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "ਦੇਸ਼(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "ਵਿਭਾਗ(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "ਫਾਇਲ ਹੇਠਾਂ(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "ਮੁੱਖ ਸਫਾ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "ਪ੍ਰਬੰਧਕ(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "ਸੂਚਨਾ(_N):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "ਦਫ਼ਤਰ(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_PO ਬਾਕਸ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "ਕਿੱਤਾ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "ਪਤੀ/ਪਤਨੀ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "ਸੂਬਾ/ਖੇਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "ਟਾਇਟਲ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ਪੱਤਰ ਮਨਜ਼ੂਰ ਹਨ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ਵੈਬ ਲਾਗ(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "ਕਿੱਥੇ(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "ਜਿਪ/ਡਾਕ ਕੋਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "ਐਡਰੈੱਸ"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "ਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "ਸੋਧਯੋਗ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "ਅਮਰੀਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "ਅਫਗਾਨਿਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "ਅਲਬੀਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "ਅਲਜੀਰੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "ਅਮਰੀਕੀ ਸਾਮੋਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "ਅਡੂਰਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "ਅੰਗੋਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "ਅੰਗੂਲੀਆਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "ਅੰਟਾਰਿਕਟਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "ਐਟੀਗੁਆ ਤੇ ਬਾਰਬੁਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "ਅਰਜਨਟੀਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "ਅਰਮੀਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "ਅਰੂਬਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "ਆਸਟਰੇਲੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "ਆਸਟਰੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "ਅਜ਼ਰਬਾਈਜਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "ਬਾਹਾਮਾਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "ਬਹਿਰਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "ਬੰਗਲਾਦੇਸ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "ਬਾਰਬਾਡਾਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "ਬੇਲਾਰੂਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "ਬੈਲਜੀਅਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "ਬੀਲੀਜ਼ੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "ਬੀਨਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "ਬਾਰਾਮੂਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ਭੁਟਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "ਬੋਲੋਵੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "ਬੋਸੋਨੀਆ ਤੇ ਹਰਜ਼ੀਨਗੋਵੀਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "ਬੂਟਸਵਾਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "ਬੂਟਵਟ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "ਬਰਾਜ਼ੀਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "ਬਰਤਾਨੀਆ ਭਾਰਤੀ ਸਮੁੰਦਰੀ ਖੇਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "ਬਰੂਨਈ ਡਾਰੂਸ਼ਲਾਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "ਬੁਲਗਾਰੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "ਬੂਪਕੀਨਾ ਫਾਸੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "ਬੂਰੂਮਾਡੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "ਕੋਲੰਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "ਕੈਮਰੂਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "ਕੈਨੇਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "ਕੇਪ ਵਾਰਡੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "ਕਾਯਮਨ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "ਕੇਦਰੀ ਅਫਰੀਕਾ ਗਣਰਾਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "ਚੰਦ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "ਚਿੱਲੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "ਚੀਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "ਕ੍ਰਿਸਮਿਸ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "ਕੋਕੋਸ(ਕਿਲਿੰਗ) ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "ਕੋਲੰਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "ਕੋਮੋਰਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "ਕਾਂਗੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "ਕਾਂਗੋ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "ਕੁੱਕ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "ਕਾਸਟ ਰੀਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "ਕੋਟੀ ਡੀਵੋਰਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "ਕਰੋਟੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "ਕਿਊਬਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "ਕਿਊਰੂਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "ਚੈਕ ਗਣਰਾਜ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "ਡੈਨਮਾਰਕ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "ਡਜੀਬੂਟੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "ਡੋਮੀਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "ਡੋਮੀਨੀਆਨ ਗਣਰਾਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "ਏਕਵੇਡਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "ਮਿਸਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "ਈਲ ਸਾਲੇਵਡੋਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "ਭੂ-ਖੰਡੀ ਗੁਆਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "ਈਰਟੀਰਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "ਈਸਟੋਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "ਈਥੋਪਈਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "ਫਾਕਲੈਡ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "ਫਾਰੀਓ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "ਫਿਜ਼ੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "ਫਿਨਲੈਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "ਫਰਾਂਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "ਫਰੇਚ ਗੁਆਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "ਫਰੈਂਚ ਪੋਲੀਸੇਲੇਵੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "ਫਰੈਂਚ ਦੱਖਣੀ ਖੇਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "ਗਾਬੋਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "ਗਾਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "ਜਾਰਜੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "ਜਰਮਨੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "ਗਾਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "ਗੀਬਰਾਲਟਾਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "ਗਰੀਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "ਗਰੀਨਲੈਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "ਗਰੀਨਾਡਾਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "ਗੁਆਡੀਲੂਪੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "ਗੁਆਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "ਗੂਆਟੇਮਾਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "ਗੂਈਮਸੀਯਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "ਗੂਈਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "ਗੂਈਨੀਆ-ਬੀਸਓ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "ਗੁਆਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "ਹਾਈਟੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "ਹਾਰਡ ਤੇ ਮੈਕਡਾਨਲਡ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "ਹੋਲੀ ਸੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "ਹਾਨਡੂਰਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "ਹਾਂਗ ਕਾਂਗ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "ਹੰਗਰੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "ਆਈਸਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "ਭਾਰਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "ਇੰਡੋਨੇਸੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "ਈਰਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "ਇਰਾਕ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "ਆਇਰਲੈਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "ਇਸਲੀ ਆਫ ਮੈਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "ਇਜ਼ਾਰਾਈਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "ਇਟਲੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "ਜੈਮਾਈਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "ਜਾਪਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "ਜ਼ੇਰਸਈ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "ਜਾਰਡਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "ਕਜ਼ਾਕਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "ਕੀਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "ਕੀਰੀਬਾਟੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "ਕੋਰੀਆ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "ਕੋਰੀਆ ਗਣਰਾਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "ਕੁਵੈਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "ਕਿਰਗਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "ਲਿਉਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "ਲਾਟੀਵਾਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "ਲੀਬਨਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "ਲੀਸੋਥੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "ਲੀਬਾਰੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "ਲੀਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "ਲੀਚਟੀਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "ਲੀਥੂਆਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "ਲ਼ਕਸ਼ਬਰਗ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "ਮੈਕਸੀਕੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "ਮੈਕਡੋਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "ਮੈਡਾਗਾਸਕਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "ਮਾਲਾਵੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "ਮਲੇਸੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "ਮਾਲਦੀਪ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "ਮਾਲੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "ਮਾਲਟਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "ਮਾਰਸ਼ਲ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "ਮਾਰਟੀਨੀਕਿਊ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "ਮਾਓਰੀਟਆਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "ਮਾਓਟੀਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "ਮਾਈਟੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "ਮੈਕਸੀਕੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "ਮਾਕਰੋਨੀਸ਼ੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "ਮੋਲਡੋਵਾ ਗਣਰਾਜ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "ਮੋਨਸ਼ੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "ਮੰਗੋਲੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "ਮੋਨਟਸ਼ਟੀਟ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "ਮੋਰੋਸ਼ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "ਮੋਜ਼ਾਮਬੀਕਿਉ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "ਮਿਆਮਾਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "ਨੀਮੀਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "ਨੀਓਰੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "ਨੇਪਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "ਨੀਦਰਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "ਨੀਦਰਲੈਂਡ ਐਟੀਲਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "ਨਵਾਂ ਕਾਲੀਡੋਨੀਆਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "ਨਿਊਜੀਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "ਨਿਕਾਰਗੁਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "ਨੀਜ਼ਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "ਨੀਜ਼ੀਰਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "ਨੀਊਈ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "ਨੋਰਫੋਕ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "ਉੱਤਰੀ ਮਰੀਵੀਆਨਾ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "ਨਾਰਵੇ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "ਓਮਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "ਪਾਕਿਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "ਪਾਲਾਊ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "ਫਿਲੀਸਤੀਨ ਭਾਗ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "ਪੈਨਾਮਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "ਪਾਪੂਆ ਨਵਾਂ ਗੂਈਨਿਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "ਪੇਰੂਗਵੇ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "ਪੇਰੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "ਫਿਲਿਪੀਨੀਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "ਪਿਟਸਾਰਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "ਪੋਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "ਪੁਰਤਗਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "ਪੁਈਰਟੋ ਰੀਸੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "ਕਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "ਰੀਯੁਨੀਅਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "ਰੋਮਾਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "ਰੂਸੀ ਗਣਰਾਜ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "ਰਵਾਂਡਾਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "ਸੇਂਟ ਕਿੱਟਸ ਐਂਡ ਨੀਵਿਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "ਸੇਂਟ ਲੂਸੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "ਸੇਂਟ ਵੀਨਸੈਂਟ ਐਂਡ ਦੀ ਗਰੀਨਾ-ਡੀਨਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "ਸਾਮੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "ਸਾਨ ਮਾਰੀਨੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "ਸਾਓ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "ਸਾਊਦੀ ਅਰਬ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "ਸੈਨੇਗਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "ਸਰਬੀਆ ਐਂਡ ਮੋਨਟੀਓਗਰੋ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "ਸੀਆਚਿਲਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "ਸੀਈਰਆ ਲਿਏਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "ਸਿੰਘਾਪੁਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "ਸਲੋਵਾਕੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "ਸਲੋਵੀਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "ਸੋਲੋਮੋਨ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "ਸੋਮਾਲੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "ਦੱਖਣੀ ਅਫਰੀਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "ਦੱਖਣੀ ਜਾਰਜੀਆਂ ਤੇ ਦੱਖਣੀ ਸੈਡਵਿੱਚ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "ਸਪੇਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ਸ੍ਰੀਲੰਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "ਸੇਂਟ ਹੀਲੀਨਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "ਸੇਂਟ ਪੀਰੀਅਰ ਤੇ ਮੀਕਿਉਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "ਸੂਡਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "ਸੂਰੀਨਾਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "ਸਵਾਲਬਰਡ ਕੇ ਜਾਨ ਮਾਈਯਾਮ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "ਸਵਾਜ਼ੀਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ਸਵੀਡਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ਸਵਿਟਰਜ਼ਰਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "ਸੀਰੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "ਤਾਈਵਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "ਤਜ਼ਾਕਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "ਤਨਜਾਨੀਆਂ, ਗਣਰਾਜ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "ਥਾਈਲੈਂਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "ਟੀਮੁਰ-ਲੀਸਟੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "ਟੂਗੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "ਟੂਕੀਲਾਊ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "ਟੂਨਗਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "ਟਰੀਨੀਡ ਤੇ ਟੋਬਾਗੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "ਟੁਨੀਸ਼ੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "ਤੁਰਕੀ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "ਤੁਰਕਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "ਤੁਰਕ ਤੇ ਕਾਸਕੋਸ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "ਟੂਵਾਲੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "ਯੂਗਾਂਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "ਯੂਕਰੇਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "ਸੰਯੁਕਤ ਰਾਜ ਅਮੀਰਾਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "ਬਰਤਾਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "ਅਮਰੀਕਾ ਦੇ ਛੋਟੇ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "ਉਰੂਗਵੇ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "ਉਜ਼ੇਬਕਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "ਵਾਨੂਟੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "ਵੈਨੂਜੇਏਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "ਵੀਅਤਨਾਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "ਵਿਰਗਿਨ ਟਾਪੂ ਬਰਤਾਨੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "ਵਿਰਗਿਨ ਟਾਪੂ, ਅਮਰੀਕਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "ਵਾਲਿਸ਼ ਤੇ ਫੂਟੂਨਾ ਟਾਪੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "ਦੱਖਣੀ ਸਹਾਰਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "ਯਮਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "ਜੈਂਬੀਆ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "ਜਿੰਬਾਬਾਵੇ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "ਨਾਂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "ਜਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "ਯਾਹੂ ਸੁਨੇਹੇਦਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "ਯਾਹੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "ਗਡੂ-ਗਡੂ ਸੁਨੇਹੇਦਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "ਗਡੂ-ਗਡੂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "ਗਰੁੱਪਵਾਈਜ਼"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "ਸਕਾਈਪੀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "ਸੇਵਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "ਟਿਕਾਣਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "ਕੰਮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ਘਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "ਯਾਹੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "ਗਡੂ-ਗਡੂ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "ਗਰੁੱਪਵਾਈਜ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "ਸਰੋਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "ਨਿਯਤ ਕਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "ਲਿਖਣਯੋਗ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "ਤਬਦੀਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2646,43 +1561,43 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ਇੱਕ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ਖਾਲੀ ਹੈ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰਕ ਤੇਜ਼-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "ਪੂਰਾ ਸੋਧੋ(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "ਪੂਰਾ ਨਾਂ(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "ਈ-ਮੇਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ(_S)"
 
@@ -2720,111 +1635,61 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਸਭ ਸੰਪਰਕ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ\n"
 "ਹੋ?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "ਐਡਰੈੱਸ _੨:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "ਸ਼ਹਿਰ(_t):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "ਦੇਸ਼(_y):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "ਪੂਰਾ ਐਡਰੈੱਸ"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "ਪਿੰਨ ਕੋਡ(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "ਡਾ."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"ਸ੍ਰੀਮਾਨ\n"
+"ਸ੍ਰੀਮਤੀ\n"
+"ਸ੍ਰੀਮਤੀ\n"
+"ਕੁਮਾਰੀ\n"
+"ਡਾ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"ਸੀਨੀ\n"
+"ਜੂਨੀ\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "ਪੂਰਾ ਨਾਂ"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "ਜੂਨੀਅਰ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "ਕੁਮਾਰੀ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "ਸ੍ਰੀਮਾਨ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "ਸ੍ਰੀਮਤੀ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "ਸ੍ਰੀਮਤੀ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "ਸੀਨੀਅਰ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "ਪਹਿਲਾਂ(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "ਆਖਰੀ(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "ਮੱਧ(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "ਪਿਛੇਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "IM ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕਰੋ"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "ਅਕਾਊਂਟ ਨਾਂ(_A):"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_IM ਸੇਵਾ:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "ਟਿਕਾਣਾ(_L):"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>ਮੈਂਬਰ</b>"
@@ -2835,9 +1700,9 @@ msgid "Contact List Editor"
 msgstr "ਸੰਪਰਕ ਸੂਚੀ ਸੰਪਾਦਕ"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "ਚੁਣੋ..."
 
@@ -2863,11 +1728,11 @@ msgid "_Members"
 msgstr "ਮੈਂਬਰ(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "ਕਿਤਾਬ"
 
@@ -2913,27 +1778,27 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰਾਂ ਸ਼ਾਮਿਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "ਸੰਪਰਕ ਮਿਲਾਨ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "ਈ-ਮੇਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "ਕੋਈ ਖੇਤਰ ਸ਼ਾਮਿਲ"
@@ -2947,35 +1812,35 @@ msgstr "ਈ-ਮੇਲ ਇਸ ਨਾਲ ਆਰੰਭ ਕਰੋ"
 msgid "Name contains"
 msgstr "ਨਾਂ ਰੱਖਦਾ ਹੈ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰਕ"
 msgstr[1] "%d ਸੰਪਰਕ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "ਕਿਊਰੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "ਬੁੱਕ ਝਲਕ ਲੈਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
@@ -2992,105 +1857,103 @@ msgid "Source"
 msgstr "ਸਰੋਤ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "ਕਿਸਮ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "vCard ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "ਨਵਾਂ ਸੰਪਰਕ(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "ਨਵੀਂ ਸੰਪਰਕ ਲਿਸਟ(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾਂਗ ਸੰਭਾਲੋ(_S)...."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰਕ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "ਸੂਚੀ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "ਸੰਪਰਕ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜੋ(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "ਪਰਿੰਟ ਕਰੋ(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਕਾਪੀ ਕਰੋ(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "ਕੱਟੋ(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ਕਾਪੀ ਕਰੋ(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "ਚੇਪੋ(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "ਕੋਈ ਕੈਟਾਗਰੀ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "ਸਹਾਇਕ"
 
@@ -3119,8 +1982,8 @@ msgid "Car Phone"
 msgstr "ਕਾਰ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../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
@@ -3128,7 +1991,7 @@ msgid "Categories"
 msgstr "ਕੈਟਾਗਰੀਆਂ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
@@ -3177,22 +2040,22 @@ msgid "Journal"
 msgstr "ਜਰਨਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "ਮੈਨੇਜਰ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "ਮੋਬਾਇਲ ਫੋਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "ਆਮ ਨਾਂ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "ਨੋਟ"
 
@@ -3221,14 +2084,14 @@ msgid "Radio"
 msgstr "ਰੇਡੀਓ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "ਰੋਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "ਸਾਥੀ"
 
@@ -3258,55 +2121,53 @@ msgstr "ਯੂਨਿਟ"
 msgid "Web Site"
 msgstr "ਵੈਬ ਸਾਇਟ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "ਚੌੜਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "ਉਚਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੈ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "ਖੇਤਰ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "ਖੇਤਰ ਨਾਂ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "ਟੈਕਸਟ ਮਾਡਲ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "ਨਾਂ ਦੀ ਅਧਿਕਤਮ ਲੰਬਾਈ"
 
@@ -3314,7 +2175,7 @@ msgstr "ਨਾਂ ਦੀ ਅਧਿਕਤਮ ਲੰਬਾਈ"
 msgid "Column Width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3324,7 +2185,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ ਜਾਰੀ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3338,7 +2199,7 @@ msgstr ""
 "\n"
 "ਜਾਂ ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3352,7 +2213,7 @@ msgstr ""
 "\n"
 "ਇਥੇ ਸੰਪਰਕ ਬਣਾਉਣ ਲਈ ਦੋ ਵਾਰ ਦਬਾਓ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3362,7 +2223,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰਕ ਦੀ ਖੋਜ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3372,41 +2233,41 @@ msgstr ""
 "\n"
 "ਇਸ ਝਲਕ ਵਿੱਚ ਵੇਖਾਓ ਲਈ ਕੋਈ ਸੂਚੀ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "ਐਡਪਟਰ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "ਕੰਮਕਾਜੀ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "ਘਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "ਹੋਰ ਈ-ਮੇਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "ਚੁਣਿਆ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "ਕਰਸਰ ਹੈ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "ਹਮੇਸ਼ਾ ਝਲਾਕਾਰੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "ਲਿੰਕ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 
@@ -3415,96 +2276,101 @@ msgstr "ਇਸ ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_S)..."
 msgid "Copy _Email Address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(ਨਕਸ਼ਾ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "ਨਕਸ਼ਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "ਸੂਚੀ ਮੈਂਬਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "ਵਿਭਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "ਕਿੱਤਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "ਸਥਿਤੀ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "ਕੈਲੰਡਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "ਫੋਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "ਫੈਕਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "ਐਡਰੈੱਸ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "ਵੈਬ ਲਾਗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "ਜਨਮ-ਦਿਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "ਕੰਮ ਟਾਇਟਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "ਮੁੱਖ ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3559,12 +2425,11 @@ msgstr "ਪ੍ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "ਰੱਦ ਕੀਤਾ"
 
@@ -3575,13 +2440,13 @@ msgstr "ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲਾਜ਼ਮੀ ਹੈ"
 
@@ -3696,7 +2561,7 @@ msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸੂਚੀ ਗਲਤੀ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰਕ ਗਲਤੀ"
 
@@ -3713,7 +2578,7 @@ msgid "Error removing list"
 msgstr "ਹਟਾਉਣ ਸੂਚੀ ਗਲਤੀ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "ਹਟਾਉਣ ਸੰਪਰਕ ਗਲਤੀ"
 
@@ -3741,7 +2606,7 @@ msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰਕ ਵੇਖਾਓ(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3750,46 +2615,46 @@ msgstr ""
 "%s ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ\n"
 "ਕੀ ਇਸ ਉੱਪਰ ਹੀ ਲਿਖਿਆ ਜਾਵੇ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 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:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ਸੰਪਰਕ"
 msgstr[1] "ਸੰਪਰਕ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "ਸੂਚੀ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "ਸੰਪਰਕ ਭੇਜੋ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰਕ ਦੀ ਨਕਲ"
 
@@ -3813,326 +2678,127 @@ msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 msgid "Contact information for %s"
 msgstr "%s ਲਈ ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਜਾਂਚ..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
-msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "ਪੂਰਾ vCard ਵੇਖੋ"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "ਥੋੜਾ vCard ਵੇਖੋ"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "ਸੁਨੇਹਾ ਕਿਤਾਬ ਵਿੱਚ ਸੰਭਾਲੋ"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "ਕਾਰਡ ਵੇਖਾਓ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ਆਉਟਲੁੱਕ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "ਆਉਟਲੁੱਕ CSV ਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮੌਜੀਲਾ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮੌਜੀਲਾ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਜਾਂ ਟੈਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ vCard ਇੰਪੋਰਟਰ"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 ਬਿੰਦੂ ਤਾਹੂਮਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "੮ ਬਿੰਦੂ ਤਾਹੂਮਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "ਅੰਤ ਤੇ ਖਾਲੀ ਫਾਰਮ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "ਭਾਗ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "ਹੇਠਾਂ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "ਆਕਾਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "ਫੋਂਟ(_o)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "ਫੋਂਟ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "ਪਦਲੇਖ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "ਫਾਰਮੈਟ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "ਹੈੱਡਰ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "ਹੈੱਡਰ/ਪਦਲੇਖ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "ਹੈਡਿੰਗ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "ਹਰ ਪੱਤਰ ਲਈ ਹੈਡਿੰਗ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "ਉਚਾਈ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "ਹੁਣੇ ਹਰ ਬਾਅਦ ਕਰੋ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "ਸ਼ਾਮਿਲ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "ਲੈਡਸਕੇਪ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "ਖੱਬਾ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "ਪਾਸੇ ਤੇ ਪੱਤਰ ਟੈਬਾਂ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "ਹਾਸ਼ੀਆ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "ਕਾਲਮਾਂ ਦੀ ਗਿਣਤੀ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "ਚੋਣ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "ਸਥਿਤੀ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "ਸਫਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "ਸਫ਼ਾ ਨਿਰਧਾਰਨ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "ਸਫਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "ਸਫ਼ਾ ਸਰੋਤ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "ਪੋਰਟਰੇਟ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "ਝਲਕ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ਸਲੇਟੀ ਛਾਂ ਨਾਲ ਪਰਿੰਟ ਕਰੋ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "ਜਿਸਤ ਸਫਿਆਂ ਤੇ ਉਲਟ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "ਸੱਜਾ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "ਖੰਡ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "ਛਾਂ"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "ਅਕਾਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "ਇੱਕ ਨਵੇਂ ਸਫ਼ੇ ਸ਼ੁਰੂ ਕਰੋ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "ਸ਼ੈਲੀ ਨਾਂ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "ਉਪਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "ਕਿਸਮ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "ਚੌੜਾਈ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "ਫੋਂਟ(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "ਫਾਇਲ ਨਹੀਂ ਖੋਲੀ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਦੀ ਸੂਚੀ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "ਕਿਤਾਬ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "ਸਟੈਂਡਰਡ ਆਉਟਪੁੱਟ ਫਾਇਲ ਦੀ ਬਜਾਏ ਆਉਟਪੁੱਟ ਫਾਇਲ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "ਸਥਾਨਕ ਐਡਰੈੱਸ ਫੋਲਡਰਾਂ ਦੀ ਸੂਚੀ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "ਕਾਰਡ vcard ਜਾਂ csv ਫਾਇਲ ਵਾਂਗ ਵੇਖਾਓ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard।csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਨਿਰਯਾਤ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "ਇੱਕ ਆਉਟਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਅਸਕਰੋਨਸ ਮੋਡ ਵਿੱਚ ਕਾਰਡਾਂ ਦੀ ਗਿਣਤੀ, ਡਿਫਾਲਟ ਆਕਾਰ 100 ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "ਕਮਾਂਡ ਲਾਇਨ ਆਰਗੂਮਿੰਟ ਗਲਤੀ, ਕਿਰਪਾ ਕਰਕੇ ਵੇਖਣ ਲਈ--help ਵਰਤੋਂ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv ਜਾਂ vcard ਫਾਰਮੈਟ ਵਰਤੋਂ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "ਅਸਿਕਰੋਨਾਈਜ਼ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮੋਡ ਵਿੱਚ, ਆਕਾਰ ਚੋਣ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
 
@@ -4524,7 +3190,7 @@ msgstr "ਤੁਹਾਡੇ ਕੰਮ ਈਵੇਲੂਸ਼ਨ ਦੇ ਮੁੜ ਚ�
 msgid "_Discard Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
@@ -4546,56 +3212,56 @@ msgstr "ਸੂਚਨਾ ਭੇਜੋ(_S)"
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "ਬਹੁ-ਦਿਨ ਕਾਰਵਾਈਆਂ ਨੂੰ ਵੱਖ ਕਰੋ:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server ਨੂੰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "ਪਾਇਲਟ ਕੈਲੰਡਰ ਕਾਰਜ ਭਾਗ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਮੀਮੋ ਕਾਰਜ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "ਮੂਲ ਪਹਿਲ:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "ਪਾਇਲਟ ਦਾ ਕੰਮ ਕਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 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:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "ਕੈਲੰਡਰ ਤੇ ਕੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "ਕੈਲੰਡਰ"
 
@@ -4636,24 +3302,24 @@ msgid "Memo_s"
 msgstr "ਮੀਮੋ(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ਕੰਮ"
@@ -4664,7 +3330,7 @@ msgstr "ਕੈਲੰਡਰ(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ਕੰਮ(_T)"
 
@@ -4672,27 +3338,27 @@ msgstr "ਕੰਮ(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
 msgstr[1] "ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ਘੰਟੇ"
 msgstr[1] "ਘੰਟੇ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "ਸ਼ੁਰੂ ਸਮਾਂ"
 
@@ -4707,10 +3373,10 @@ msgstr "ਸਭ ਮਨਸੂਖ(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "ਟਿਕਾਣਾ:"
 
@@ -4723,11 +3389,11 @@ msgid "_Dismiss"
 msgstr "ਮਨਸੂਖ(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4743,32 +3409,32 @@ msgstr "ਬੇਕਾਰ(_S)"
 msgid "location of appointment"
 msgstr "ਮੁਲਾਕਾਤ ਦਾ ਟਿਕਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "ਕੋਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤੁਹਾਡੇ ਲਈ %d ਅਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4780,7 +3446,7 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪੁੱਛਗਿੱਛ ਬਕਸਾ ਹੀ\n"
 "ਵੇਖਾ ਸਕੇਗੀ।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4796,7 +3462,7 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
@@ -4869,157 +3535,170 @@ msgid "Calendars to run alarms for"
 msgstr "ਅਲਾਰਮ ਚਲਾਉਣ ਲਈ ਕੈਲੰਡਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸਿਸਟਮ ਸਮਾਂ ਵਰਤਣ ਲਈ ਇਹ ਚੈੱਕ ਕਰੋ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ਸਮਾਂ ਰੇਖਾ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਖਿੱਚਣ ਲਈ ਰੰਗ (ਮੂਲ ਖਾਲੀ ਹੈ)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਲਈ ਰੰਗ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤੇ ਸਮੇਟੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "ਨਵੇਂ ਈਵੈਂਟ ਲਈ ਡਿਫਾਲਟ ਮੁੜ-ਵਾਪਰਨ ਦੀ ਗਿਣਤੀ। -1 ਦਾ ਅਰਥ ਹੈ ਹਮੇਸ਼ਾਂ ਲਈ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ਦਿਨ, ਜਿੰਨਾ ਤੋਂ ਕਾਰਜਕਾਰੀ ਘੰਟੇ ਸ਼ੁਰੂ ਅਤੇ ਅੰਤ ਹੁੰਦੇ ਹਨ, ਵੇਖਾਉਣ ਲ਼ਈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ਮੂਲ ਮੁਲਾਕਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#| msgid "Default reminder units"
+msgid "Default recurrence count"
+msgstr "ਡਿਫਾਲਟ ਦੁਹਰਾਉਣ ਗਿਣਤੀ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
-msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਆਈਟਮਾਂ"
+msgstr "ਡਿਫਾਲਟ ਰੀਮਾਈਡਰ ਯੂਨਿਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "ਮੂਲ ਯਾਦਪੱਤਰ ਮੁੱਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "ਅਲਾਰਮ ਆਡੀਓ ਫਾਇਲਾਂ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "ਘਟਨਾ ਰੂਪ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "ਘਟਨਾ ਪਾਰਦਰਸ਼ਤਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਟੈਪਲੇਟ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "ਕੈਲੰਡਰ ਝਲਕ ਵਿੱਚ ਘਟਨਾਵਾਂ ਵਿੱਚ ਢਾਂਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "ਮੁਕੰਮਲ ਕੰਮ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "ਕੰਮ ਆਈਟਮਾਂ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "ਕੰਮ ਮੁੱਲ ਓਹਲੇ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "ਖਿਤਿਜੀ ਪੱਟੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਅੰਤ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ਕਾਰਜਕਾਰੀ ਦਿਨ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਘੰਟੇ, ਚੌਵੀਂ ਘੰਟਾ ਫਾਰਮੈਟ ਵਿੱਚ ੦ ਤੋਂ ੨੩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਦੇ ਹਫਤਾ ਝਲਕ ਵਿੱਚ ਅੰਤਰਾਲ, ਮਿੰਟ ਵਿੱਚ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "ਆਖਰੀ ਅਲਾਰਮ ਸਮਾਂ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "ਲੈਵਲ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਸੁਨੇਹਾ ਲਾਗ 'ਚ ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਤਾਜ਼ਾ ਵਰਤੇ ਦੂਜੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਲਿਸਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਪਬਲੀਕੇਸ਼ਨ ਲਈ ਸਰਵਰ URL ਦੀ ਸੂਚੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਦਿਨ ਝਲਕ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ ਰੰਗ - ਸਮਾਂ ਰੇਖਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "'day_second_zones' ਵਿੱਚ ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ਯਾਦ ਰੱਖਣ ਲਈ ਤਾਜ਼ਾ ਵਰਤੇ ਸਮਾਂ-ਖੇਤਰਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਖਤਮ ਹੋਣ, ੦ ਤੋਂ ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ਕੰਮ ਦਿਨ ਦੇ ਮਿੰਟ ਸ਼ੁਰੂ ਹੋਣ, ੦ ਤੋਂ ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "ਖਿਤਿਜੀ ਪਾਸੇ ਦੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "ਮਹੀਨਾ ਦਿੱਖ ਲੰਬਕਾਰੀ ਪੱਟੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "ਮੂਲ ਯਾਦ-ਪੱਤਰ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "ਕੰਮ ਓਹਲੇ ਕਰਨ ਦਾ ਪਤਾ ਕਰਨ ਲਈ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5027,7 +3706,7 @@ msgstr ""
 "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜੋ "
 "ਕਿ ਮਹੀਨਾ ਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5035,19 +3714,19 @@ msgstr ""
 "ਖਿਤਿਜੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, ਜੋ "
 "ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ, ਜੋ ਕਿ ਕੈਲੰਡਰ ਸੂਚੀ ਅਤੇ ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਕੈਲੰਡਰ ਬਾਹੀ ਵਿੱਚ ਵਿੱਚ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "ਕੰਮ ਸੂਚੀ ਅਤੇ ਕੰਮ ਝਾਤੀ ਵਿੱਚ, ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5055,7 +3734,7 @@ msgstr ""
 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, "
 "ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਹੋਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5063,83 +3742,102 @@ msgstr ""
 "ਲੰਬਕਾਰੀ ਬਾਹੀ ਦੀ ਸਥਿਤੀ ਪਿਕਸਲਾਂ ਵਿੱਚ, ਜੋ ਕਿ ਦਿੱਖ ਅਤੇ ਮਿਤੀ ਕੈਲੰਡਰ ਅਤੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਹੁੰਦੀ ਹੈ, "
 "ਜਦੋਂ ਕਿ ਮਹੀਨਾ ਦਿੱਖ ਨਾ ਹੋਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#| msgid "Print this calendar"
+msgid "Primary calendar"
+msgstr "ਪ੍ਰਾਇਮਰੀ ਕੈਲੰਡਰ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#| msgid "New memo list"
+msgid "Primary memo list"
+msgstr "ਪ੍ਰਾਇਮਰੀ ਮੀਮੋ ਲਿਸਟ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#| msgid "New task list"
+msgid "Primary task list"
+msgstr "ਪ੍ਰਾਇਮਰੀ ਟਾਸਕ ਲਿਸਟ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ਅਲਾਰਮ ਵਲੋਂ ਚੱਲਣ ਵਾਲੇ ਕਾਰਜ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਵਰਤੇ ਤਾਜ਼ਾ ਦੂਜੇ ਸਮਾਂ ਜ਼ੋਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "ਅਲਾਰਮ ਆਡੀਓ ਲਈ ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਅੱਗੇ ਪਿੱਛੇ ਕਰੋ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਓ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
-msgstr "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖਾਓ"
+msgstr "ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਾਕਾਤ ਅੰਤ ਸਮਾਂ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
-msgstr "ਸੂਚੀ ਟਰੇ ਵਿੱਚ ਅਲਾਰਮ ਵੇਖਾਓ"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਅਲਾਰਮ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
-msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
-msgstr "\"ਝਲਕ\" ਪੈਨ ਵੇਖਾਓ"
+msgstr "\"ਝਲਕ\" ਪੈਨ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
-msgstr "\"Preview (ਝਲਕ)\" ਪੱਟੀ ਵੇਖਾਓ।"
+msgstr "\"Preview (ਝਲਕ)\" ਪੱਟੀ ਵੇਖੋ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
-msgstr "ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
-msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖਣ ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖਣ ਖੇਤਰ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤੇ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
-msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤਾ ਅੰਕ ਵੇਖਾਓ"
+msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤਾ ਅੰਕ ਵੇਖੋ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ ਵੇਖਣਾ ਜੇ ਸੈੱਟ ਕੀਤਾ ਤਾਂ। ਮੁੱਲ 'timezone' ਕੁੰਜੀ ਵਿੱਚ ਵਰਤੇ ਵਾਂਗ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ ਦਾ ਰੰਗ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "ਕੰਮ ਲੰਬਕਾਰੀ ਬਾਹੀ ਸਥਿਤੀ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5148,7 +3846,7 @@ msgstr ""
 "ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਟੈਪਲੇਟ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਐਡਰੈੱਸ ਦੇ ਯੂਜ਼ਰ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ ਨਾਲ "
 "ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5156,68 +3854,88 @@ msgstr ""
 "ਕੈਲੰਡਰ ਵਿੱਚ ਵਰਤਣ ਲਈ ਮਿਤੀ ਤੇ ਸਮਾਂ ਲਈ ਮੂਲ ਸਮਾਂ-ਖੇਤਰ, ਇੱਖ ਨਾ-ਅਨੁਵਾਦ ਓਲਸੀਨ ਸਮਾਂ-ਖੇਤਰ ਡਾਟਾਬੇਸ "
 "ਖੇਤਰ, ਜਿਵੇਂ ਕਿ \"America/New York\" ਆਦਿ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "ਦਿਨ ਝਲਕ ਵਿੱਚ ਦੂਜਾ ਸਮਾਂ-ਖੇਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ 0। ਚੇਤਾਵਨੀ ਲਈ 1। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ 2।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "ਸਮਾਂ ਵੰਡ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "ਸਮਾਂ ਜਦੋਂ ਅਲਾਰਮ ਚੱਲਿਆ, ਸਮੇਂ ਵਿੱਚ(_t)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "ਸਮਾਂ-ਖੇਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "ਕੈਲੰਡਰ ਝਲਕ ਵਿੱਚ ਘਟਨਾਵਾਂ ਵਿੱਚ ਪਾਰਦਰਸ਼ਤਾ, ਮੁੱਲ 0 (ਪਾਰਦਰਸ਼ੀ) ਅਤੇ 1 (ਧੁੰਧਲਾ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "ਚੌਵੀਂ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "ਹਾਈਲਾਈਟ (\"ਪ੍ਰਾਇਮਰੀ\") ਕੈਲੰਡਰ ਲਈ URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "ਹਾਈਲਾਈਟ (\"ਪ੍ਰਾਇਮਰੀ\") ਮੀਮੋ ਲਿਸਟ ਲਈ URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "ਹਾਈਲਾਈਟ (\"ਪ੍ਰਾਇਮਰੀ\") ਟਾਸਕ ਲਈ URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਮੂਲ ਯਾਦਪੱਤਰਾਂ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" or \"ਦਿਨ\""
+msgstr "ਮੂਲ ਰੀਮਾਈਡਰ ਲਈ ਆਈਟਮਾਂ ਹਨ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" or \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਕੰਮ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
+msgstr "ਟਾਸਟ ਓਹਲੇ ਕਰਨ ਲਈ ਜਾਣਨ ਲਈ ਆਈਟਮਾਂ, \"ਮਿੰਟ\", \"ਘੰਟੇ\" ਜਾਂ \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "ਸਿਸਟਮ ਟਾਈਮ-ਜ਼ੋਨ ਵਰਤੋਂ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਚੁਣੇ ਸਮਾਂ-ਖੇਤਰ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਸਮਾਂ-ਖੇਤਰ ਵਰਤੋਂ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ ਹੋਣ ਦਾ ਦਿਨ, ਐਤਵਾਰ (੦) ਤੋਂ ਸ਼ਨਿਚੱਰਵਾਰ (੬)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ਅਲਾਰਮ ਵੇਖਾਉਣ ਲਈ ਸੂਚਨਾ ਪੱਟੀ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ਕੀ ਮੁਲਾਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ਕੀ ਮੁਲਕਾਤ ਜਾਂ ਕੰਮ ਹਟਾਉਣ ਤੇ ਪੁਸ਼ਟੀ ਕਰਵਾਈ ਜਾਵੇ ਜਾਂ ਨਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5225,141 +3943,142 @@ msgstr ""
 "ਕੀ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਿਆਂ ਨੂੰ ਇੱਕਠਾ ਕਰਨਾ ਹੈ ਤਾਂ ਕਿ ਸ਼ਨਿਚੱਰਵਾਰ ਅਤੇ ਐਤਵਾਰ ਨੂੰ ਇੱਕ ਦਿਨ ਦੇ ਤੌਰ ਤੇ "
 "ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "ਕੀ ਹਫਤਾ ਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਘਟਨਾ ਦਾ ਸਮਾਂ ਅੰਤ ਵੇਖਾਉਣਾ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ਕੀ ਕੈਲੰਡਰ ਵਿੱਚ ਮਾਰਕਉਸ ਬੈਂਸ ਰੇਖਾ (ਮੌਜੂਦਾ ਸਮੇਂ ਦੀ ਰੇਖਾ) ਖਿੱਚਣੀ ਹੈ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "ਕੀ ਮੁਕੰਮਲ ਕੰਮਾਂ ਨੂੰ ਕੰਮ ਦਿੱਖ ਵਿੱਚ ਓਹਲੇ ਕੀਤੇ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "ਕੀ ਮਹੀਨਾ ਝਲਕ ਨੂੰ ਹਫ਼ਤੇ ਰਾਹੀਂ ਹਿਲਾਉਣਾ ਹੈ ਨਾ ਕਿ ਮਹੀਨੇ ਨਾਲ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
-msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਯਾਦਪੱਤਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
+msgstr "ਕੀ ਮੁਲਾਕਾਤ ਲਈ ਮੂਲ ਰੀਮਾਈਡਰ ਲਗਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ RSVP ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕੈਟਾਗਰੀ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਰੋਲ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ਕੀ ਸਮਾਂ ਸਵੇਰੇ/ਸ਼ਾਮ ਦੀ ਬਜਾਏ ੪ ਘੰਟਿਆਂ ਵਿੱਚ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ਕੀ ਘਟਨਾ/ਕੰਮ/ਮੀਟਿੰਗ ਸੰਪਾਦਕ ਵਿੱਚ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਉਣਾ ਹੈ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "ਕੀ ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਨੰਬਰ ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ਕੀ ਮਿਤੀ ਝਲਕ ਦੌਰਾਨ ਹਫਤੇ ਦਾ ਅੰਕ ਵੇਖਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "ਕੀ ਘਟਨਾ ਵੇਖਾਉਣ ਦੌਰਾਨ ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "ਕਾਰਜੀ ਦਿਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਘੰਟਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਅੰਤ ਮਿੰਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "ਕਾਰਜਾਕਰੀ ਸ਼ੁਰੂ ਘੰਟਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "ਕਾਰਜਕਾਰੀ ਸ਼ੁਰੂ ਮਿੰਟ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ"
+#: ../calendar/gui/cal-editor-utils.c:100
+#| msgid "Invalid contact."
+msgid "Invalid object"
+msgstr "ਗਲਤ ਆਬਜੈਕਟ"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "ਸੰਖੇਪ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "ਕੈਟਾਗਰੀ ਹੈ"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "ਟਿੱਪਣੀ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "ਟਿਕਾਣਾ ਵਿੱਚ ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "ਅੱਗੇ ੭ ਦਿਨ ਦੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "ਐਕਟਿਵ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "ਮਿਆਦ ਪੁੱਗੀਆਂ ਟਾਸਕਾਂ"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "ਅਟੈਂਚਮਿੰਟ ਨਾਲ ਟਾਸਕ"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "ਐਕਟਿਵ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "ਅਗਲੇ ੭ ਦਿਨ ਦੀਆਂ ਮੁਲਾਕਾਤਾਂ"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "ਪਰਿੰਟ ਕਰੋ"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5368,137 +4087,126 @@ msgstr ""
 "ਇਹ ਚੁਣੇ ਸਮੇਂ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦੇਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰਹੇ ਤਾਂ, ਇਹ ਘਟਨਾਵਾਂ "
 "ਮੁੜ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕਣਗੀਆਂ।"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "ਇਸ ਤੋਂ ਪੁਰਾਣੀਆਂ ਘਟਨਾਵਾਂ ਸੋਧੋ"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ਦਿਨ"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "ਵੈੱਬ ਤੇ"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "ਮੌਸਮ"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "ਜਨਮ-ਦਿਨ ਤੇ ਵਰੇ-ਗੰਢ"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "ਨਕਲ(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਕਰਵਾਓ(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "ਆਫਲਾਈਨ ਵਰਤੋਂ ਲਈ ਉਪਲੱਬਧ ਨਾ ਕਰਵਾਓ(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "ਕੈਲੰਡਰ ਦਾ ਅੱਪਗਰੇਡ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ '%s' ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ ਬਣਾਉਣ ਲਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "ਕੈਲੰਡਰ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮੁਲਾਕਾਤ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮੀਟਿੰਗ(_e)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_p)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "ਨਵੀਂ ਸਾਰਾ-ਦਿਨ ਮੁਲਾਕਾਤ ਬਣਾਓ"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ਕੈਲੰਡਰ(_n)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ ਬਣਾਓ"
 
@@ -5540,20 +4248,20 @@ msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "ਵਰਗੀਕਰਨ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "ਗੁਪਤ"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
@@ -5573,21 +4281,27 @@ msgstr "ਬਾਹਰ ਨਾ ਜਾਓ"
 msgid "Exist"
 msgstr "ਬਾਹਰ"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "ਟਿਕਾਣਾ"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "ਪ੍ਰਬੰਧਕ"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ਨਿੱਜੀ"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ਸਰਵਜਨਕ"
 
@@ -5597,11 +4311,11 @@ msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "ਸੰਖੇਪ"
 
@@ -5621,35 +4335,55 @@ msgid "does not contain"
 msgstr "ਸ਼ਾਮਿਲ ਨਹੀ ਹੈ"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "ਹੈ"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ਇਹ ਨਹੀਂ"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਤਰੀਕਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "ਅਲਾਰਮ ਸੋਧ"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "ਧੁਨੀ ਚਲਾਉ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "ਕਾਰਜ ਚਲਾਓ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>ਅਲਾਰਮ</b>"
@@ -5679,83 +4413,78 @@ msgid "Mes_sage:"
 msgstr "ਸੁਨੇਹਾ(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "ਧੁਨੀ ਚਲਾਉ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "ਚੇਤਾਵਨੀ ਉਭਾਰੋ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "ਕਾਰਜ ਚਲਾਓ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "ਨੂੰ ਭੇਜੋ:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "ਇੱਕ ਈ-ਮੇਲ ਭੇਜੋ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "ਆਰਗੂਮਿੰਟ(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "ਕਾਰਜ(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "ਅਲਾਰਮ ਦੁਹਰਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "ਆਵਾਜ਼(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "ਬਾਅਦ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-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:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "ਦਿਨ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "ਮੁਲਾਕਾਤ ਦਾ ਅੰਤ"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"ਪਹਿਲਾਂ\n"
+"ਬਾਅਦ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "ਹਰ ਵਾਧੂ ਸਮਾਂ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "ਘੰਟੇ"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"ਮਿੰਟ\n"
+"ਘੰਟੇ\n"
+"ਦਿਨ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "ਮਿੰਟ"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"ਮਿੰਟ\n"
+"ਘੰਟੇ\n"
+"ਦਿਨ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "ਮੁਲਾਕਾਤ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"ਮੁਲਾਕਾਤ ਨਾਲ ਸ਼ੁਰੂ\n"
+"ਮੁਲਾਕਾਤ ਖਤਮ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5766,47 +4495,56 @@ msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "ਅਲਾਰਮ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਝਲਕ ਲਈ ਸੁਝਾਅ(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "ਫਾਇਲ ਜੋੜੋ"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "ਅਲਾਰਮ ਲਈ ਚੁਣੇ ਕੈਲੰਡਰ"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#| msgid "Time zone:"
+msgid "Time and date:"
+msgstr "ਸਮਾਂ ਅਤੇ ਮਿਤੀ:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#| msgid "Date:"
+msgid "Date only:"
+msgstr "ਕੇਵਲ ਮਿਤੀ:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(ਦਿਨ ਝਲਕ ਵਿੱਚ ਵੇਖੋ)"
@@ -5831,51 +4569,63 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u ਅਤੇ %d ਨੂੰ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚੋਂ ਯੂਜ਼ਰ ਅਤੇ ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕੀਤਾ ਜਾਵੇਗਾ।<i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">ਅਲਾਰਮ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../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:11
+#: ../mail/mail-config.glade.h:13
+#| msgid "<span weight=\"bold\">Time</span>"
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">ਸਮਾਂ/ਮਿਤੀ ਫਾਰਮੈਟ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">ਮੂਲ ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ</span>"
+msgstr "<span weight=\"bold\">ਡਿਫਾਲਟ ਵੇਹਲਾ/ਰੁਝਿਆ ਸਰਵਰ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../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:14
 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:15
 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:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">ਕੰਮ ਹਫ਼ਤਾ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "ਦਿਨ-ਰਾਤ ਰੌਸ਼ਨੀ ਸਮਾਂ ਲਈ ਅਨੁਕੂਲ(_v)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "ਡਿਸਪਲੇਅ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#| msgid "Show display alarms in notification tray"
+msgid "Display alarms in _notification area only"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਟਰੇ ਵਿੱਚ ਅਲਾਰਮ ਵੇਖੋ(_n)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5885,13 +4635,13 @@ msgstr ""
 "ਘੰਟੇ\n"
 "ਦਿਨ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5909,215 +4659,232 @@ msgstr ""
 "ਸਨਿੱਚਰਵਾਰ\n"
 "ਐਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "ਐਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "ਮਹੀਨੇ ਨੂੰ ਹਫ਼ਤੇ ਨਾਲ ਹਿਲਾਉ(_r)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "ਦੂਜਾ ਖੇਤਰ(_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "ਅਲਾਰਮ ਸੂਚਨਾ ਲਈ ਕਲੰਡਰ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵੇਖਾਓ(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤੀ ਨੇਵੀਗੇਟਰ ਵਿੱਚ ਹਫਤੇ ਦੇ ਦਿਨ ਵੇਖਾਓ(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ਦਿਨ ਅਤੇ ਕੰਮ ਹਫ਼ਤਾ ਝਲਕ ਵਿੱਚ ਹਫ਼ਤਾ ਗਿਣਤੀ ਵੇਖਾਓ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "ਅੱਜ ਦੇ ਕੰਮ(_a):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "ਵੀਰ(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "ਟੈਪਲੇਟ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "ਸਮਾਂ-ਖੇਤਰ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "ਸਮਾਂ-ਫਾਰਮੈਟ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#| msgid "Show the second time zone"
+msgid "Use s_ystem time zone"
+msgstr "ਸਿਸਟਮ ਸਮਾਂ ਖੇਤਰ ਵਰਤੋਂ(_y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "ਹਫਤਾ ਸ਼ੁਰੂ(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "ਕਾਰਜੀ ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_੧੨ ਘੰਟੇ (ਸਵੇਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_੨੪ ਘੰਟੇ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "ਆਈਟਮਾਂ ਹਟਾਉਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰਵਾਓ(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਹਫਤਾ-ਅੰਤ ਸਮੇਟੋ(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼ੁਰੂ(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "ਸ਼ੁੱਕਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪੂਰਨ ਕੰਮ ਇਸ ਬਾਅਦ ਓਹਲੇ ਕਰੋ(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "ਸੋਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ ਕੰਮ(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "ਸ਼ਨਿੱ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤੇ ਅਤੇ ਮਹੀਨਾ ਝਲਕ ਵਿੱਚ ਮੁਲਕਾਤ ਵੇਖਾਓ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "ਸਮਾਂ ਵੰਡ(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "ਮੰਗਲ(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "ਬੁੱਧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "ਹਰੇਕ ਵਰ੍ਹੇ-ਗੰਢ/ਜਨਮਦਿਨ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "ਹਰ ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "ਕਿਸਮ:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਕੈਲੰਡਰ ਭਾਗ ਕਾਪੀ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਕੰਮ-ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ਆਫਲਾਇਨ ਕਾਰਵਾਈ ਲਈ ਮੀਮੋ ਸੂਚੀ ਭਾਗਾਂ ਨੂੰ ਸਥਾਨਕ ਕਾਪੀ ਕਰੋ(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "ਰੰਗ(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "ਕੰਮ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "ਕੈਲੰਡਰ ਵਿਸ਼ੇਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "ਨਵਾਂ ਕੈਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "ਕੰਮ ਲਿਸਟ ਗੁਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "ਮੀਮੋ ਸੂਚੀ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ"
 
@@ -6170,297 +4937,238 @@ msgstr "%s  ਤੁਸੀਂ ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ ਕੀਤ�
 msgid "Validation error: %s"
 msgstr "ਜਾਂਚ ਗਲਤੀ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "ਬਾਕੀ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ"
-msgstr[1] "%d ਨੱਥੀ ਸੁਨੇਹੇ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ਭੇਜੋ(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "ਅਟੈਚਮੈਂਟ"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#| msgid "Save attachments"
+msgid "Could not save attachments"
+msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "ਮੁਲਾਕਾਤ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮੁਲਾਕਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮੀਮੋ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "ਕੀ ਅਸਲੀ ਆਈਟਮ ਰੱਖਣੀ ਹੈ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "ਚੁਣਿਆ ਟੈਕਸਟ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕੱਟੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "ਉਪਲੱਬਧ ਮੱਦਦ ਵੇਖਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਕਾਪੀ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ ਸੰਭਾਲਣ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "ਸਾਰਾ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "ਵਰਗੀਕਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "ਫਾਇਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "ਚੋਣ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "ਨੱਥੀ(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਨੱਥੀ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "ਕੈਟਾਗਰੀ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਝਲਕ ਕੈਟਾਗਰੀ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "ਸਮਾਂ ਖੇਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਸਮਾਂ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "ਪਬਲਿਕ(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "ਪਬਲਿਕ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "ਨਿੱਜੀ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "ਨਿੱਜੀ ਵਾਂਗ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "ਗੁਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "ਗੁਪਤ ਦੇ ਤੌਰ 'ਤੇ ਰੱਖੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "ਰੋਲ ਖੇਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਰੋਲ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ RSVP ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ਖੇਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਹਾਲਤ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "ਕਿਸਮ ਖੇਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਦਰਸ਼ਕ ਕਿਸਮ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, 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:1974
-msgid "Hide Attachment _Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "ਨੱਥੀ ਵੇਖਾਓ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "ਸੰਭਾਲੋ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "ਅਟੈਚਮੈਂਟ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
@@ -6533,7 +5241,7 @@ msgid "Contacts..."
 msgstr "ਸੰਪਰਕ..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ:"
 
@@ -6560,7 +5268,7 @@ msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ"
 
@@ -6597,199 +5305,230 @@ msgstr "ਇਸ ਕੈਲੰਡਰ ਲਈ ਵੇਹਲਾ / ਰੁਝਿਆ ਜ�
 msgid "Appoint_ment"
 msgstr "ਮੁਲਾਕਾਤ(_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "ਈਵੈਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਕੈਲੰਡਰ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ।"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "ਈਵੈਂਟ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "ਚੁਣੇ ਪ੍ਰਬੰਧਕ ਦਾ ਅਕਾਊਂਟ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "ਸ਼ਾਮਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤੁਸੀਂ %s ਦੇ ਤੌਰ ਉੱਤੇ ਕੰਮ ਕਰ ਰਹੇ ਹੋ"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, 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:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, 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:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 msgstr[1] "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ %d ਮਿੰਟ"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ੧ ਦਿਨ ਪਹਿਲਾਂ"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ ੧ ਘੰਟਾ"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ ੧੫ ਮਿੰਟ"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"ਮੁਲਾਕਾਤ ਤੋਂ 15 ਮਿੰਟ ਪਹਿਲਾਂ\n"
+"ਮੁਲਾਕਾਤ ਤੋਂ 1 ਘੰਟਾ ਪਹਿਲਾਂ\n"
+"ਮੁਲਾਕਾਤ ਤੋਂ 1 ਦਿਨ ਪਹਿਲਾਂ"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "ਦਰਸ਼ਕ(_s)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "ਦਰਸ਼ਕ"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "ਅਲਾਰਮ ਸੋਧ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
-msgstr "ਘਟਨਾ ਵੇਰਵਾ"
+msgstr "ਈਵੈਂਟ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "ਸੰਖੇਪ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "ਅਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ਵੇਰਵਾ(_D):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "ਟਿਕਾਣਾ(_L):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 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:16
-msgid "for"
-msgstr "ਲਈ"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. 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:25
-msgid "until"
-msgstr "ਜਦ ਤੱਕ"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>ਦਰਸ਼ਕ(_e)</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "ਪ੍ਰਬੰਧਕ ਤਬਦੀਲ(_O):"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "ਸੰਪਰਕ(_N)..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "ਪ੍ਰਬੰਧਕ:"
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"ਲਈ\n"
+"ਜਦੋਂ ਤੱਕ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "ਮੀਮੋ"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "ਮੀਮੋ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਚੁਣਿਆ ਮੀਮੋ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "ਮੀਮੋ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -6803,7 +5542,7 @@ msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ਗਰੁੱਪ(_G):"
@@ -6828,23 +5567,23 @@ msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਕੰਮ ਨੂੰ ਸੋਧ
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤੁਸੀਂ ਇੱਕ ਆਵਰਤੀ ਮੀਮੋ ਨੂੰ ਸੋਧ ਰਹੇ ਹੋ। ਤੁਸੀਂ ਕੀ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "ਇਸ ਮੌਕੇ ਤੇ ਹੀ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "ਇਹ ਅਤੇ ਪਹਿਲ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "ਇਹ ਅਤੇ ਭਵਿੱਖਤ ਮੌਕੇ ਲਈ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "ਸਭ ਮੌਕੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ਇਸ ਮੁਲਾਕਾਤ ਵਿੱਚ ਲੜੀ ਹੈ, ਜੋ ਕਿ ਈਵੇਲੂਸ਼ਨ ਸੋਧ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
@@ -6866,7 +5605,7 @@ msgstr "ਚਾਲੂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
@@ -6875,7 +5614,7 @@ msgstr "ਪਹਿਲਾਂ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ਦੂਜਾ"
 
@@ -6883,7 +5622,7 @@ msgstr "ਦੂਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ਤੀਜਾ"
 
@@ -6891,21 +5630,30 @@ msgstr "ਤੀਜਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ਚੌਥਾ"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#| msgid "Width"
+msgid "fifth"
+msgstr "ਪੰਜਵਾਂ"
+
 #. 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:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "ਆਖਰੀ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ਹੋਰ ਮਿਤੀ"
 
@@ -6913,7 +5661,7 @@ msgstr "ਹੋਰ ਮਿਤੀ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
 
@@ -6921,7 +5669,7 @@ msgstr "੧ਲੇ ਤੋਂ ੧੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
 
@@ -6929,45 +5677,45 @@ msgstr "੧੧ਵੇਂ ਤੋਂ ੨੦ਵਾਂ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "੨੧ਵੇਂ ਤੋਂ ੩੧ਵਾਂ"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ਦਿਨ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ਇਸ ਤੇ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "ਮੌਜੂਦਗੀ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "ਅਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "ਸੋਧ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "ਅਪਵਾਦ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "ਹਟਾਉਣ ਲਈ ਇੱਕ ਚੋਣ ਨਹੀਂ ਮਿਲੀ।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "ਮਿਤੀ/ਸਮਾਂ"
 
@@ -6976,7 +5724,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>ਅਪਵਾਦ</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>ਝਲਕ</b>"
 
@@ -6984,50 +5732,57 @@ msgstr "<b>ਝਲਕ</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>ਦੁਹਰਾਓ</b>"
 
-#. 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
+#. 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:5
 msgid "Every"
 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/recurrence-page.glade.h:9
+#. 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:7
 msgid "This appointment rec_urs"
 msgstr "ਇਹ ਮੁਲਾਕਾਤ ਮੁੜ ਹੈ(_u)"
 
 #. 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 "ਹਮੇਸ਼ਾ"
-
-#. 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 "ਮਹੀਨਾ"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"ਦਿਨ\n"
+"ਹਫ਼ਤੇ\n"
+"ਮਹੀਨੇ\n"
+"ਸਾਲ"
 
 #. 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:29
-msgid "year(s)"
-msgstr "ਸਾਲ"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"ਲਈ\n"
+"ਜਦੋਂ ਤੱਕ\n"
+"ਹਮੇਸ਼ਾ"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "ਇਸ ਈਵੈਂਟ ਲਈ ਮੇਰੇ ਅਲਾਰਮ ਭੇਜੋ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+#| msgid "Notify new messages for _Inbox only"
+msgid "Notify new attendees _only"
+msgstr "ਕੇਵਲ ਦਰਸ਼ਕਾਂ ਲਈ ਸੂਚਨਾ ਦਿਓ(_o)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "ਵੈਬ ਪੇਜ਼"
 
@@ -7039,74 +5794,38 @@ msgstr "<span weight=\"bold\">ਫੁਟਕਲ</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "ਸਮਾਪਤ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "ਉਚਤਮ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"ਉੱਚ\n"
+"ਸਧਾਰਨ\n"
+"ਘੱਟ\n"
+"ਨਾ-ਪ੍ਰਭਾਸਿਤ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "ਨਿਊਨਤਮ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "ਸਧਾਰਨ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"ਸ਼ੁਰੂ ਨਹੀਂ\n"
+"ਜਾਰੀ ਹੈ\n"
+"ਪੂਰਾ ਕੀਤਾ\n"
+"ਰੱਦ ਕੀਤਾ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "ਫੀ-ਸਦੀ ਪੂਰਾ(_e):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "ਹਾਲਤ(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "ਸੰਪੂਰਨ ਮਿਤੀ(_D):"
@@ -7129,7 +5848,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "ਕੰਮ ਦੇ ਹਾਲਤ ਵੇਰਵੇ ਲਈ ਤਬਦੀਲ ਲਈ ਦਬਾਓ"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "ਭੇਜਣ ਚੋਣ(_S)"
 
@@ -7141,19 +5860,29 @@ msgstr "ਕੰਮ(_T)"
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "ਟਾਸਕ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਚੁਣੀ ਟਾਸਕ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੀ ਹੈ"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "ਟਾਸਕ ਪੂਰੀ ਤਰ੍ਹਾਂ ਸੋਧੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਕਿਉਂਕਿ ਤੁਸੀਂ ਪਰਬੰਧਕ ਨਹੀਂ ਹੈ"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧਕ(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
+msgstr "'%s' ਵਿੱਚ ਟਾਸਕ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -7245,82 +5974,169 @@ msgstr "%s, %s ਤੇ"
 #: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr "ਅਣਪਛਾਤੀ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
+msgstr "ਅਣਜਾਣ ਤਬਦੀਲੀ ਕਿਸਮ ਲਈ  %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#| msgid "Import"
+msgid "I_mport"
+msgstr "ਇੰਪੋਰਟ(_m)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#| msgid "Select Calendar"
+msgid "Select a Calendar"
+msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#| msgid "Select Task List"
+msgid "Select a Task List"
+msgstr "ਕੰਮ ਲਿਸਟ ਚੁਣੋ"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇੰਪੋਰਟ ਕਰੋ(_m)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "ਕੰਮ ਇੰਪੋਰਟ(_m)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "ਬਿਨਾਂ ਨਾਂ"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ਵੈਬ ਸਫਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ਸੰਖੇਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "ਮਿਆਦ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "ਸਥਿਤੀ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ਸ਼ੁਰੂ ਨਹੀਂ ਹੈ"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "ਉਚਤਮ"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ਸਧਾਰਨ"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ਨਿਊਨਤਮ"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "ਬਣਾਇਆ"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#| msgid "Modified"
+msgid "Last modified"
+msgstr "ਆਖਰੀ ਸੋਧ"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ਸ਼ੁਰੂ ਮਿਤੀ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "ਵੇਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7330,225 +6146,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../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:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "ਆਵਿਰਤੀ"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "ਨੱਥੀ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "ਬਿਨ_ਨਾਂ_ਚਿੱਤਰ.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਉ(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ਨਾਲ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* ਸੰਖੇਪ ਨਹੀਂ *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "ਸ਼ੁਰੂ:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "ਬਾਕੀ:"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "੦%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "੧੦%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "੨੦%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "੩੦%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "੪੦%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "੫੦%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "੬੦%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "੭੦%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "੮੦%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "੯੦%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "੧੦੦%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "ਨਵਾਂ ਕੰਮ(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "ਵੈੱਬ ਸਫਾ ਖੋਲੋ(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "ਇੰਝ ਸੰਭਾਲੋ(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../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:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ਚੇਪੋ(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ਕੰਮ ਜਾਰੀ ਕਰੋ(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪੂਰਾ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ਚੁਣੇ ਕੰਮ ਪੂਰੇ ਹੋਏ ਨਿਰਧਾਰਿਤ ਕਰੋ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪੂਰਾ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ਚੁਣੇ ਕੰਮ ਨਾ-ਪੂਰੇ ਹੋਇਆ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "ਚੁਣੇ ਕੰਮ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ਕੰਮ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -7566,167 +6357,167 @@ msgstr "ਮੁਕੰਮਲ"
 msgid "Completion date"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "ਮਿਆਦ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ਸਥਿਤੀ"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "ਆਈਟਮਾਂ ਭੇਜੋ"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "ਆਈਟਮਾਂ ਦੀ ਕਾਪੀ ਜਾਰੀ"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "ਨਵੀਂ ਮੁਲਾਕਾਤ(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "ਨਵੀਂ ਸਾਰੇ ਦਿਨ ਦੀ ਮੁਲਾਕਾਤ(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "ਨਵੀਂ ਮੀਟਿੰਗ(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "ਅੱਜ ਚੁਣੋ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "ਮਿਤੀ ਚੁਣੋ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਨਕਲ(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਭੇਜੋ(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "ਪ੍ਰਤੀਨਿਧ ਮੀਟਿੰਗ(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "ਮੀਟਿੰਗ ਨਿਯਤ ਸਮਾਂ(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾਂਗ ਅੱਗੇ ਭੇਜੋ(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "ਜਵਾਬ(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਨੂੰ ਚੱਲ ਬਣਾਓ(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "ਇਹ ਮੌਜੂਦਗੀ ਹਟਾਓ(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:2480
 #, 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:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 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:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7740,12 +6531,12 @@ msgstr ""
 #. * 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:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰਟ ਵੰਡ"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 
@@ -7755,48 +6546,48 @@ msgstr "ਦੂਜਾ ਸਮਾਂ ਖੇਤਰ ਵੇਖੋ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 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:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "ਸਵੇਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾਂ (ਗੁੰਝਲਦਾਰ ਆਵਰਤੀ)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7804,35 +6595,35 @@ msgstr[0] "ਹਰ ਹਫਤੇ"
 msgstr[1] "ਹਰ %d ਹਫਤੇ"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " ਅਤੇ "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱਚੋਂ"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹੀਨੇ"
 msgstr[1] "ਮਹੀਨੇ ਵਿੱਚ %d ਵਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7840,37 +6631,37 @@ msgstr[0] "ਕੁੱਲ %d ਵਾਰ"
 msgstr[1] "ਕੁੱਲ %d ਵਾਰ "
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", ਤੇ ਸਮਾਪਤੀ"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "ਸ਼ੁਰੂ"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "ਬਕਾਇਆ"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar ਗਲਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7882,283 +6673,283 @@ msgstr "ਅਣਜਾਣਾ ਵਿਅਕਤੀ"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਤੇ ਮੁੜ ਵਿਚਾਰ ਕਰੋ ਅਤੇ ਮੇਨੂ ਤੋਂ ਤੱਦ ਕੋਈ ਕਾਰਵਾਈ ਚੁਣੋ।"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ ਤੁਹਾਡੀ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਲੱਭ ਸਕਦਾ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "ਮੀਟਿੰਗ ਬਾਰੇ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, 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:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ਨੇ ਮੀਟਿੰਗ ਵਿੱਚ ਤੁਹਾਡੀ ਹਾਜਰੀ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "ਮੀਟਿੰਗ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> ਇੱਕ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵਿਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ਨਵੀਂ ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "ਮੀਟਿੰਗ ਅੱਪਡੇਟ ਮੰਗ"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "ਮੀਟਿੰਗ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਮੀਟਿੰਗ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "ਮੀਟਿੰਗ ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਨਾ ਬੇਸਮਝ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "ਗਲਤ ਮੀਟਿੰਗ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ਨੇ %s ਨੂੰ ਕਾਰਜ ਪੂਰਾ ਕਰਨ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ਤੁਹਾਨੂੰ ਇੱਕ ਕੰਮ ਲਈ ਕਹਿ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "ਕੰਮ ਸੁਝਾਅ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ਨੇ ਇੱਕ ਜਾਰੀ ਕੰਮ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣ ਦੀ ਇੱਛਾ ਜਤਾਈ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ਤਾਜੀ ਕੰਮ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨੀ ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "ਕੰਮ ਅੱਪਡੇਟ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ਨੇ ਜਾਰੀ ਕੰਮ ਲਈ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "ਕੰਮ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨੇ ਕੰਮ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "ਕੰਮ ਰੱਦੀਕਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "ਗਲਤ ਕੰਮ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ਨੇ ਤੁਹਾਡੀ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਲਈ ਬੇਨਤੀ ਭੇਜੀ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਬੇਨਤੀ"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ਨੇ ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਜਵਾਬ ਭੇਜਿਆ ਹੈ।"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "ਗਲਤ ਵੇਹਲਾ/ਰੁਝਿਆ ਸੁਨੇਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "ਸੁਨੇਹਾ ਆਪਣੇ ਸਹੀਂ ਸਰੂਪ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਨਾ-ਸਹਾਇਕ ਬੇਨਤੀਆਂ ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਇੱਕ ਜਾਇਜ ਕੈਲੰਡਰ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥੀ ਵਿੱਚ ਕੋਈ ਵੀ ਵੇਖਣਯੋਗ ਕੈਲੰਡਰ ਇਕਾਈ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "ਨਵੀਨੀਕਰਮ ਪੂਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ਇਕਾਈ ਗਲਤ ਹੈ ਅਤੇ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ਇਹ ਜਵਾਬ ਇੱਕ ਦਰਸ਼ਕ ਵਲੋਂ ਨਹੀਂ ਹੈ। ਕੀ ਇੱਕ ਦਰਸ਼ਕ ਵਾਂਗ ਸ਼ਾਮਿਲ ਕਰਨਾ ਹੈ?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ਗਲਤ ਹਾਲਤ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਕਾਈ ਹੁਣ ਉਪਲੱਬਧ ਨਹੀਂ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "ਇਕਾਈ ਭੇਜੀ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr " ਇਕਾਈ ਨੂੰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "ਕਾਰਵਾਈ ਚੁਣੋ"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "ਜਵਾਬ ਦੇਣ ਵਾਲਿਆਂ ਦੀ ਹਾਲਤ ਅੱਪਡੇਟ"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "ਤਾਜ਼ੀ ਜਾਣਕਾਰੀ ਭੇਜੋ"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
@@ -8182,6 +6973,10 @@ msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Loading calendar..."
 msgstr "ਕੈਲੰਡਰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "ਪ੍ਰਬੰਧਕ:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "ਸਰਵਰ ਸੁਨੇਹਾ:"
@@ -8202,77 +6997,73 @@ msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 msgid "Resources"
 msgstr "ਸਰੋਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "ਦਰਸ਼ਕ"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "ਲੋੜੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8280,78 +7071,78 @@ 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤੋਂ ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "ਦਰਸ਼ਕ(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "ਚੋਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ ਕੰਮ-ਘੰਟੇ ਹੀ ਵੇਖਾਉ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "ਆਕਾਰ ਵੱਡਾ ਵੇਖਾਓ(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਅੱਪਡੇਟ(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "ਸਵੈ-ਚੋਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਸਰੋਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿਅਕਤੀ ਤੇ ਇੱਕ ਸਰੋਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "ਲੋੜੀਦੇ ਵਿਅਕਤੀ(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "ਲੋੜੀਦੇ ਲੋਕ ਤੇ ਇੱਕ ਸਰੋਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ(_E):"
 
@@ -8379,15 +7170,15 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮੈਂਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "ਚੁਣੇ ਮੀਮੋ ਹਟਾਓ(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8396,37 +7187,37 @@ msgstr ""
 "%s ਤੇ ਗਲਤੀ:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "ਚੁਣੀਆਂ ਆਈਟਮਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ"
 
@@ -8436,128 +7227,108 @@ 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "ਝਲਕ ਸੋਧ(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "ਸੋਧ ਝਲਕ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ਉੱਤੇ ਮੁਲਾਕਾਤ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਲੋਡ ਕਰੋ"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "%s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "ਸੋਧਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "ਅਪਰੈਲ"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "ਅਗਸਤ"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "ਦਸੰਬਰ"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "ਫਰਵਰੀ"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "ਜਨਵਰੀ"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "ਜੁਲਾਈ"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "ਜੂਨ"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "ਮਾਰਚ"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "ਮਈ"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "ਨਵੰਬਰ"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "ਅਕਤੂਬਰ"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"ਜਨਵਰੀ\n"
+"ਫਰਵਰੀ\n"
+"ਮਾਰਚ\n"
+"ਅਪਰੈਲ\n"
+"ਮਈ\n"
+"ਜੂਨ\n"
+"ਜੁਲਾਈ\n"
+"ਅਗਸਤ\n"
+"ਸਤੰਬਰ\n"
+"ਅਕਤੂਬਰ\n"
+"ਨਵੰਬਰ\n"
+"ਦਸੰਬਰ"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "ਮਿਤੀ ਚੁਣੋ"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "ਸਤੰਬਰ"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "ਅੱਜ ਚੁਣੋ(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "ਘਟਨਾ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
@@ -8565,7 +7336,7 @@ msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨਜ਼ੂਰ"
@@ -8574,7 +7345,7 @@ msgstr "ਮਨਜ਼ੂਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
@@ -8586,7 +7357,7 @@ msgstr "ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ਇਨਕਾਰ"
@@ -8595,7 +7366,7 @@ msgstr "ਇਨਕਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
@@ -8603,7 +7374,7 @@ msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵੀਨ"
@@ -8611,7 +7382,7 @@ msgstr "ਨਵੀਨ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
@@ -8619,7 +7390,7 @@ msgstr "ਰੱਦ ਕਰੋ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
@@ -8627,99 +7398,99 @@ msgstr "ਮੁੜ-ਤਾਜ਼ਾ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ਉਲਟ ਸੁਝਾਅ"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ ਜਾਣਕਾਰੀ (%s ਤੋਂ %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar ਜਾਣਕਾਰੀ"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾਗਮ ਲਈ ਤੁਸੀਂ ਦਰਸ਼ਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹੋ"
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਲਿਸਟ(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮੀਮੋ"
 msgstr[1] "%d ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d ਚੁਣਿਆ"
 msgstr[1] ", %d ਚੁਣੇ"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "ਮੀਮੋ ਅੱਪਗਰੇਡ ਅਸਫ਼ਲ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ਮੀਟਿੰਗ ਅਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਮੀਮੋ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "ਮੀਮੋ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "ਮੀਮੋ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "ਨਵਾਂ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮੀਮੋ(_o)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਮੀਮੋ ਇਕਾਈ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਮੀਮੋ"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "ਸਾਂਝਾ ਮੀਮੋ(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "ਇੱਕ ਨਵਾਂ ਸਾਂਝਾ ਮੀਮੋ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "ਨਵਾਂ ਮੀਮੋ ਲਿਸਟ"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "ਮੀਮੋ ਲਿਸਟ(_s)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "ਨਵੀਂ ਮੀਮੋ ਸੂਚੀ ਬਣਾਓ"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "ਮੀਮੋ ਪਰਿੰਟ ਕਰੋ"
 
@@ -8747,299 +7518,291 @@ msgstr ""
 
 #  FIXME: set proper domain/code
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb ਤੋਂ ਪੁਰਾਣੇ ਸੈਟਿੰਗ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ਕੈਲੰਡਰ `%s' ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਮਾਈਗਰੇਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "ਨੋਟ"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "੧ਲਾਂ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "੨ਜਾ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "੩ਜਾ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "੧੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "੧੧ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "੧੨ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "੧੩ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "੧੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "੧੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "੧੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "੧੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "੧੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "੧੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "੨੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "੨੧ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "੨੨ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "੨੩ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "੨੪ਵਾਂ"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "੨੫ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "੨੬ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "੨੭ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "੨੮ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "੨੯ਵਾਂ"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "੩੦ਵਾਂ"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "੩੧ਵਾਂ"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "ਐਤ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ਸੋਮ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "ਮੰਗਲ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ਬੁੱਧ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "ਵੀਰ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "ਸ਼ੁੱਕਰ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "ਸ਼ਨਿਚੱਰ"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "ਮੁਲਾਕਾਤ"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "ਟਾਸਕ"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰਖੇਪ: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "ਦਰਸ਼ਕ:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਪੂਰਾ: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "ਕੈਟਾਗਰੀ: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "ਸੰਪਰਕ: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "ਨਵੀਂ ਕੰਮ ਲਿਸਟ(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ਕੰਮ"
 msgstr[1] "%d ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "ਕੰਮ ਅੱਪਗਰੇਡ ਅਸਫਲ ਹੈ।"
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ਮੀਟਿੰਗ ਤੇ ਘਟਨਾ ਤਿਆਰ ਕਰਨ ਲਈ ਕਾਰਜ ਸੂਚੀ '%s' ਖੋਲਣ ਤੋਂ ਅਸਫਲ"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "ਕੰਮ ਬਣਾਉਣ ਲਈ ਕੋਈ ਕੈਲੰਡਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "ਕੰਮ ਸਰੋਤ ਚੋਣਕਾਰ"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "ਨਵਾਂ ਕੰਮ"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "ਕੰਮ(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਦਿਓ"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ ਕੰਮ(_d)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "ਨਵਾਂ ਕੰਮ ਬਣਾਓ"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ "
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "ਕੰਮ ਲਿਸਟ(_k)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "ਨਵੀਂ ਕੰਮ ਸੂਚੀ ਬਣਾਉ"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9051,11 +7814,11 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇਹਨਾਂ ਕੰਮਾਂ ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਪੁੱਛੋ।"
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "ਕੰਮ ਪਰਿੰਟ ਕਰੋ"
 
@@ -9072,11 +7835,11 @@ msgstr "ਰੱਦ ਕੀਤਾ"
 msgid "In progress"
 msgstr "ਤਰੱਕੀ ਵਿੱਚ ਹੈ"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "ਤੋ ਜਿਆਦਾ ਹੈ"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "ਤੋ ਘੱਟ ਹੈ"
 
@@ -9084,37 +7847,37 @@ msgstr "ਤੋ ਘੱਟ ਹੈ"
 msgid "Appointments and Meetings"
 msgstr "ਮੁਲਾਕਾਤ ਅਤੇ ਮੀਟਿੰਗ"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾਇਲਾਂ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ਫਾਇਲਾਂ (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੀ-ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੁਸ਼ਲ ਕੈਲੰਡਰ ਆਯਾਤਕਾਰ"
 
@@ -10670,217 +9433,192 @@ msgstr "ਪ੍ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ੍ਰਸ਼ਾਤ/ਯਾਪੀ"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "ਆਟੋ-ਸੰਭਾਲੀ ਫਾਈਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "ਸੰਪਾਦਕ ਤੋਂ ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "ਨੱਥੀ ਸ਼ਾਮਲ"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "ਨੱਥੀ(_t)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "ਗ਼ੈਰ-ਟਾਇਟਲ ਸੁਨੇਹਾ"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਬੰਦ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ਪਰਿੰਟ ਕਰੋ(_P)..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "ਛਪਾਈ ਝਲਕ(_v)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "ਮੌਜੂਦਾ ਫਾਇਲ ਨੂੰ ਵੱਖਰੇ ਨਾਂ ਨਾਲ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "ਭੇਜੋ(_e)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜੋ"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "ਨਵੀਂ ਸੁਨੇਹਾ ਵਿੰਡੋ ਖੋਲ੍ਹੋ"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "ਸੁਰੱਖਿਆ(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP ਇੰਕ੍ਰਿਪਟ(_E)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਨੂੰ PGP ਨਾਲ ਇੰਕ੍ਰਿਪਟ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤਖਤ(_S)"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "ਆਪਣੀ PGP ਕੀ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "ਦਰਜਾ ਸੁਨੇਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "ਸੁਨੇਹੇ ਦਾ ਦਰਜਾ ਵਧਾਓ"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "ਪੜ੍ਹਨ ਰਸੀਦ ਦੀ ਮੰਗ(_q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "ਜਦੋਂ ਤੁਹਾਡਾ ਸੁਨੇਹਾ ਪੜਿਆ ਜਾਵੇ ਤਾਂ ਪ੍ਰਾਪਤੀ ਸੂਚਨਾ ਲਵੋ"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ਇੰਕ੍ਰਿਪਟ(_C)"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਆਪਣੇ S/MIME ਇਕਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਕਰਿਪਟ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾਇਨ(_n)"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ਆਪਣੇ S/MIME ਦਸਤਖਤ ਸਰਟੀਫਿਕੇਟ ਨਾਲ ਇਸ ਸੁਨੇਹੇ ਤੇ ਦਸਤਖਤ ਕਰੋ"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Bcc ਖੇਤਰ"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ BCC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Cc ਖੇਤਰ"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ CC ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "ਵੱਲੋਂ ਖੇਤਰ(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲੋਂ ਚੋਣਕਾਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "ਜਵਾਬ ਖੇਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਜਵਾਬ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ਵਿਸ਼ਾ ਖੇਤਰ(_S)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "ਬਦਲੋ ਕਿ ਕੀ ਵਿਸ਼ਾ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "ਵੱਲ ਖੇਤਰ(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "ਵੇਖੋ"
+
+#: ../composer/e-composer-header.c:123
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "ਓਹਲੇ"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਭਰੋ"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ਉਹ ਸਿਰਨਾਵੀਂ ਦਿਓ, ਜੋ ਕਿ ਸੁਨੇਹੇ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੇ"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10889,40 +9627,54 @@ msgstr ""
 "ਐਡਰੈੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "ਵਲੋਂ(_o):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "ਵਲੋਂ"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "ਜਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #  * Post-To
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "ਭੇਜੋ(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
@@ -10938,37 +9690,26 @@ msgstr "ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 msgid "Click here to select folders to post to"
 msgstr "ਭੇਜਣ ਲਈ ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
+#: ../composer/e-composer-private.c:208
+#| msgid "Save Draft"
+msgid "Save draft"
+msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰੀ ਸੁਨੇਹੇ ਲਈ ਦਸਤਖਤ ਨਹੀ ਕੀਤੇ ਜਾ ਸਕਦੇ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਅਕਾਊਂਟ ਲਈ ਕੋਈ ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ਨੱਥੀ"
-msgstr[1] "ਨੱਥੀ"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4114
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11136,7 +9877,7 @@ msgstr "ਡਰਾਫਟ ਸੰਭਾਲੋ(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
 
@@ -11152,6 +9893,44 @@ msgstr "ਐਡਰਸ ਕਾਰਡ"
 msgid "calendar information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "ਅੱਜ"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "ਕੱਲ੍ਹ"
+
+#: ../e-util/e-datetime-format.c:202
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "ਕੱਲ੍ਹ"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "ਹੁਣ ਤੋਂ %d ਦਿਨ"
+
+#: ../e-util/e-datetime-format.c:207, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
+msgid "%d days ago"
+msgstr "%d ਦਿਨ ਪਹਿਲਾਂ"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#| msgid "_Use system defaults"
+msgid "Use locale default"
+msgstr "ਲੋਕੇਲ ਡਿਫਾਲਟ ਵਰਤੋਂ"
+
+#: ../e-util/e-datetime-format.c:494
+#| msgid "Format"
+msgid "Format:"
+msgstr "ਫਾਰਮੈਟ:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਗਲਤੀ"
@@ -11170,7 +9949,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਸਵਾਲ"
 
 #  setup a dummy error
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ, ਅਣਜਾਣ ਗਲਤੀ '%s' ਬੇਨਤੀ"
@@ -11183,67 +9962,67 @@ msgstr "ਭਾਗ"
 msgid "Name of the component being logged"
 msgstr "ਲਾਗ ਰੱਖਣ ਵਾਲੇ ਭਾਗ ਦਾ ਨਾਂ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "ਡੀਬੱਗ ਲਾਗ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "ਹਾਲਤ ਪੱਟੀ ਵਿੱਚ ਗਲਤੀਆਂ ਵੇਖੋ(_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "ਸਕਿੰਟ।"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "ਲਾਗ ਸੁਨੇਹੇ:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "ਲਾਗ ਲੈਵਲ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ਸੁਨੇਹੇ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "ਗਲਤੀਆਂ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਗਲਤੀਆਂ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "ਗਲਤੀਆਂ, ਚੇਤਾਵਨੀਆਂ ਅਤੇ ਡੀਬੱਗ ਸੁਨੇਹੇ"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
@@ -11263,6 +10042,10 @@ msgstr "ਪਰਿਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ �
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰਟਿੰਗ ਸਿਸਟਮ ਨੇ ਗਲਤੀ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਨਹੀਂ ਦਿੱਤੀ ਹੈ।"
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "ਸਵੈ-ਨਿਰਮਤ"
+
 #  mail-composer:attach-nomessages secondary
 #  mail-composer:no-sig-file secondary
 #  mail:no-create-tmp-path secondary
@@ -11297,245 +10080,245 @@ msgstr "ਉੱਪਰ ਲ਼ਿਖੋ?"
 msgid "_Overwrite"
 msgstr "ਉੱਤੇ ਲਿਖੋ(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "ਸਬੰਧ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਲਈ ਮੱਦਦ ਵੇਖਾਈ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "ਖਾਸ(_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "ਕੰਮ(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "ਨਿੱਜੀ(_P)"
 
 #  forest green
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "ਕਰਨ ਲਈ(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "ਬਾਅਦ 'ਚ(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "ਲੇਬਲ ਨਾਂ(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "ਲੇਬਲ ਸੋਧ"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "ਲੇਬਲ ਸ਼ਾਮਲ"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "ਲੇਬਲ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਲੇਬਲ ਇਸ ਟੈਗ ਨਾਲ ਮੌਜੂਦ ਹੈ। ਆਪਣਾ ਲੇਬਲ ਨਾਂ ਬਦਲੋ ਜੀ।"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf ਗਲਤੀ: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "ਹੋਰ ਬਾਕੀ ਸਭ ਗਲਤੀਆਂ ਕੇਵਲ ਟਰਮੀਨਲ ਉੱਤੇ ਹੀ ਵੇਖੋ।"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸਕਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਸਕਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਕਿੰਟ"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਮਿੰਟ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਿੰਟ"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ ੧ ਘੰਟਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨ ਵਿੱਚ %d ਘੰਟੇ"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ੧ ਦਿਨ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਦਿਨ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ ੧ ਹਫ਼ਤਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ ਦਿਨਾਂ ਵਿੱਚ %d ਹਫ਼ਤੇ"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਮਹੀਨਾ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਮਹੀਨੇ"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾਂ"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ਆਉਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "ਆਉਣ ਵਾਲੇ %d ਸਾਲ"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤੀ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "ਹੁਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "ਮੇਲ ਕਰਨ ਲਈ ਸਮਾਂ ਚੁਣੋ"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ਜਾਂਚ"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾਂ(_u):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "ਆਈਟਮਾਂ ਲੱਭੋ, ਜੋ ਕਿ ਹੇਠ ਦਿੱਤੀ ਸੀਮਾਵਾਂ ਨੂੰ ਪੂਰੀ ਕਰਦੀ ਹੋਵੇ"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "ਜੇਕਰ ਸਭ ਸੀਮਾ ਮੇਲ ਖਾਣ ਤਾਂ"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "ਜੇਕਰ ਕੋਈ ਵੀ ਸੀਮਾ ਮੇਲ ਖਾਵੇ"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "ਇਕਾਈ ਖੋਜ(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "ਜਵਾਬ"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "ਜਵਾਬ ਤੇ ਮੁੱਢਲੇ"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "ਕੋਈ ਜਵਾਬ ਜਾਂ ਮੁੱਢਲਾ ਨਹੀਂ"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "ਆ ਰਹੇ"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ਬਾਹਰੀ"
 
@@ -11624,54 +10407,52 @@ msgstr ""
 " ਨਾਲ ਮਿਲਾਇਆ ਜਾਵੇਗਾ।"
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "ਮੌਜੂਦਾ ਸਮੇਂ ਦੇ ਅਨੁਸਾਰੀ ਸਮਾਂ"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "ਪਹਿਲਾਂ"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "ਭਵਿੱਚ ਵਿੱਚ"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "ਮਹੀਨੇ"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ਸਕਿੰਟ"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
+#| msgid "in the future"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ਪਹਿਲਾਂ\n"
+"ਭਵਿੱਖ ਵਿੱਚ"
+
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"ਸਕਿੰਟ\n"
+"ਮਿੰਟ "
+"ਘੰਟੇ\n"
+"ਦਿਨ\n"
+"ਹਫ਼ਤੇ\n"
+"ਮਹੀਨੇ\n"
+"ਸਾਲ"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "ਸਮਾਂ ਜੋ ਤੁਸੀਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਹੈ"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "ਹਫਤੇ"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "ਸਾਲ"
+#| msgid "a time relative to the current time"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"ਮੌਜੂਦਾ ਸਮਾਂ\n"
+"ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਸਮਾਂ\n"
+"ਮੌਜੂਦਾ ਸਮੇਂ ਦੇ ਅਨੁਸਾਰ ਸਮਾਂ"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ਜੋੜ੍ਹੋ"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸੋਧ"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "ਨਿਯਮ ਨਾਂ"
 
@@ -11701,7 +10482,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਸੰਦ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਅਕਾਊਂਟ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
@@ -11713,7 +10494,7 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ ਸੰਰਚਨਾ ਸੰਦ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਲੇਖਣ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
@@ -11723,21 +10504,21 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਪਸੰਦ ਕੰਟਰੋਲ"
 msgid "Evolution Network configuration control"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ ਕੰਟਰੋਲ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ਅਕਾਊਂਟ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
@@ -11746,16 +10527,121 @@ msgid "Network Preferences"
 msgstr "ਨੈੱਟਵਰਕ ਪਸੰਦ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "ਅੱਗੇ ਭੇਜੋ(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334, c-format
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "%d attached messages"
+msgstr "%d ਸੁਨੇਹੇ ਅਟੈਚ ਕੀਤੇ"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ਅਟੈਚਮੈਂਟ"
+msgstr[1] "ਅਟੈਚਮੈਂਟ"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+#| msgid "Month View"
+msgid "Icon View"
+msgstr "ਆਈਕਾਨ ਝਲਕ"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+#| msgid "_List View"
+msgid "List View"
+msgstr "ਲਿਸਟ ਝਲਕ"
+
+#  message-search popup match count string
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "ਮਿਲਦਾ: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#| msgid "Close this window"
+msgid "Close the find bar"
+msgstr "ਇਹ ਪੱਟੀ ਬੰਦ ਕਰੋ"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "ਖੋਜ(_d):"
+
+#: ../mail/e-mail-search-bar.c:540
+#| msgid "Always search"
+msgid "Clear the search"
+msgstr "ਖੋਜ ਸਾਫ਼ ਕਰੋ"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "ਪਿੱਛੇ(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "ਸ਼ਬਦ ਦੀ ਪਿਛਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "ਅੱਗੇ(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "ਸ਼ਬਦ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ"
+
+#: ../mail/e-mail-search-bar.c:587
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦੇ ਸਭ(_c)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "ਪੇਜ਼ ਦੇ ਅੰਤ ਉੱਤੇ ਪੁੱਜੇ, ਉੱਤੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "ਪੇਜ਼ ਦੇ ਉੱਤੇ ਪੁੱਜੇ, ਹੇਠਾਂ ਤੋਂ ਫੇਰ ਜਾਰੀ"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11768,106 +10654,110 @@ msgstr ""
 "ਜੋ ਕਿ %s ਲਈ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ\n"
 "ਅਤੇ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਜਾਂਚ ਬਕਸੇ ਤੇ ਕਲਿੱਕ ਕਰੋ\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "ਸਵੈ-ਨਿਰਮਤ"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "ਕਦੇ ਨਹੀਂ"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "ਹਮੇਸ਼ਾ"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "ਈ-ਮੇਲ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਚੈੱਕ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "ਮਿੰਟ(_t)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "ਈ-ਮੇਲ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "ਸੁਰੱਖਿਆ"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਅਕਾਊਂਟ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਸਹਾਇਕ"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[ਮੂਲ]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "ਅਕਾਊਂਟ ਨਾਂ"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "ਬੇ-ਨਾਂ"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "ਕੋਈ ਟਿਕਾਣਾ ਐਡਰੈੱਸ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ,  ਸੁਨੇਹੇ ਲਈ ਅੱਗੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ।"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ਵਰਤਣ ਲਈ ਕੋਈ ਅਕਾਊਂਟ ਨਹੀਂ ਲੱਭਿਆ, ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜਣ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"
 
@@ -11890,7 +10780,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "--------ਅਸਲੀ ਸੁਨੇਹਾ--------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ(_F)"
 
@@ -11908,18 +10798,10 @@ msgstr "ਰੰਗ ਦਿਓ"
 msgid "Assign Score"
 msgstr "ਸਕੋਰ ਦਿਓ"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "ਆਵਾਜ਼"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "ਸਮਾਪਤ "
@@ -11937,7 +10819,7 @@ msgid "Date sent"
 msgstr "ਭੇਜਣ ਮਿਤੀ"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../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
@@ -11988,226 +10870,236 @@ msgstr "ਸਮੀਕਰਨ"
 msgid "Follow Up"
 msgstr "ਪਿੱਛੇ ਜਾਓ"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#| msgid "Forward"
+msgid "Forward to"
+msgstr "ਅੱਗੇ"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
-msgstr "ਲਾਜ਼ਮੀ"
+msgstr "ਖਾਸ"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ਬਾਅਦ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "ਪਹਿਲਾਂ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "ਨਿਸ਼ਾਨ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ਨਾ-ਨਿਸ਼ਾਨ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ਸੈੱਟ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "ਸੈੱਟ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ਜੰਕ"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "ਜੰਕ ਜਾਂਚ"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "ਲੇਬਲ"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "ਮਿਲਦੇ ਸਭ"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "ਸੁਨੇਹਾ ਹੈੱਡਰ"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "ਸੁਨੇਹਾ ਰੱਦੀ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "ਸੁਨੇਹਾ ਰੱਦੀ ਨਹੀ ਹੈ"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+#| msgid "Message contains"
+msgid "Message Location"
+msgstr "ਸੁਨੇਹਾ ਟਿਕਾਣਾ"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
-msgstr "ਕਾਰਜ ਨਾਲ ਸ਼ਾਮਿਲ"
+msgstr "ਪਰੋਗਰਾਮ ਨਾਲ ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "ਅਵਾਜ਼ ਚਲਾਓ"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "ਪੜ੍ਹੋ"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex ਮੇਲ"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "ਜਵਾਬ ਭੇਜਿਆ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "ਵਾਪਸ"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "ਜਿਆਦਾ ਵਾਪਿਸ ਕਰੇ"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "ਘੱਟ ਵਾਪਿਸ ਕਰੇ"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "ਕਾਰਜ ਚਲਾਓ"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ਸਕੋਰ"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "ਭੇਜਣ ਵਾਲਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "ਲੇਬਲ ਸੈੱਟ"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "ਆਕਾਰ (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "ਆਵਾਜ਼ ਹੋਵੇ"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "ਸਰੋਤ ਅਕਾਊਂਟ"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "ਖਾਸ ਹੈੱਡਰ"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "ਇਸ ਨਾਲ ਸ਼ੁਰੂ"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "ਕਾਰਵਾਈ ਰੋਕੋ"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ਸਥਿਤੀ ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "ਐਕਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "ਖੋਜ ਤੋਂ ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_r)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "ਬਿਨ-ਲੇਬਲ"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "ਪੜ੍ਹੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "ਤਾਜ਼ੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "ਆਖਰੀ ੫ ਦਿਨਾਂ ਦੇ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "ਨੱਥੀ ਸਮੇਤ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "ਖਾਸ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "ਨਾ-ਜੰਕ ਸੁਨੇਹੇ"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "ਅਕਾਊਂਟ ਖੋਜ"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "ਸਭ ਅਕਾਊਂਟ ਖੋਜ"
 
@@ -12237,11 +11129,11 @@ msgid "Quota usage"
 msgstr "ਕੋਟਾ ਵਰਤੋਂ"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
@@ -12254,291 +11146,292 @@ msgstr "ਫੋਲਡਰ ਵਿਸ਼ੇਸਤਾ"
 msgid "<click here to select a folder>"
 msgstr "<ਫੋਲਡਰ ਚੁਣਨ ਲਈ ਇਥੇ ਕਲਿੱਕ ਕਰੋ>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "ਫੋਲਡਰ ਨਾਂ(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "ਡਰਾਫਟ"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "ਟੈਪਲੇਟ"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "ਬਾਹਰੀ-ਬਕਸਾ"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "ਭੇਜੇ"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:318, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫੋਲਡਰ %s ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫੋਲਡਰ %s ਦੀ ਕਾਪੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ %s ਫੋਲਡਰ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ %s ਵਿੱਚ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ਉੱਪਰੀ ਸੰਭਾਲ ਤੋਂ ਸੁਨੇਹਾ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "ਭੇਜੋ(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱਚ ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "ਨਵੇਂ ਝਰੋਖੇ ਵਿੱਚ ਖੋਲ੍ਹੋ(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "ਆਉਟਬਾਕਸ ਫਲੱਸ਼(_u)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਅਣ-ਪੜ੍ਹਿਆ(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ਨੂੰ `%s' ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ਨਕਲ(_o)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "ਫੋਲਡਰ `%s' ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਫੋਲਡਰ ਕਿੱਥੇ ਬਣਾਇਆ ਜਾਵੇ:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ਮੇਲ ਹਟਾਉਣਾ ਫੇਲ੍ਹ"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ਇਹ ਪੱਤਰ ਹਟਾਉਣ ਲਈ ਤੁਹਾਨੂੰ ਲੋੜੀਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "ਅੱਗੇ ਭੇਜੋ(_F)"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ਨਾ-ਹਟਾਏ(_n)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ਪੜ੍ਹੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_k)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "ਖਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ਨਾ-ਖਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾਓ(_i)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ਰੱਦੀ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦੀ ਨਹੀਂ ਦਾ ਨਿਸ਼ਾਨ ਲਗਾਓ(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱਛਾ ਖੋਜ ਲਈ ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ਲੇਬਲ(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "ਕੋਈ ਨਹੀਂ(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ਨਵਾਂ ਲੇਬਲ(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "ਸੁਨੇਹੇ ਤੋਂ ਨਿਯਮ ਬਣਾਓ"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "ਵਿਸ਼ੇ ਤੋਂ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_n)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "ਸਿਰਨਾਵੀਂ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਖੋਜ ਫੋਲਡਰ(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "ਵਿਸ਼ੇ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_j)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ਭੇਜਣ ਵਾਲਿਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_d)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ਸੁਨੇਹੀਆਂ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_c)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ(_M)"
 
@@ -12546,140 +11439,108 @@ msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿ�
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "ਕਾਲ ਕਰੋ(_a)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "ਇਸ ਐਡਰੈੱਸ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "ਐਡਰੈੱਸ ਓਹਲੇ/ਵੇਖਾਉਣ ਲਈ ਦਬਾਓ"
 
-#  message-search popup match count string
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "ਮਿਲਦਾ: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "ਖੋਜ(_d):"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "ਪਿੱਛੇ(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "ਅੱਗੇ(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "ਮਿਲਦੇ ਸਭ(_a)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਦਸਤਖਤ ਨਾਲ ਨਹੀਂ ਹੈ। ਇਸ ਦੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਕਿ ਇਹ ਸੁਨੇਹਾ ਸਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "ਜਾਇਜ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 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:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "ਗਲਤ ਦਸਤਖਤ"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਹਨ, ਪਰ ਸੰਚਾਰ ਦੌਰਾਨ ਇਹ ਤਬਦੀਲ ਹੋ ਗਏ ਜਾਪਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤਖਤ ਠੀਕ ਹਨ, ਪਰ ਭੇਜਣ ਵਾਲਾ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 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:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤਖਤ ਮੌਜੂਦ ਹਨ, ਪਰ ਪਬਲਿਕ ਕੁੰਜੀ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ਇਸ ਸੁਨੇਹੇ ਦੇ ਦਸਤਖਤ ਤਾਂ ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿਕ ਕੀ ਨਾਲ ਸਬੰਧਿਤ ਨਹੀਂ।"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟਡ ਨਹੀਂ ਹੈ ਇਸ ਦੇ ਕੁਝ ਭਾਗ ਇੰਟਰਨੈੱਟ ਤੇ ਸੰਚਾਰ ਦੌਰਾਨ ਵੇਖੇ ਜਾ ਸਕਦੇ ਹਨ।"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ, ਹਲਕਾ"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 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 "
@@ -12688,21 +11549,21 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
 "ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "ਇੰਕ੍ਰਿਪਟਡ"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 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:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "ਇੰਕ੍ਰਿਪਟ, ਸਖਤ"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12711,341 +11572,306 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹੇ ਇੰਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
 "ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p ਵਜੇ ਸਮਾਪਤ"
+#: ../mail/em-format-html-display.c:980
+#| msgid "Completed On"
+msgid "Completed on"
+msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "ਨੂੰ"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "ਲਾਇਨ 'ਚ ਵੇਖੋ(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
-msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
-
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲੋ"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "ਸਭ ਅਟੈਂਚਮਿੰਟ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
+msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖੋ(_O)"
 
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ਨੱਥੀ(_t)"
-msgstr[1] "%d ਨੱਥੀ(_t)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "ਸੰਭਾਲੋ(_a)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਵੇਖੋ(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮੈਟ ਓਹਲੇ(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ(_p)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇਹ ਈ-ਮੇਲ ਨੂੰ ਰੈਡਰ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਿਨਾਂ ਫਾਰਮੈਟ ਵੇਖ "
-"ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਪਾਠ ਸੰਪਾਦਕ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
+"ਸਕਦੇ ਹੋ ਜਾਂ ਬਾਹਰੀ ਟੈਕਸਟ ਐਡੀਟਰ ਨਾਲ ਵੇਖ ਸਕਦੇ ਹੋ।"
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
-msgstr "%2d ਦਾ %1d ਸਫਾ"
+msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸਫ਼ਾ"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "%s ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "ਅਣਜਾਣ ਬਾਹਰੀ-ਮੁੱਖ ਭਾਗ।"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "ਨਿਕਾਰਾ ਬਾਹਰੀ-ਭਾਗ"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾਇਟ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
+msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸਾਇਟ %s ਦੇ ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr "ਸਥਾਨਕ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
+msgstr "ਲੋਕਲ ਫਾਇਲ (%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮੋਟ ਡਾਟਾ(%s) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ਅਣਜਾਣੇ ਬਾਹਰੀ ਡਾਟਾ (\"%s\" ਕਿਸਮ) ਲਈ ਸੰਕੇਤਕ"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "ਸੁਨੇਹਾ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #  pseudo-header
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "ਮੇਲਰ"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#  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:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ਇਹ ਸੁਨੇਹਾ <b>%s</b> ਵਲੋਂ <b>%s</b> ਦੇ ਤੌਰ ਉੱਤੇ ਭੇਜਿਆ ਗਿਆ ਹੈ"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "ਵਲੋਂ"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "ਫੇਸ"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ S/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸੁਨੇਹਾ MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਸਰੋਤ ਦੇ ਤੌਰ ਤੇ ਹੀ ਵੇਖਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇਕ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਿਸਮ"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸੁਨੇਹਾ PGP/MIME ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "PGP ਸੁਨੇਹਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ਸੁਨੇਹੇ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "ਹਰ ਸਮੇਂ"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "ਹਫ਼ਤੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "ਮਹੀਨੇ ਵਿੱਚ ਇਕਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "ਹੈੱਡਰ ਨਾਂ:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "ਹੈੱਡਰ ਮੁੱਲ ਰੱਖਦਾ ਹੈ:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "ਹੈੱਡਰ"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "ਮੁੱਲ ਰੱਖਦਾ ਹੈ"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "ਰੰਗ"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "ਟੈਗ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਹੈ ਅਤੇ ਬਾਈਨਰੀ ਇੰਸਟਾਲ ਹੈ।"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱਗਇਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਚੈੱਕ ਕਰੋ ਕੀ ਕਿ ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "ਕੋਈ ਜੰਕ ਪਲੱਗਇਨ ਨਹੀਂ ਹੈ"
 
+#: ../mail/em-mailer-prefs.c:1455
+#| msgid "Table header"
+msgid "Date header:"
+msgstr "ਮਿਤੀ ਹੈੱਡਰ:"
+
 #  forest green
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "ਕਰਨ-ਲਈ"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "ਬਾਅਦ ਵਿੱਚ"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "ਤਬਦੀਲ"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ਨਵਾਂ ਫੋਲਡਰ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ਫੋਲਡਰ `%s' ਨੂੰ `%s' ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ਤੇ ਉਪਲੱਬਧ ਪੱਤਰ-ਬਕਸਿਆਂ ਦੀ ਜਾਂਚ ਲਈ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13054,33 +11880,33 @@ msgid ""
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ-ਬਕਸਾ ਫੋਲਡਰ ਦੀ ਸਥਿਤੀ ਤੇ ਲੜੀ ਈਵੇਲੂਸ਼ਨ ੧.੦ ਬਾਅਦ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
+"ਉਡੀਕੋ ਜੀ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਹਾਡੇ ਫੋਲਡਰ ਮਾਈਗਰੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਪੁਰਾਣੇ ਡਾਟੇ `%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖੀ ਡਾਟਾ ਡਾਇਰੈਕਟਰੀ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤੇ ਰੱਖਿਆ ਡਾਟਾ `%s' ਦੀ ਕਾਪੀ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ਲੋਕਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "ਫੋਲਡਰ ਮਾਈਗਰੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13089,104 +11915,121 @@ msgid ""
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ-ਬਕਸਾ ਫੋਲਡਰ ਦਾ ਸੰਖੇਪ ਫਾਰਮੈਟ ਈਵੇਲੂਸ਼ਨ ੨.੨੪ ਬਾਅਦ SQLite ਲਈ ਤਬਦੀਲ ਹੋ ਗਈ ਹੈ।\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਫੋਲਡਰਾਂ ਨੂੰ ਤਬਦੀਲ ਕਰ ਰਹੇ ਹੋ..."
+"ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਤੁਹਾਡੇ ਫੋਲਡਰ ਮਾਈਗਰੇਟ ਹੋਣ ਤੱਕ ਸਬਰ ਰੱਖੋ ਜੀ..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s' ਤੇ ਸਥਾਨਕ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "`%s' ਉੱਤੇ ਲੋਕਲ ਫੋਲਡਰ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 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:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "...ਵਾਂਗ ਸੰਭਾਲੋ"
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "ਬਿਨ_ਨਾਂ_ਚਿੱਤਰ.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਉ(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ(_R)"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
-msgstr "ਸੂਚੀ ਨੂੰ ਜਵਾਬ(_L)"
+msgstr "ਲਿਸਟ ਨੂੰ ਜਵਾਬ(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ 'ਚ ਜੋੜੋ(_A)"
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "%s ਨਾਲ ਖੋਲ੍ਹੋ..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ਇਹ ਭੰਡਾਰ ਮੈਂਬਰ ਲਈ ਸਹਾਈ ਨਹੀਂ ਜਾਂ ਇਹ ਯੋਗ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "ਮਨਜ਼ੂਰ"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "ਫੋਲਡਰ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਸਰਵਰ ਚੁਣੋ।"
+msgstr "ਸਰਵਰ ਚੁਣੋ ਜੀ।"
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "ਕੋਈ ਸਰਵਰ ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
-msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ(_D)।"
+msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖੋ(_D)।"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
-msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ..."
+msgstr "...ਸੁਨੇਹਾ ਸੰਭਾਲੋ"
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "ਐਡਰੈੱਸ ਜੋੜ੍ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹਾ"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸਰੋਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Send and Receive Mail\" window height"
-msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਝਰੋਖਾ ਉਚਾਈ"
+msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਵਿੰਡੋ ਉਚਾਈ"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ਡਾਕ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਝਰੋਖਾ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
+msgstr "\"ਡਾਕ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Send and Receive Mail\" window width"
-msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਝਰੋਖਾ ਚੌੜਾਈ"
+msgstr "\"ਭੇਜੋ ਅਤੇ ਪ੍ਰਾਪਤ ਡਾਕ\" ਵਿੰਡੋ ਚੌੜਾਈ"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
@@ -13327,9 +12170,9 @@ msgid ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"ਪਤਾ ਕਰਦੀ ਹੈ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲੇ ਈਮੇਲ ਲਈ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਖੋਜਣਾ ਹੈ। ਜੇ ਲੱਭਿਆ ਤਾਂ ਇਸ ਸਮਪ ਨਹੀਂ ਹੋਵੇਗਾ। "
-"ਇਹ ਬੁੱਕ ਵਿੱਚ ਲੱਭਦਾ ਹੈ, ਜੋ ਕਿ ਆਟੋ-ਪੂਰਨ ਲਈ ਮਾਰਕ ਹਨ। ਇਸ ਹੌਲੀ ਹੋ ਸਕਦਾ ਹੈ, ਜੇ ਰਿਮੋਟ ਐਡਰੈਸ ਬੁੱਕ "
-"(LDAP ਵਾਂਗ) ਨੂੰ ਆਟੋ-ਪੂਰਨ ਲਈ ਮਾਰਕ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
+"ਪਤਾ ਕਰਦੀ ਹੈ ਕਿ ਕੀ ਭੇਜਣ ਵਾਲੇ ਈਮੇਲ ਲਈ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਖੋਜਣਾ ਹੈ। ਜੇ ਲੱਭਿਆ ਤਾਂ ਇਸ ਸਮਪ ਨਹੀਂ "
+"ਹੋਵੇਗਾ। ਇਹ ਬੁੱਕ ਵਿੱਚ ਲੱਭਦਾ ਹੈ, ਜੋ ਕਿ ਆਟੋ-ਪੂਰਨ ਲਈ ਮਾਰਕ ਹਨ। ਇਸ ਹੌਲੀ ਹੋ ਸਕਦਾ ਹੈ, ਜੇ ਰਿਮੋਟ ਐਡਰੈਸ "
+"ਬੁੱਕ (LDAP ਵਾਂਗ) ਨੂੰ ਆਟੋ-ਪੂਰਨ ਲਈ ਮਾਰਕ ਕੀਤਾ ਗਿਆ ਹੋਵੇ।"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
@@ -13385,76 +12228,90 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੰਦ ਕਰਨ ਸਮੇਂ ਰੱਦੀ ਖਾਲੀ ਕਰੋ।"
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"HTML ਪੱਤਰ ਵਿੱਚ ਐਨੀਮੇਟ ਚਿੱਤਰ ਯੋਗ ਕਰੋ। ਕਈ ਯੂਜ਼ਰ ਐਨੀਮੇਟ ਚਿੱਤਰਾਂ ਨੂੰ ਪਸੰਦ ਨਹੀਂ ਕੀਤੇ ਅਤੇ "
+"ਸਥਿਰ ਚਿੱਤਰ ਹੀ ਪਸੰਦ ਕਰਦੇ ਹਨ।"
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ਕਾਰੀਟ ਮੋਡ ਯੋਗ, ਤਾਂ ਕਿ ਤੁਸੀਂ ਪੱਤਰ ਪੜਨ ਦੌਰਾਨ ਕਰਸਰ ਵੇਖਾ ਸਕੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "ਮੈਜਿਕ ਸਪੇਸ ਬਾਰ ਯੋਗ ਜਾਂ ਆਯੋਗ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+#| msgid "It disables/enables the prompt while marking multiple messages."
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪੁੱਛਣ ਨੂੰ ਯੋਗ/ਆਯੋਗ ਕਰਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "ਅੱਗੇ ਖੋਜ ਫੀਚਰ ਕਿਸਮ ਨੂੰ ਯੋਗ ਜਾਂ ਆਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਖੋਜ ਫੋਲਡਰ ਯੋਗ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼ੁਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ ਹੈ "
-"ਕਿ ਤੁਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ ਚਲੀ ਜਾਵੇ।"
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "ਬਾਹਰੀ ਖੋਜ ਫੀਚਰ ਨੂੰ ਯੋਗ ਕਰੋ, ਜੋ ਕਿ ਫੋਲਡਰ ਨਾਂ ਦੀ ਖੋਜ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "ਇਸ ਨੂੰ ਯੋਗ ਕਰਨ ਨਾਲ ਸਪੇਸ ਬਾਰ ਸਵਿੱਚ ਸੁਨੇਹਾ ਝਲਕ, ਸੁਨੇਹਾ ਸੂਚੀ ਅਤੇ ਫੋਲਡਰ ਵਿੱਚ ਸਕਰੋਲ ਕਰੇਗੀ। "
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "ਰੈਡਰ ਸੁਨੇਹਾ ਟੈਕਸਟ ਭਾਗ ਨੂੰ ਸੀਮਿਤ ਆਕਾਰ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "ਕਾਰਟੀ ਮੋਡ ਯੋਗ/ਅਯੋਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ਆਉਟਲੁੱਕ/ਜੀਮੇਲ ਢੰਗ ਨਾਲ ਫਾਇਲ ਨਾਂ ਇੰਕੋਡ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:59
+#| msgid ""
+#| "Encode file names in the mail headers same as Outlook or GMail does, to "
+#| "let them understand localized file names sent by Evolution, because they "
+#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "ਆਉਟਲੁੱਕ ਜਾਂ ਜੀਮੇਲ ਵਾਂਗ ਮੇਲ ਹੈੱਡਰ ਵਿੱਚ ਇੰਕੋਡ ਕੀਤੇ ਫਾਇਲ ਨਾਂ, ਤਾਂ ਜੋ ਉਹ ਸਮਝ ਸਕਣ ਕਿ ਈਵੇਲੂਸ਼ਨ ਵੱਲੋਂ "
-"ਸਥਾਨੀ ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਭੇਜਿਆ ਹੈ, ਕਿਉਂਕਿ ਉਹ RFC ੨੨੩੧ ਦੇ ਮੁਤਾਬਕ ਨਹੀਂ, ਬਲਕਿ RFC ੨੦੪੭ ਸਟੈਂਡਰਡ "
-"ਨੂੰ ਮੰਨਦੇ ਹਨ।"
+"UTF-8 ਅੱਖਰ ਨਾਲ ਭੇਜੇ ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਭੇਜਿਆ ਹੈ, ਕਿਉਂਕਿ ਉਹ RFC ੨੨੩੧ ਦੇ ਮੁਤਾਬਕ ਨਹੀਂ, ਬਲਕਿ RFC "
+"੨੦੪੭ ਸਟੈਂਡਰਡ ਨੂੰ ਮੰਨਦੇ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
-msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਪੱਟੀ ਦੀ ਉਚਾਈ"
+msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
-msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
+msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਪੱਟੀ ਦੀ ਉਚਾਈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫੋਲਡਰ ਝਲਕ ਓਹਲੇ ਕਰੋ ਅਤੇ ਚੋਣ ਹਟਾ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13462,13 +12319,13 @@ msgstr ""
 "ਜੇਕਰ ਯੂਜ਼ਰ ਨੇ ੧੦ ਜਾਂ ਵਧੇਰੇ ਸੁਨੇਹੇ ਇੱਕੋ ਸਮੇਂ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਤਾਂ, ਯੂਜ਼ਰ ਨੂੰ ਪੁੱਛੋ ਕਿ ਕੀ ਉਹ ਇੰਝ ਕਰਨਾ "
 "ਚਾਹੁੰਦਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "ਜੇਕਰ \"ਝਲਕ\" ਬਾਹੀ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਇਹ ਨਾਲ-ਨਾਲ ਹੀ ਵੇਖਾਏਗਾ, ਨਾ ਕਿ ਲੰਬਕਾਰੀ ਰੂਪ ਵਿੱਚ।"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13477,15 +12334,15 @@ msgstr ""
 "ਇੱਕ ਖਾਸ MIME ਕਿਸਮ ਲਈ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਦਰਸ਼ਕ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ, ਕਿਸੇ MIME ਕਿਸਮ ਨੂੰ ਇਸ ਸੂਚੀ ਵਿੱਚ "
 "ਉਪਲੱਬਧ ਹੋਣ ਲਈ ਉਸ ਨੂੰ ਗਨੋਮ ਦੇ MIME ਕਿਸਮ ਡਾਟਾਬੇਸ ਦੇ ਬੋਨਬੋ-ਭਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਉਪਲੱਬਧ ਹੋਣਾ ਸਹਾਇਕ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਝਰੋਖੇ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ ਮੁੱਲ "
-"ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
+"\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਉਚਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਝਰੋਖੇ ਨੂੰ ਵਰਟੀਕਲ ਮੁੜ-ਅਕਾਰ "
+"ਕਰੇਗਾ ਤਾਂ ਮੁੱਲ ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13493,12 +12350,12 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"Send and Receive Mail (ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ)\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ "
-"ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ "
-"ਮੁੱਲ ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ \"Send and Receive Mail (ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ)\" "
-"ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
+"\"Send and Receive Mail (ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ)\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਵੱਧੋ-ਵੱਧ ਹਾਲਤ ਹੈ। ਮੁੱਲ ਨੂੰ ਅੱਪਡੇਟ "
+"ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਵਿੰਡੋ ਨੂੰ ਵੱਧੋ-ਵੱਧ ਜਾਂ ਅਣ-ਵੱਧੋ-ਵੱਧ ਕਰਦਾ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਖਾਸ ਮੁੱਲ "
+"ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾਂਦਾ, ਜਦੋਂ \"Send and Receive Mail (ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ)\" ਵਿੰਡੋ ਵੱਧੋ-"
+"ਵੱਧ ਨਾ ਹੋਵੇ। ਇਹ ਕੁੰਜੀ ਕੇਵਲ ਸਥਾਪਨ ਵੇਰਵਾ ਵਜੋਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13506,11 +12363,7 @@ msgstr ""
 "\"ਮੇਲ ਭੇਜੋ ਅਤੇ ਲਵੋ\" ਵਿੰਡੋ ਦੀ ਸ਼ੁਰੂਆਤੀ ਚੌੜਾਈ। ਜਿਵੇਂ ਹੀ ਯੂਜ਼ਰ ਝਰੋਖੇ ਨੂੰ ਹਰੀਜਟਲ ਮੁੜ-ਅਕਾਰਕਰੇਗਾ ਤਾਂ ਮੁੱਲ "
 "ਅੱਪਡੇਟ ਹੋਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪੁੱਛਣ ਨੂੰ ਯੋਗ/ਆਯੋਗ ਕਰਦਾ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13518,40 +12371,40 @@ msgstr ""
 "ਲਗਾਤਾਰ ਪਰੌਉਟ ਆਯੋਗ/ਯੋਗ ਕਰਦਾ ਹੈ, ਜੇ ਆਫਲਾਈਨ ਸਿਕਰੋ (sync) ਆਫਲਾਈਨ ਮੋਡ ਵਿੱਚ ਜਾਣ ਲਈ ਲਾਜ਼ਮੀ "
 "ਹੋਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"ਇਹ ਲਗਾਤਾਰ ਪੁੱਛਣ ਨੂੰ ਆਯੋਗ/ਯੋਗ ਰਦੀ ਹੈ, ਜੋ ਕਿ ਚੇਤਾਵਨੀ ਦਿੰਦੀ ਕਿ ਖੋਜ ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਹਟਾਉਣ ਨਾਲ ਸੁਨੇਹੇ ਨੂੰ "
-"ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ, ਨਾ ਕਿ ਕੇਵਲ ਖੋਜ ਨਤੀਜਿਆਂ ਵਿੱਚੋਂ।"
+"ਇਹ ਲਗਾਤਾਰ ਪੁੱਛਣ ਨੂੰ ਆਯੋਗ/ਯੋਗ ਰਦੀ ਹੈ, ਜੋ ਕਿ ਚੇਤਾਵਨੀ ਦਿੰਦੀ ਕਿ ਖੋਜ ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਹਟਾਉਣ ਨਾਲ "
+"ਸੁਨੇਹੇ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ, ਨਾ ਕਿ ਕੇਵਲ ਖੋਜ ਨਤੀਜਿਆਂ ਵਿੱਚੋਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕੀਤਾ ਸੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "ਆਖਰੀ ਵਾਰ ਰੱਦ ਖਾਲੀ ਕਰਨ ਦਾ ਸਮਾਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "ਲੇਬਲ ਸੂਚੀ ਅਤੇ ਸੰਬੰਧਿਤ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬੋਨਬੋ ਭਾਗ ਦਰਸ਼ਕ ਦੀ ਜਾਂਚ ਲਈ MIME ਕਿਸਮ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "ਮਨਜ਼ੂਰ ਲਾਈਸੈਂਸਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "ਅਕਾਊਂਟ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13559,15 +12412,15 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਕੋਲ ਉਪਲੱਬਧ ਅਕਾਊਂਟਾਂ ਦੀ ਲਿਸਟ। ਇਸ ਸੂਚੀ ਵਿੱਚ ਲਾਈਨਾਂ ਸਬ-ਡਾਇਰੈਕਟਰੀਆਂ /apps/"
 "evolution/mail/accounts ਦੇ ਅਨੁਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰਾਂ ਦੀ ਸੂਚੀ ਅਤੇ ਕੀ ਇਹ ਵਰਤੇ ਜਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨ ਲਈ ਡਿਕਸ਼ਨਰੀ ਭਾਸ਼ਾ ਕੋਡ ਦੀ ਲਿਸਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13575,15 +12428,15 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੱਤਰ ਭਾਗ ਲਈ ਪਛਾਣ ਦੀ ਲੇਬਲ ਸੂਚੀ ਹੈ। ਇਹ ਸੂਚੀ ਉਹ ਸਾਰੇ ਰੰਗ ਰੱਖਦੀ ਹੈ, ਜੋ ਕਿ HTML "
 "ਹੈਕਸਾ ਇੰਕੋਡਿੰਗ ਲਈ ਵਰਤੇ ਜਾਦੇ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰੋਟੋਕੋਲਾਂ ਨਾਂ ਦੀ ਲਿਸਟ, ਜਿਹਨਾਂ ਦਾ ਲਾਈਸੈਂਸ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸੁਨੇਹੇ ਲਈ HTTP ਤੋਂ ਚਿੱਤਰ ਪ੍ਰਾਪਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13593,103 +12446,103 @@ msgstr ""
 "ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਤਾਂ ਹੀ ਕਰੋ, ਜੇਕਰ ਭੇਜਣ ਵਾਲਾ ਐਡਰੈੱਸ ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਵੇ \"2\" -  ਨੈੱਟ ਤੋਂ ਹਮੇਸ਼ਾ "
 "ਚਿੱਤਰ ਡਾਊਨਲੋਡ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱਗ ਫਾਇਲ ਲਈ ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱਗ ਫਿਲਟਰ ਕਾਰਵਾਈ ਲਈ ਲਾੱਗ-ਫਾਇਲ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਬਾਅਦ ਵੇਖਿਆ ਨਿਰਧਾਰਿਤ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸੁਨੇਹਾ \"ਝਲਕ\" ਵਿੱਚ ਨਿਸ਼ਾਨ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸੁਨੇਹਾ ਵੇਖਾਉਣ ਸ਼ੈਲੀ (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਨੂੰ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ ਕਰਨ ਉੱਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਸਮਾਂ ਦਿਨਾਂ ਵਿੱਚ।"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਖਾਲੀ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਅੰਤਰਾਲ ਦਿਨਾਂ ਵਿੱਚ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱਚ ਵੇਖਾਉਣ ਲਈ ਸਿਰਨਾਵੀਆਂ ਦੀ ਗਿਣਤੀ"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "ਖਾਲੀ ਵਿਸ਼ੇ ਤੇ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵਿਸ਼ੇ ਤੋਂ ਸੁਨੇਹਾ ਭੇਜਣ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "ਚੈੱਕ ਕਰਨ ਲਈ ਪੁੱਛੋ, ਜੇ ਯੂਜ਼ਰ ਤੁਰੰਤ ਹੀ ਆਫਲਾਇਨ ਜਾਣਾ ਚਾਹੁੰਦਾ ਹੋਵੇ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪੁੱਛੋ, ਜਦੋਂ ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਹੋਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਹਟਾਏ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "ਜੇਕਰ ਸਿਰਫ Bcc ਖੇਤਰ ਹੀ ਭਰਿਆ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ ੧੦ ਸੁਨੇਹੇ ਖੋਲਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13697,147 +12550,234 @@ msgstr ""
 "ਜਦੋਂ ਯੂਜ਼ਰ HTML ਸੁਨੇਹੇ, ਉਹਨਾਂ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ, ਜੋ ਕਿ ਇਹ ਪ੍ਰਾਪਤ ਹੀ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦੇ "
 "ਹਨ, ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਬਿਨਾਂ ਵੱਲ ਜਾਂ Cc ਪ੍ਰਾਪਤਕਰਤਾ ਦੇ ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ਜਦੋਂ ਯੂਜ਼ਰ ਨਾ-ਚਾਹਿਆਂ HTML ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰੇ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "ਜਦੋਂ ਕਈ ਸੁਨੇਹੇ ਨਿਸ਼ਾਨਬੱਧ ਕਰਨੇ ਹੋਣ ਤਾਂ ਪੁੱਛੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "ਜਵਾਬ ਦੇ ਉੱਤੇ ਨਿੱਜੀ ਦਸਤਖਤ ਦਿਓ"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "ਜਵਾਬਾਂ ਦੇ ਹੇਠਾਂ ਕਰਸਰ ਰੱਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ਟੈਕਸਟ ਵਿੱਚੋਂ ਈਮੋਸ਼ਨ ਦੀ ਪਛਾਣ ਕਰਕੇ ਚਿੱਤਰਾਂ ਨਾਲ ਬਦਲ ਦਿਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "ਟੈਕਸਟ ਵਿੱਚ ਲਿੰਕਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਤਬਦੀਲ ਕਰੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "ਆ ਰਹੀਆਂ ਮੇਲਾਂ ਲਈ ਜੰਕ ਟੈਸਟ ਚਲਾਓ।"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸੰਭਾਲੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਫੋਟੋ ਦੀ ਖੋਜ"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲਟ HTML ਪੱਤਰ ਭੇਜੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲਟ HTML ਪੱਤਰ ਭੇਜੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਸੁਨੇਹਾ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸੈਕਰੋਨਾਈਜ਼ ਅੰਤਰਾਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "ਜਦੋਂ ਮੇਲ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Bcc\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "ਜਦੋਂ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Cc\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਵਿੱਚ ਭੇਜਣ ਦੌਰਾਨ \"ਵਲੋਂ\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ \"ਵਲੋਂ\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "ਨਿਊਜ਼ਗਰੁੱਪ ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
-msgstr "ਸਜੀਵਤਾ ਵੇਖਾਓ"
+msgstr "ਐਨੀਮੇਸ਼ਨ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
-msgstr "ਸਜੀਵ ਸੁਨੇਹੇ ਸਜੀਵ ਹੀ ਵੇਖਾਓ।"
+msgstr "ਐਨੀਮੇਸ਼ਨ ਸੁਨੇਹੇ ਐਨੀਮੇਸ਼ਨ ਵਜੋਂ ਹੀ ਵੇਖੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ (ਵਿੰਨੇ ਹੋਏ)।"
+msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖੋ (ਵਿੰਨੇ ਹੋਏ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
-msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖਾਓ"
+msgstr "ਸੁਨੇਹਾ-ਲਿਸਟ ਵਿੱਚ ਹਟਾਏ ਸੁਨੇਹੇ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "_Show image animations"
+msgid "Show image animations"
+msgstr "ਚਿੱਤਰ ਐਨੀਮੇਸ਼ਨ ਵੇਖੋ"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
-msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖਾਓ"
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Bcc\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"Cc\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"ਜਦੋਂ ਨਿਊਜ਼ਗਰੁੱਪ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਵਲੋਂ\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਵਲੋਂ\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"ਜਦੋਂ ਨਿਊਜ਼ਗਰੁੱਪ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"ਜਦੋਂ ਪੱਤਰ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੋਵੇ ਤਾਂ \"ਜਵਾਬ ਦਿਓ\" ਖੇਤਰ ਵੇਖੋ। ਇਸ ਨੂੰ ਮੇਲ ਅਕਾਊਂਟ ਚੁਣਨ ਦੇ ਦੌਰਾਨ ਵੇਖੋ ਮੇਨੂ ਤੋਂ "
+"ਕੰਟਰੋਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਵਿੱਚ ਵੱਖਰੇ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
+msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਵਿੱਚ ਵੱਖਰੇ ਕਾਲਮ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਈ-ਮੇਲ ਵੇਖੋ"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "ਸੁਨੇਹਾ ਪੜ੍ਹਨ ਪੈਂਨ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖਾਓ।"
+msgstr "ਸੁਨੇਹਾ ਪੜ੍ਹਨ ਪੈਂਨ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
-msgstr "ਕਤਾਰ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
+msgstr "ਲਾਈਨ ਵਿੱਚ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ ਭਾਸ਼ਾਵਾਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
-msgstr "ਮੂਲ ਉਚਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
+msgstr "ਮੈਂਬਰ ਬਣੋ ਡਾਈਲਾਗ ਮੂਲ ਉਚਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
-msgstr "ਮੂਲ ਚੌੜਾਈ ਤਖਤੀ ਮਨਜ਼ੂਰ ਕਰੋ"
+msgstr "ਮੈਂਬਰ ਬਣੋ ਡਾਈਲਾਗ ਮੂਲ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
-msgstr "ਟਰਮੀਨਲ ਫੋਟ"
+msgstr "ਟਰਮੀਨਲ ਫੋਂਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "ਟੈਕਸਟ ਸੁਨੇਹਾ ਭਾਗ ਸੀਮਾ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "ਜੰਕ ਹੁੱਕ ਲਈ ਡਿਫਾਲਟ ਪਲੱਗਇਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ਆਖਰੀ ਵਾਰ ਜੰਕ ਖਾਲ ਕੀਤਾ ਗਿਆ ਸੀ, ਇੰਨ੍ਹੇ ਦਿਨ ਪਹਿਲਾਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ਕਾਫੀ ਦਿਨ ਪਹਿਲਾਂ ਰੱਦੀ ਖਾਲੀ ਕੀਤੀ ਸੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਟਰਮੀਨਲ ਫੋਂਟ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਵੇਰੀਬਲ ਚੌੜੇ ਫੋਂਟ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮੁੱਲ ਹਨ। ਗਲਤੀਆਂ ਲਈ \"0\"। ਚੇਤਾਵਨੀ ਲਈ \"1\"। ਡੀਬੱਗ ਸੁਨੇਹਾ ਲਈ \"2\"।"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "ਇਹ ਟੈਕਸਟ ਭਾਗ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਤਹਿ ਕਰਦਾ ਹੈ, ਜਿਸ ਨੂੰ ਈਵੇਲੂਸ਼ਨ ਮੁਤਾਬਕ ਫਾਰਮੈਟ ਕੀਤਾ ਜਾ ਸਕਦਾ "
-"ਹੈ। ਡਿਫਾਲਟ ੪MB / ੪੦੯੬ KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+"ਹੈ। ਡਿਫਾਲਟ 4 (੪) MB / ੪੦੯੬ KB ਹੈ ਅਤੇ KB ਦੇ ਰੂਪ ਵਿੱਚ ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13846,7 +12786,7 @@ msgstr ""
 "ਇਹ ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ ਹੈ, ਭਾਵੇਂ ਕਿ ਕਈ ਪਲੱਗਇਨ ਯੋਗ ਹਨ। ਜੇ ਡਿਫਾਲਟ ਦਿੱਤੀ ਪਲੱਗਇਨ ਆਯੋਗ ਹੈ ਤਾਂ ਇਹ "
 "ਹੋਰ ਉਪਲੱਬਧ ਪਲੱਗਇਨ ਚਾਲੂ ਨਹੀਂ ਕਰੇਗੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13854,7 +12794,7 @@ msgstr ""
 "ਇਹ ਕੀ ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਹੈ ਅਤੇ ਪੜ੍ਹਨ ਬਾਅਦ \"ਗਲਤ\" ਲਈ ਰੀ-ਸੈੱਟ ਕੀਤਾ ਹੈ। ਸੂਚੀ ਵਿੱਚਇਹ ਮੇਲ ਅਣ-"
 "ਚੁਣੀ ਹੈ ਅਤੇ ਉਸ ਫੋਲਡਰ ਲਈ ਝਲਕ ਹਟਾਉਦੀ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13865,20 +12805,20 @@ msgstr ""
 "XML ਢਾਂਚੇ ਦਾ ਫਾਰਮੈਟ ਹੈ &lt; ਟਾਇਟਲ ਯੋਗ&gt; - ਸੈੱਟ ਕਰੋ, ਜੇਕਰ ਮੇਲ ਝਲਕ ਵਿੱਚ ਤੁਸੀਂ ਹੈੱਡਰ ਵੇਖਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"ਇਹ ਚੋਣ lookup_addressbook ਕੁੰਜੀ ਨਾਲ ਸਬੰਧਿਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਲੋਕਲ ਐਡਰੈੱਸ ਵਿੱਚ ਐਡਰੈੱਸ ਦੀ "
-"ਖੋਜ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਕਿ ਜੰਕ ਫਿਲਟਰ ਤੋਂ ਅਣਜਾਣ ਸੰਪਰਕ ਨੂੰ ਅੱਡ ਕੀਤਾ ਜਾ ਸਕੇ।"
+"ਇਹ ਚੋਣ lookup_addressbook ਕੁੰਜੀ ਨਾਲ ਸਬੰਧਿਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਲੋਕਲ ਐਡਰੈੱਸ ਵਿੱਚ ਐਡਰੈੱਸ ਦੀ ਖੋਜ ਲਈ "
+"ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਕਿ ਜੰਕ ਫਿਲਟਰ ਤੋਂ ਅਣਜਾਣ ਸੰਪਰਕ ਨੂੰ ਅੱਡ ਕੀਤਾ ਜਾ ਸਕੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "ਇਹ ਚੋਣ ਲੈਣ ਦੀ ਸਪੀਡ ਸੁਧਾਰਨ ਲਈ ਮੱਦਦ ਕਰੇਗੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13886,7 +12826,7 @@ msgstr ""
 "ਇਹ ਡਿਫਾਲਟ ਸੁਨੇਹਾ ਸੂਚੀ ਝਲਕ ਵਿੱਚ ਐਡਰੈੱਸਾਂ ਦੀ ਗਿਣਤੀ ਸੈੱਟ ਕਰਦੀ ਹੈ, ਜਿਸ ਤੋਂ ਬਾਅਦ ਇੱਕ '...' "
 "ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13894,7 +12834,7 @@ msgstr ""
 "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਥਰਿੱਡ ਫੈਲਿਆ ਹੋਵੇ ਜਾਂ ਸਮੇਟਿਆ ਹੋਇਆ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-"
 "ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13903,115 +12843,93 @@ msgstr ""
 "ਇਹ ਸੈਟਿੰਗ ਤਹਿ ਕਰਦੀ ਹੈ ਕਿ ਥਰਿੱਡਾਂ ਨੂੰ ਹਰੇਕ ਥਰਿੱਡ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਿਆਂ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕੀਤਾ ਜਾਵੇ, "
 "ਨਾ ਕਿ ਸੁਨੇਹੇ ਦੀ ਮਿਤੀ ਮੁਤਾਬਕ। ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ-ਸਟਾਰਟ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਥਰਿੱਡ।"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਥਰਿੱਡ"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼ੇ ਤੇ ਅਧਾਰਿਤ ਸੁਨੇਹਾ-ਸੂਚੀ ਦਾ ਥਰਿੱਡ ਬਣਾਓ"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "ਸੁਨੇਹੇ ਵੇਖਿਆ ਬਣਾਉਣ ਲਈ ਟਾਈਮ-ਆਉਟ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "ਮੂਲ ਅਕਾਊਂਟ ਲ਼ਈ UID ਲਾਈਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ਜਦੋਂ ਇਨ-ਲਾਈਨ ਸਪੈਲਿੰਗ ਦੀ ਵਰਤੋਂ ਹੋਵੇ ਤਾਂ ਗਲਤ ਸ਼ਬਦ ਲਈ ਹੇਠਾਂ ਲਾਈਨ ਲਈ ਰੰਗ"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡੈਮਨ ਅਤੇ ਕਲਾਇਟ ਵਰਤੋਂ (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮੇਲ ਵੇਖਾਉਣ ਲਈ ਕਸਟਮ ਫੋਂਟ ਵਰਤੋਂ ਜੀ।"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਸਥਾਨਕ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਸਥਾਨਕ ਫਰਜ਼ੀ ਜਾਂਚ ਹੀ ਵਰਤੋਂ (DNS ਨਹੀਂ)।"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "ਨਾਲ-ਨਾਲ ਜਾਂ ਫੈਲਿਆ ਖਾਕਾ ਵਰਤੋਂ"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"ਯੂਜ਼ਰ ਨੂੰ ਸੁਨੇਹਾ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਕਰਸਰ ਕਿੱਥੇ ਰੱਖ ਕੇ ਦੇਣੀ ਹੈ। ਇਹ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਕਰਸਰ ਨੂੰ ਸੁਨੇਹੇ "
+"ਦੇ ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਜਾਂ ਹੇਠਾਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"ਯੂਜ਼ਰ ਸੁਨੇਹੇ ਦਾ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਆਪਣੇ ਦਸਤਖਤ ਕਿੱਥੇ ਲੈ ਸਕੇਗਾ। ਇਹ ਤਹਿ ਕਰਦਾ ਹੈ ਕਿ ਦਸਤਖਤਾਂ ਨੂੰ "
+"ਸੁਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖਿਆ ਜਾਵੇਗਾ ਕਿ ਹੇਠਾਂ।"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ਕੀ ਮੂਲ ਰੂਪ ਵਿੱਚ ਹਰੇਕ ਸੁਨੇਹੇ ਨਾਲ ਜਵਾਬੀ ਰਸੀਦ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ਕੀ ਬਾਹੀ  ਵਿੱਚ ਅੰਡਾਕਾਰ ਫੋਲਡਰ ਨਾਂ ਫੀਚਰ ਆਯੋਗ ਕਰਨਾ ਹੈ।"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14019,15 +12937,15 @@ msgstr ""
 "ਕੀ ਮਾਮਲਿਆਂ ਨੂੰ ਵਿਸ਼ੇ ਮੁਤਾਬਕ ਕੀਤਾ ਜਾਵੇ ਜਾਂ ਨਾ, ਜਦੋਂ ਕਿ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਜਵਾਬ ਜਾਂ ਹਵਾਲਾ ਖੇਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹੋਵੇ।"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ਕੀ ਮਾਮਲੇ ਨੂੰ ਉਸ ਮਾਮਲੇ ਵਿੱਚ ਤਾਜ਼ਾ ਸੁਨੇਹਾ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰਨਾ ਹੈ"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "ਸੁਨੇਹਾ-ਸੂਚੀ ਬਾਹੀ ਦੀ ਚੌੜਾਈ ਹੈ।"
 
@@ -14044,12 +12962,12 @@ msgid "Import mail from Elm."
 msgstr "Elm ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫੋਲਡਰ:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਫੋਲਡਰ ਚੁਣੋ"
 
@@ -14067,8 +12985,8 @@ msgstr "ਪੱਤਰ-ਬਕਸਾ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
@@ -14095,152 +13013,148 @@ msgstr "Pine ਤੋਂ ਪੱਤਰ ਅਯਾਤ ਹੈ।"
 msgid "Mail to %s"
 msgstr "%s ਨੂੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤੋਂ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "ਵਿਸ਼ਾ ਹੈ %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ਪੱਤਰ ਲਿਸਟ"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "ਫਿਲਟਰ ਨਿਯਮ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ਚੁਣਿਆ, "
 msgstr[1] " %d ਚੁਣੇ, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹਟਾਇਆ"
 msgstr[1] "%d ਹਟਾਏ"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ਜੰਕ"
 msgstr[1] "%d ਜੰਕ"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫਟ"
 msgstr[1] "%d ਡਰਾਫਟ"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭੇਜਿਆ"
 msgstr[1] "%d ਭੇਜੇ"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭੇਜਿਆ"
 msgstr[1] "%d ਨਾ-ਭੇਜੇ"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ਅਣ-ਰੀਡ, "
 msgstr[1] "%d ਅਣ-ਰੀਡ, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ਕੁੱਲ"
 msgstr[1] "%d ਕੁੱਲ"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸੁਨੇਹਾ(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "ਇੱਕ ਨਵਾਂ ਪੱਤਰ ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫੋਲਡਰ(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਫੋਲਡਰ ਬਣਾਓ"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ਪੱਤਰ ਸੈਟਿੰਗ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(ਨੋਟ: ਐਪਲੀਕੇਸ਼ਨ ਮੁੜ-ਸਟਾਰਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b> SSL ਸਹਿਯੋਗ ਈਵੇਲੂਸ਼ਨ ਦੇ ਇਸ ਵਰਜਨ ਲਈ ਸਹਿਯੋਗ ਨਹੀਂ</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>ਦਸਤਖਤ(_n)</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>ਟਾਪ ਪੋਸਟਿੰਗ ਚੋਣ</b> (ਸਿਫਾਰਸ਼ੀ ਨਹੀਂ ਹੈ)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>ਭਾਸ਼ਾਵਾਂ(_L)</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">ਪ੍ਰਮਾਣਕਿਤਾ</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">ਸੁਨੇਹੇ ਲਿਖਣੇ</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">ਸੰਰਚਨਾ</span>"
 
@@ -14361,59 +13275,83 @@ msgstr "ਇਕ੍ਰਿਪਟਡ ਸੁਨੇਹੇ ਭੇਜਣ ਸਮੇਂ �
 msgid "Always request rea_d receipt"
 msgstr "ਪੜਨ ਰਸੀਦ ਹਮੇਸ਼ਾ ਮੰਗੋ(_d)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+#| msgid "Attachment Reminder"
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"ਅਟੈਚਮੈਂਟ\n"
+"ਲਾਈਨ ਵਿੱਚ\n"
+"ਹਵਾਲਾ"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"ਅਟੈਚਮੈਂਟ\n"
+"ਲਾਈਨ ਵਿੱਚ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)\n"
+"ਹਵਾਲਾ\n"
+"ਹਵਾਲਾ ਨਹੀਂ"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "ਈਮੋਸ਼ਨ ਚਿੱਤਰ ਆਟੋਮੈਟਿਕ ਸ਼ਾਮਿਲ ਕਰੋ(_e)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "ਬਾਲਟਿਕ (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "ਬਾਲਟਿਕ (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "ਅੱਖਰ ਸਮੂਹ(_h):"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "ਜੰਕ ਲਈ ਕਸਟਮ ਹੈੱਡਰ ਚੈੱਕ ਕਰੋ(_s)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "ਜੰਕ ਲਈ ਆ ਰਹੇ ਸੁਨੇਹੇ ਚੈੱਕ ਕਰੋ(_m)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "I ਕਿਸਮ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਦੀ ਜਾਂਚ ਕਰੋ(_t)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ਆਉਣ ਵਾਲੇ ਪੱਤਰਾਂ ਵਿੱਚ ਜੰਕ ਦੀ ਜਾਂਚ ਕਰੋ"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "ਸਾਫ਼(_a)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "ਸਾਫ਼(_r)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "ਗਲਤ ਸ਼ਬਦ-ਜੋੜ ਅੱਖਰਾਂ ਦਾ ਰੰਗ(_m):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "ਫੋਲਡਰ ਦੇ ਤੱਥ ਕੱਢਣ ਸਮੇਂ ਪੁਸ਼ਟੀ ਕਰੋ(_w)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14429,181 +13367,183 @@ msgstr ""
 "\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਸੈਟਿੰਗ ਲਾਗੂ ਕਰਨ ਲਈ \"ਲਾਗੂ ਕਰੋ\" ਦਬਾਓ।"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "ਮੂਲ(_f)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "ਮੂਲ ਅੱਖਰ ਇਕੋਡਿੰਗ(_n):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ ਕਰਨ ਸਮੇਂ ਜੰਕ ਮੇਲ ਹਟਾਓ(_x)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਡਿਜ਼ੀਟਲ ਸਾਈਨ ਕਰੋ (ਡਿਫਾਲਟ)(_s)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ਮੇਲ ਵਿੱਚ ਟੈਕਸਟ ਸਮੱਗਰੀ ਫਾਰਮੈਟ ਨਾ ਕਰੋ, ਜੇ ਟੈਕਸਟ ਸਾਈਜ਼ ਵੱਧ ਜਾਵੇ(_z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ਜੇ ਭੇਜਣ ਵਾਲਾ ਮੇਰੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹਾ ਜੰਕ ਨਾ ਬਣਾਓ(_k)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "ਕੋਟ ਨਾ ਕਰੋ"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "ਈ-ਮੇਲ ਅਕਾਊਂਟ"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ ਕਰਨ ਤੇ ਰੱਦੀ ਫੋਲਡਰ ਬੰਦ ਕਰ ਦਿਓ(_x)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "ਮੈਜਿਕ ਸਪੇਸਬਾਰ ਯੋਗ(_p)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਯੋਗ(_r)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ(_p):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰੀ ਜਾਣ ਵਾਲੇ ਪੱਤਰਾਂ ਨੂੰ ਇਕ੍ਰਿਪਸ਼ਨ(ਮੂਲ ਹੀ)(_g)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ(_x):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "ਸਥਿਰ ਚੌੜਾਈ ਫੋਂਟ(_e):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "ਫੋਂਟ ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱਚ ਫਾਰਮੈਟ ਸੁਨੇਹਾ"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "ਪੂਰਾ ਨਾਂ(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML ਸੁਨੇਹੇ"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾਕਸੀ:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "ਹੈੱਡਰ"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲੇ ਨੂੰ ਉਭਾਰੋ(_q)"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "ਲਾਇਨ 'ਚ"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "ਇਨਲਾਇਨ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr "ਜੇ ਸਰਵਰ ਗ਼ੈਰ-ਸਟੈਂਡਰਡ ਪੋਰਟ ਵਰਤਦਾ ਹੋਵੇ ਤਾਂ ਸਰਵਰ ਐਡਰੈੱਸ \"ਸਰਵਰ-ਨਾਂ:ਪੋਰਟ-ਨੰਬਰ\" ਮੁਤਾਬਕ ਦਿਓ।"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲੇਬਲ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "ਮੇਲ ਸੰਰਚਨਾ"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "ਮੇਲ ਹੈੱਡਰ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "ਮੇਲ-ਬਾਕਸ ਟਿਕਾਣਾ"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "ਸੁਨੇਹਾ ਲੇਖਕ"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "ਇਸ ਲਈ ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "ਨੋਟ: ਲੇਬਲ ਨਾਂ ਵਿੱਚ ਹੇਠਾਂ ਲਾਈਨ ਨੂੰ ਮੇਨੂ ਵਿੱਚ ਨੀਮੋਨਿਕ ਪਛਾਣਕਰਤਾ ਵਾਂਗ"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ਸੂਚਨਾ: ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਪਹਿਲੀਂ ਵਾਰ ਲਾਗਇਨ ਨਹੀਂ ਕਰਦੇ, ਤੁਹਾਡੇ ਕੋਲੋਂ ਪਾਸਵਰਡ ਪੁਛਿਆ ਨਹੀਂ ਜਾਵੇਗਾ"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ਚੋਣ ਨੂੰ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾਵੇਗਾ, ਜੇ ਰਲਦਾ ਕਸਟਮ ਜੰਕ ਹੈੱਡਰ ਖੋਜਿਆ ਜਾਵੇ।"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "ਸੰਗਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "ਹੇਠ ਦਿੱਤੀ ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰੋ ਜੀ।"
+
+#: ../mail/mail-config.glade.h:120
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"ਅੱਗੇ ਦਿੱਤੀ ਥਾਂ ਵਿੱਚ ਇਸ ਅਕਾਊਂਟ ਬਾਰੇ ਵਰਣਨ ਕਰਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ।\n"
+"ਅੱਗੇ ਦਿੱਤੀ ਥਾਂ ਵਿੱਚ ਇਸ ਅਕਾਊਂਟ ਬਾਰੇ ਵਰਣਨ ਕਰਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ। "
 "ਇਹ ਨਾਂ ਸਿਰਫ਼ ਵੇਖਾਉਣ ਲਈ ਹੀ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14611,7 +13551,7 @@ msgstr ""
 "ਉਸ ਢੰਗ ਦੀ ਜਾਣਕਾਰੀ ਦਿਓ ਜੀ, ਜਿਸ ਰਾਹੀਂ ਤੁਸੀਂ ਪੱਤਰ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਯਕੀਨੀ ਨਹੀਂ ਹੋ "
 "ਤਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਜਾਂ ਇੰਟਰਨੈੱਟ ਸਰਵਿਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 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 "
@@ -14620,65 +13560,49 @@ msgstr ""
 "ਹੇਠਾਂ ਆਪਣਾ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ। ਹੇਠਾਂ \"ਚੋਣਵਾਂ\" ਖੇਤਰ ਭਰਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ, ਜਦੋਂ ਤੱਕ ਕਿ "
 "ਤੁਸੀਂ ਈ-ਮੇਲ ਰਾਹੀ ਭੇਜੀ ਜਾਣ ਵਾਲੀ ਜਾਣਕਾਰੀ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਾ ਕਰ ਚਾਹੋ।"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "ਹੇਠ ਲਿਖੀਆਂ ਚੋਣਾਂ ਵਿੱਚੋਂ ਚੁਣੋ ਜੀ"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "ਪੋਰਟ:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸੂਚਿਤ ਕਰੋ, ਜਦੋਂ ਵੀ ਸੁਨੇਹੇ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੋਵੇ, ਜੋ ਕਿ Bcc ਪ੍ਰਾਪਤਕਰਨ ਵਾਲਿਆਂ ਲਈ ਹੋਵੇ(_o)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "ਹਵਾਲਾ"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_m)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "ਇਸ ਨੂੰ ਜਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_p)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS ਹੋਸਟ:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਦੀ ਤਸਵੀਰ ਦੀ ਖੋਜ ਸਿਰਫ਼ ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਹੀ ਕਰੋ(_e)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "ਚੁਣੋ(_e)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "ਸੁਨੇਹਾ ਰਸੀਦ ਭੇਜੋ(_e):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "ਸਟੈਂਡਰਡ ਫੋਂਟ(_t):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "ਡਰਾਫਟ ਫੋਲਡਰ ਚੁਣੋ"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
-msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
+msgstr "ਪਰਿੰਟ ਲਈ HTML ਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
 #: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
@@ -14688,71 +13612,71 @@ msgstr "HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿਟਿੰਗ ਲਈ HTML ਅਸਥਿਰ ਚੌੜਾਈ ਫੋਟ ਚੁਣੋ"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "ਭੇਜੇ ਫੋਲਡਰ ਚੁਣੋ"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "ਭੇਜੇ ਸੁਨੇਹੇ ਫੋਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲਈ ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "ਸਰਵਰ ਕਿਸਮ(_T): "
+#: ../mail/mail-config.glade.h:142
+#| msgid "Server _Type: "
+msgid "Server _Type:"
+msgstr "ਸਰਵਰ ਟਾਈਪ(_T): "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ(_n):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "ਦਸਤਖਤ(_u):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ਦਸਤਖਤ ਟੇਬਲ"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "ਜਦੋਂ ਜਵਾਬ ਦੇਣਾ ਹੋਵੇ ਤਾਂ ਹੇਠਾਂ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ(_t)"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "ਕਿਸਮ(_y): "
+#: ../mail/mail-config.glade.h:149
+#| msgid "T_ype: "
+msgid "T_ype:"
+msgstr "ਕਿਸਮ(_y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ, ਸਿਰਫ ਉਹਨਾਂ ਨੂੰ ਵੇਖਾਉਦੀ ਹੈ, ਜਿਨਾਂ ਲਈ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
-"ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ\n"
-"ਵਿੱਚ ਵਰਤੀ ਜਾਵੇਗੀ। ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ\n"
-"ਵੇਖਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗੀ।"
+"ਇਸ ਸਕ੍ਰਿਪਟ ਦੀ ਆਉਟਪੁੱਟ ਤੁਹਾਡੇ ਦਸਤਖਤ ਵਿੱਚ ਵਰਤੀ ਜਾਵੇਗੀ।\n"
+"ਨਾਂ, ਜੋ ਵੀ ਤੁਸੀਂ ਦਿਓਗੇ, ਸਿਰਫ ਵੇਖਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗੀ।"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14760,156 +13684,160 @@ msgstr ""
 "ਨਾਂ ਲਿਖੋ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਸੰਬੋਧਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "ਉਦਾਹਰਨ ਲਈ: \"ਕੰਮਕਾਰੀ\" ਜਾਂ \"ਨਿੱਜੀ\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_e):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਵਰਤੋਂ(_n)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "ਅਸਥਿਰ-ਚੌੜਾਈ(_a):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਸੰਰਚਨਾ ਸਹਾਇਕ ਤੇ ਸਵਾਗਤ ਹੈ।\n"
+"ਈਵੇਲੂਸ਼ਨ ਪੱਤਰ ਸੰਰਚਨਾ ਸਹਾਇਕ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ\n"
 "\n"
 "ਸ਼ੁਰੂ ਕਰਨ ਲਈ \"ਅੱਗੇ\" ਦਬਾਓ।"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "ਦਸਤਖਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਹਮੇਸ਼ਾ ਪ੍ਰਾਪਤ ਕਰੋ(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "ਆਟੋਮੈਟਿਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ URL (_a):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲਟ ਜੰਕ ਪਲੱਗਇਨ(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਲਈ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮੀਟਿੰਗ ਬੇਨਤੀ ਉੱਤੇ ਦਸਤਖ਼ਤ ਨਾ ਕਰੋ (ਆਉਟਲੁੱਕ ਅਨੁਕੂਲਤਾ ਲਈ) (_D)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਸਟਾਇਲ(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਦਸਤਖਤ ਅਸਲੀਂ ਸੁਨੇਹੇ ਦੇ ਉੱਤੇ ਰੱਖੋ(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰਕਾਂ ਤੋਂ ਆਏ ਸੁਨੇਹਿਆਂ 'ਚ ਚਿੱਤਰ ਲੋਡ ਕਰੋ(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਹੀ ਵੇਖੋ(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "ਮੇਰੇ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਮੂਲ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤੀ ਪਰਾਕਸੀ ਸੰਰਚਨਾ(_M):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ਬਾਅਦ ਵਿੱਚ ਸੁਨੇਹੇ ਨੂੰ ਪੜਿਆ ਬਣਾਓ(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਚਿੱਤਰ ਕਦੇ ਵੀ ਲੋਡ ਨਾ ਕਰੋ(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ਮਾਰਗ(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸੁਨੇਹਾ ਸੰਪਰਕਾਂ ਨੂੰ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ, ਜੋ ਕਿ ਨਹੀਂ ਚਾਹੁੰਦੇ ਹਨ (_P)"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ਖਾਲੀ ਵਿਸ਼ਾ ਲਾਈਨ ਨਾਲ ਸੁਨੇਹਾ ਭੇਜਣ ਸਮੇਂ ਪੁੱਛੋ(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "ਜਵਾਬ ਸਟਾਇਲ(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "ਸਕ੍ਰਿਪਟ(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "ਚੁਣੋ(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "ਚਿੱਤਰ ਸਜੀਵਤਾ ਵੇਖਾਓ(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ਈਮੇਲ ਝਲਕ ਵਿੱਚ ਭੇਜਣ ਵਾਲੇ ਦੀ ਫੋਟੋ ਵੇਖੋ(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹੈੱਡਰ ਨੂੰ ਸੁੰਘੜੋ(_S) "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "ਸਿਸਟਮ ਡਿਫਾਲਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ਹੋਰ ਕਾਰਜ ਵਾਂਗ ਉਹੀ ਫੋਂਟ ਵਰਤੋਂ(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "ਰੰਗ"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "ਵੇਰਵਾ"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "ਸਕਿੰਟ"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "     "
@@ -14939,50 +13867,34 @@ msgid "All local folders"
 msgstr "ਸਭ ਸਥਾਨਕ ਫੋਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "ਅੱਖਰ ਅਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "ਮੁਕੰਮਲ(_m)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "ਖੋਜ(_i):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦੇ ਪਿੱਛੇ"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "ਕੋਈ ਚੁਣਿਆ ਨਹੀਂ"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "ਸਰਵਰ(_e):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "ਖਾਸ ਫੋਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14990,19 +13902,19 @@ msgstr ""
 "ਸੁਨੇਹੇ, ਜੋ ਕਿ ਤੁਸੀਂ ਪਿੱਛਾ ਕਰਨ ਲਈ ਚੁਣੇ ਸਨ, ਹੇਠਾਂ ਦਿੱਤੇ ਜਾ ਰਹੇ ਹਨ।\n"
 "ਕਿਰਪਾ ਕਰਕੇ \"ਨਿਸ਼ਾਨ\" ਮੇਨੂੰ ਵਿੱਚੋਂ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਚੁਣ।"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "ਲਾਇਸੈਂਸ ਮਨਜ਼ੂਰ(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "ਦੇਣਯੋਗ(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਇਸ ਨੂੰ ਚੁਣੋ(_T)"
 
@@ -15011,21 +13923,21 @@ msgstr "ਲਾਇਸੈਂਸ ਸ਼ਰਤਾਂ ਮਨਜ਼ੂਰ ਕਰਨ ਲ�
 msgid "Pinging %s"
 msgstr "ਪਿੰਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਫਿਲਟਰ"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲਏ ਜਾ ਰਹੇ ਹਨ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰੀ ਫਿਲਟਰ ਲਾਗੂ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15034,123 +13946,123 @@ msgstr ""
 "%s ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s\n"
 "ਲੋਕਲ`Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ਸਥਾਨਕ `Sent' ਫੋਲਡਰ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱਚੋਂ %1$d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸੁਨੇਹੇ %2$d ਵਿੱਚੋਂ %1$d ਭੇਜਣ ਵਿੱਚ ਅਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "ਰੱਦ ਕੀਤਾ।"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ਵਿੱਚ ਸੁਨੇਹੇ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "ਫੋਲਡਰ %s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s ਫੋਲਡਰ ਕੋਟਾ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "ਸਟੋਰ %s ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "ਫੋਲਡਰ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫੋਲਡਰ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੁੰਘੜਿਆ ਜਾ ਰਿਹਾ ਹੈ ਅਤੇ ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ਅਕਾਊਂਟ '%s' ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "ਫੋਲਡਰ ਤਾਜ਼ਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "ਨਿਕਾਲਾ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱਚ ਰੱਦੀ ਖਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "ਸਥਾਨਕ ਫੋਲਡਰ"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ਸੁਨੇਹਾ %s ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ਸੁਨੇਹਾ %d ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "ਸੁਨੇਹੇ %d ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15159,11 +14071,11 @@ msgstr ""
 "ਸੁਨੇਹਾ ਸੰਭਾਲਣ ਵਿੱਚ ਗਲਤੀ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15172,27 +14084,27 @@ msgstr ""
 "ਆਉਟਪੁੱਟ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾਟਾ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ਨਾਲੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ਨਾਲ ਮੁੜ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ਆਫਲਾਇਨ ਲਈ ਅਕਾਊਂਟ '%s' ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "ਸੇਵਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
 
@@ -15216,43 +14128,43 @@ msgstr "ਅੱਪਡੇਟ ਜਾਰੀ..."
 msgid "Waiting..."
 msgstr "ਉਡੀਕ ਜਾਰੀ..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲਈ ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਭਰੋ"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "ਯੂਜ਼ਰ ਨੇ ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ।"
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "ਸੰਭਾਲੋ ਤੇ ਬੰਦ ਕਰੋ(_S)"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "ਦਸਤਖਤ ਸੋਧ"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "ਦਸਤਖਤ ਨਾਂ(_S):"
 
@@ -15285,21 +14197,21 @@ msgstr "ਗਲਤ ਫੋਲਡਰ: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲਈ ਖੋਜ ਫੋਲਡਰ ਅੱਪਡੇਟ ਕਰਨਾ ਜਾਰੀ"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਸੋਧ"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "ਨਵਾਂ ਖੋਜ ਫੋਲਡਰ"
 
@@ -15850,8 +14762,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"ਚੇਤਾਵਨੀ: ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਹਟਾਉਣ ਨਾਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਤੁਹਾਡੇ ਲੋਕਲ ਜਾਂ ਰਿਮੋਟ ਫੋਲਡਰ ਵਿੱਚ "
-"ਵੀ ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
+"ਚੇਤਾਵਨੀ: ਖੋਜ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹੇ ਹਟਾਉਣ ਨਾਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਤੁਹਾਡੇ ਲੋਕਲ ਜਾਂ ਰਿਮੋਟ ਫੋਲਡਰ ਵਿੱਚ ਵੀ ਹਟਾਇਆ "
+"ਜਾਵੇਗਾ।\n"
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #  mail:account-incomplete secondary
@@ -15908,85 +14820,90 @@ msgstr "ਸੁੰਘੜੋ(_E)"
 msgid "_Open Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "ਨਾ-ਵੇਖੇ"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "ਵੇਖੇ"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "ਜਵਾਬ ਦਿੱਤੇ"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "ਅੱਗੇ ਭੇਜਿਆ"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹੁ ਨਾ-ਵੇਖੇ ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ਬਹੁ-ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "ਨਿਊਨਤਮ"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "ਘੱਟ"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ਅੱਜ %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "ਕੱਲ੍ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "ਕੋਈ ਸੁਨੇਹਾ ਤੁਹਾਡੀ ਖੋਜ ਮੁਤਾਬਕ ਨਹੀਂ ਹੈ। ਜਾਂ ਤਾਂ ਖੋਜ -> ਖੋਜ ਮੇਨੂ ਆਈਟਮ ਰਾਹੀਂ ਸਾਫ਼ ਕਰੋ ਜਾਂ ਬਦਲੋ ਜੀ।"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਕੇਵਲ ਲੁਕਵੇਂ ਸੁਨੇਹੇ ਹੀ ਹਨ। ਉਹਨਾਂ ਨੂੰ ਵੇਖਣ ਲਈ ਵੇਖੋ->ਲੁਕਵੇਂ ਸੁਨੇਹੇ ਵਰਤੋਂ।"
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
 
@@ -16016,6 +14933,7 @@ msgstr "ਭੇਜੇ ਸੁਨੇਹੇ"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "ਅਕਾਰ"
 
@@ -16023,39 +14941,39 @@ msgstr "ਅਕਾਰ"
 msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ਛੋਟਾ ਕੀਤਾ"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "ਕਾਲ"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "ਅੱਗੇ ਨਾ ਭੇਜੋ"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "ਸਹਾਇਕ"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਲਈ"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ਅੱਗੇ"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "ਕੋਈ ਜਵਾਬ ਲੋੜੀਦਾ ਨਹੀਂ ਹੈ"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "ਮੁੜ-ਜਾਂਚ"
 
@@ -16080,20 +14998,26 @@ msgid "Subject contains"
 msgstr "ਵਿਸ਼ੇ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
+#| msgid "Subject or Sender contains"
+msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../mail/searchtypes.xml.h:7
+msgid "Subject or Recipients contains"
+msgstr "ਵਿਸ਼ਾ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ 'ਚ ਹੈ"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "ਵਿਸ਼ਾ ਜਾਂ ਭੇਜਣ ਵਾਲਿਆਂ 'ਚ ਹੈ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ਸਥਾਨਕ ਐਡਰੈੱਸ-ਬੁੱਕ"
+#| msgid "List local address book folders"
+msgid "Add local address books to Evolution."
+msgstr "ਲੋਕਲ ਐਡਰੈੱਸ ਬੁੱਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
+msgid "Local Address Books"
+msgstr "ਲੋਕਲ ਐਡਰੈੱਸ-ਬੁੱਕ"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16107,8 +15031,8 @@ msgid ""
 "body."
 msgstr "ਅਟੈਚਮੈਂਟ ਰੀਮਾਈਡਰ ਪਲੱਗਇਨ ਵਲੋਂ ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਖੋਜ ਲਈ ਸੂਹਾਂ ਦੀ ਲਿਸਟ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -16118,10 +15042,8 @@ msgid "Attachment Reminder"
 msgstr "ਅਟੈਂਚਮੈਂਟ ਰੀਮਾਈਡਰ"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਅਟੈਚਮੈਂਟ ਦੀ ਸੂਹ ਲਵੋ ਅਤੇ ਜੇ ਅਟੈਚਮੈਂਟ ਨਾ ਹੋਵੇ ਤਾਂ ਚੇਤਾਵਨੀ ਦਿਓ"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ਤੁਹਾਨੂੰ ਯਾਦ ਕਰਵਾਉਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਮੇਲ ਸੁਨੇਹੇ ਵਿੱਚ ਕੁਝ ਅਟੈਚਮੈਂਟ ਕਰਨੀ ਭੁੱਲ ਤਾਂ ਨਹੀਂ ਗਏ।"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16133,25 +15055,26 @@ msgstr ""
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੋਈ ਅਟੈਂਚਮਿੰਟ ਨਹੀਂ ਹੈ"
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੋਈ ਅਟੈਂਚਮੈਂਟ ਨਹੀਂ ਹੈ"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਿਲ(_A)..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ(_E)"
 
 #: ../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 ""
-"ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ ਲਈ "
-"ਸਹਾਇਕ ਹੈ।"
+#| msgid "Audio inline plugin"
+msgid "Audio Inline"
+msgstr "ਆਡੀਓ ਇਨ-ਲਾਈਨ"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "ਆਡੀਓ ਇਨ-ਲਾਇਨ ਪਲੱਗ-ਇਨ"
+msgid "Play audio attachments directly from Evolution."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਤੋਂ ਆਡੀਓ ਅਟੈਚਮੈਂਟ ਸਿੱਧੀਆਂ ਚਲਾਓ।"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "ਈਵੂਲੇਸਨ ਬੈਕਅੱਪ ਫਾਇਲ ਦਾ ਨਾਂ ਚੁਣੋ"
 
@@ -16172,136 +15095,142 @@ msgid "Restore from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੋ"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣੇ ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰ ਸਕਦੇ ਹੋ। ਇਹ ਸਭ ਮੇਲਾਂ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ, ਸੰਪਰਕ ਆਦਿ "
-"ਨੂੰ ਰੀਸਟੋਰ ਕਰ ਸਕਦੈ ਹੈ।\n"
-"ਇਹ ਤੁਹਾਡੀ ਨਿੱਜੀ ਸੈਟਿੰਗ, ਮੇਲ ਫਿਲਟਰ ਆਦਿ ਵੀ ਰੀਸਟੋਰ ਕਰ ਸਕਦੀ ਹੈ।"
+"ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣੇ ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰ ਸਕਦੇ ਹੋ। ਇਹ ਸਭ ਮੇਲਾਂ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ, ਸੰਪਰਕ "
+"ਆਦਿ ਨੂੰ ਰੀਸਟੋਰ ਕਰ ਸਕਦੈ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਨਿੱਜੀ ਸੈਟਿੰਗ, ਮੇਲ ਫਿਲਟਰ ਆਦਿ ਵੀ ਰੀਸਟੋਰ ਕਰ ਸਕਦੀ ਹੈ।"
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "ਬੈਕਅੱਪ ਫਾਇਲ ਤੋ ਈਵੂਲੇਸ਼ਨ ਰੀਸਟੋਰ ਕਰੋ(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਈਵੂਲੇਸ਼ਨ ਅਕਾਇਵ ਚੁਣੋ ਜੀ:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "ਰੀਸਟੋਰ ਕਰਨ ਲਈ ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "ਬੈਕਅੱਪ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
-msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
+msgstr "ਰੀ-ਸਟੋਰ ਈਵੇਲੂਸ਼ਨ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ ਚੈੱਕ ਕਰੋ"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "ਗਰਾਫਿਕਲ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਨਾਲ"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
-msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਘ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਈਵੇਲੂਸ਼ਨ ਅਕਾਊਂਟ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, ਟਾਸਕ, ਮੀਮੋ)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "ਬੈਕਅੱਪ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਮੁੜ-ਚਾਲੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "ਬੈਕਅੱਪ ਤੋਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈਟਿੰਗ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "ਆਰਜ਼ੀ ਬੈਕਅੱਪ ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "ਲੋਕਲ ਸਰੋਤ ਯਕੀਨੀ ਬਣਾਏ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫੋਲਡਰ %s ਲਈ ਬੈਕਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ਫੋਲਡਰ %s ਤੋਂ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਰੀਸਟੋਰ"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "ਮੌਜੂਦਾ ਈਵੂਲੇਸ਼ਨ ਡਾਟਾ ਬੈਕਅੱਪ"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ਜਦੋਂ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲੈ ਰਹੀ ਹੈ ਤਾਂ ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ਈਵੈਲੂਸ਼ਨ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਡਾਟੇ ਨੂੰ ਰੀ-ਸਟੋਰ ਕਰਦੀ ਹੈ, ਉਦੋਂ ਤੱਕ ਉਡੀਕੋ ਜੀ।"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 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 "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪਰਾਪਤ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
+msgid "Backup and Restore"
+msgstr "ਬੈਕਅੱਪ ਅਤੇ ਰੀਸਟੋਰ"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪ੍ਰਾਪਤੀ ਪਲੱਗ-ਇਨ"
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਅਤੇ ਰੀਸਟੋਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16347,9 +15276,9 @@ msgid ""
 "restore, please enable the toggle button."
 msgstr ""
 "ਇਹ ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਨੂੰ ਹਟਾ ਦੇਵੇਗਾ ਅਤੇ ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਤੋਂ ਰੀਸਟੋਰ ਕਰੇਗਾ। ਈਵੇਲੂਸ਼ਨ "
-"ਰੀਸਟੋਰ ਤਾਂ ਹੀ ਸ਼ੁਰੂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇ ਈਵੇਲੂਸ਼ਨ ਚੱਲ ਨਾ ਰਹੀ ਹੋਵੇ। ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਸੀਂ ਅੱਗੇ ਵਧਣ ਤੋਂ ਪਹਿਲਾਂ "
-"ਸਭ ਅਣ-ਸੰਭਾਲੀਆਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਪਹਿਲਾਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਰੀਸਟੋਰ ਦੇ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਹੀ "
-"ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਇਹ ਬਟਨ ਚਾਲੂ ਕਰੋ।"
+"ਰੀਸਟੋਰ ਤਾਂ ਹੀ ਸ਼ੁਰੂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇ ਈਵੇਲੂਸ਼ਨ ਚੱਲ ਨਾ ਰਹੀ ਹੋਵੇ। ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਸੀਂ ਅੱਗੇ ਵਧਣ ਤੋਂ "
+"ਪਹਿਲਾਂ ਸਭ ਅਣ-ਸੰਭਾਲੀਆਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਪਹਿਲਾਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਰੀਸਟੋਰ ਦੇ ਬਾਅਦ "
+"ਆਟੋਮੈਟਿਕ ਹੀ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਇਹ ਬਟਨ ਚਾਲੂ ਕਰੋ।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16363,74 +15292,83 @@ msgstr "ਸੈਟਿੰਗ ਰੀਸਟੋਰ(_e)..."
 msgid "_Backup Settings..."
 msgstr "ਬੈਕਅੱਪ ਸੈਟਿੰਗ(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "ਸੁਨੇਹਿਆਂ ਦੇ ਜਵਾਬ ਦੇਣ ਸਮੇਂ ਖੁਦ ਹੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
+msgstr "ਪੱਤਰ ਭੇਜਣ ਸਮੇਂ ਖੁਦ ਹੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਐਂਟਰੀ ਬਣਾ ਲਵੋ(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "ਆਟੋਮੈਟਿਕ ਸੰਪਰਕਾਂ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "ਝੱਟਪਟ ਸੁਨੇਹੇ ਸੰਪਰਕ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਨਿਯਮਤ ਤੌਰ ਉੱਤੇ ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਨਾਲ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਅਤੇ ਚਿੱਤਰਾਂ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਦੇ ਰਹੋ"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡਗਿਨ ਬੱਡੀ ਸੂਚੀ ਲਈ ਐਡਰੈੱਸ-ਬੁੱਕ ਚੁਣੋ"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
-msgstr "ਭਾਈ ਸੂਚਨਾ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ(_b)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"ਤੁਹਾਡੀ ਐਡਰੈੱਸ ਬੁੱਕ ਦੇ ਪਰਬੰਧ ਕਰਨ ਦੇ ਭਿਆਨਕ ਭਾਗ ਦਾ ਧਿਆਨ ਰੱਖਦੀ ਹੈ।\n"
+"\n"
 "ਜਿਵੇਂ ਹੀ ਤੁਸੀਂ ਕਿਸੇ ਈ-ਮੇਲ ਦਾ ਜਵਾਬ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਐਡਰੈੱਸ-ਬੁੱਕ ਵਿੱਚ ਨਾਂ ਅਤੇ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿੱਚ "
 "ਜਾਣਕਾਰੀ ਆਪਣੇ ਆਪ ਹੀ ਭਰ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਹਾਡੀ ਬੱਡੀ ਸੂਚੀ ਤੋਂ IM ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਭਰ ਦਿੱਤੀ "
 "ਜਾਵੇਗੀ।"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ਸਵੈਪ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ਬੋਗੋਫਿਲਟਰ ਚਲਾਈਡ ਪਰੋਸੈਸ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ, ਕਿਲ (kill) ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ਬੋਗੋਫਿਲਟਰ ਚਲਾਈਡ ਪਰੋਸੈਸ ਦਖਲ ਦੀ ਉਡੀਕ ਜਾਰੀ, ਖਤਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ਬੋਗੋਫਿਲਟਰ ਲਈ ਪਾਈਪ ਫੇਲ੍ਹ ਹੈ, ਗਲਤੀ ਕੋਡ: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "ਮੇਲ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ 'ਚ ਬਦਲੋ(_U)"
 
@@ -16446,73 +15384,118 @@ msgstr ""
 "ਸੁਨੇਹੇ ਟੈਕਸਟ ਨੂੰ ਯੂਨੀਕੋਡ UTF-੮ ਤੋਂ ਯੂਨੀਫਾਈ ਸਪਮ/ਹਮ ਟੋਕਨ ਵਿੱਚ ਬਦਲੋ, ਜੋ ਕਿ ਵੱਖਰੇ ਅੱਖਰ ਸੈੱਟ ਤੋਂ ਆਉਦੇ ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter ਚੋਣਾਂ"
+#| msgid "Bogofilter junk plugin"
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter ਜੰਕ ਫਿਲਟਰ"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter ਜੰਕ ਪਲੱਗਇਨ"
+msgid "Bogofilter Options"
+msgstr "Bogofilter ਚੋਣਾਂ"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰੋ।"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤੋਂ"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "ਮੁੜ-ਤਾਜ਼ਾ(_f):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "ਹਫਤੇ"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV ਕੈਲੰਡਰ ਸਰੋਤ"
+msgid "Add CalDAV support to Evolution."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ CalDAV ਸਹਿਯੋਗ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV ਸਰੋਤ"
+#| msgid "CalDAV sources"
+msgid "CalDAV Support"
+msgstr "CalDAV ਸਹਿਯੋਗ"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+#| msgid "Customize"
+msgid "_Customize options"
+msgstr "ਚੋਣਾਂ ਲਈ ਪਸੰਦ(_C)"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+#| msgid "File name:"
+msgid "File _name:"
+msgstr "ਫਾਇਲ ਨਾਂ(_n):"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#| msgid "Choose a file"
+msgid "Choose calendar file"
+msgstr "ਕੈਲੰਡਰ ਫਾਇਲ ਚੁਣੋ"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#| msgid "Open"
+msgid "On open"
+msgstr "ਖੋਲ੍ਹਣ ਸਮੇਂ"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "ਫਾਇਲ ਬਦਲਣ ਸਮੇਂ"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#| msgid "Personal"
+msgid "Periodically"
+msgstr "ਨਿਯਮਤ"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ ਮਜਬੂਰ(_o)"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ"
+msgid "Add local calendars to Evolution."
+msgstr "ਲੋਕਲ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+msgid "Local Calendars"
+msgstr "ਲੋਕਲ ਕੈਲੰਡਰ"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_m):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP ਕੈਲੰਡਰ"
+msgid "Add web calendars to Evolution."
+msgstr "ਵੈੱਬ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "ਵੈਬ-ਕੈਲ ਅਤੇ http ਕੈਲੰਡਰਾਂ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+#| msgid "Calendars"
+msgid "Web Calendars"
+msgstr "ਵੈੱਬ ਕੈਲੰਡਰ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16548,125 +15531,123 @@ msgstr "ਮੌਸਮ: ਸਾਫ਼ ਰਾਤ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
-msgstr "ਮੌਸਮ: ਬਫ਼ਰੀਲਾ ਤੂਫਾਨ"
+msgstr "ਮੌਸਮ: ਬਰਫ਼ੀਲਾ ਤੂਫਾਨ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "ਇੱਕ ਟਿਕਾਣਾ ਚੁਣੋ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "ਇਕਾਈ(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮੀਟਰਿਕ (ਸੈਂਲਸੀਅਸ, ਸੈਂਮੀ, ਆਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ਇੰਪੀਰਿਲ (ਫਾਰਨਹੀਂਟ, ਇੰਚ ਆਦਿ)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "ਮੌਸਮ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+msgid "Add weather calendars to Evolution."
+msgstr "ਮੌਸਮ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "ਮੌਸਮ ਕੈਲੰਡਰ"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"ਇੱਕ ਟੈਕਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ ਦੀ "
-"ਕਾਪੀ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+#| msgid "Copy tool"
+msgid "Copy Tool"
+msgstr "ਟੂਲ ਕਾਪੀ ਕਰੋ"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "ਸੰਦ ਨਕਲ"
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy things to the clipboard."
+msgstr "ਚੀਜ਼ਾਂ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ।"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਈਵੇਲੂਸ਼ਨ ਮੂਲ ਪੱਤਰ ਕਾਰਜ ਹੈ"
+msgstr "ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਈਵੇਲੂਸ਼ਨ ਡਿਫਾਲਟ ਮੇਲਰ ਹੈ"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "ਹਰ ਵਾਰ ਜਦੋਂ ਵੀ ਈਵੇਲੂਸ਼ਨ ਚੱਲ ਤਾਂ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਮੂਲ ਪੱਤਰ ਕਾਰਜ ਹੈ ਜਾਂ ਨਹੀਂ।"
+msgstr "ਹਰ ਵਾਰ ਜਦੋਂ ਵੀ ਈਵੇਲੂਸ਼ਨ ਚੱਲ ਤਾਂ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਡਿਫਾਲਟ ਮੇਲਰ ਹੈ ਜਾਂ ਨਹੀਂ।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "ਚੱਲਣ ਸਮੇਂ ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਈਵੇਲੂਸ਼ਨ ਮੂਲ ਪੱਤਰ ਕਲਾਂਈਟ ਹੈ।"
+#| msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "ਚੱਲਣ ਸਮੇਂ ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਈਵੇਲੂਸ਼ਨ ਡਿਫਾਲਟ ਮੇਲ ਕਲਾਇਟ ਹੈ।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "ਮੂਲ ਪੱਤਰ ਕਲਾਂਈਟ "
+#| msgid "Default Mail Client "
+msgid "Default Mail Client"
+msgstr "ਡਿਫਾਲਟ ਮੇਲ ਕਲਾਇਟ"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ਕੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਆਪਣਾ ਮੂਲ ਈ-ਮੇਲ ਕਲਾਂਈਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲਟ ਐਡਰੈੱਸ ਬੁੱਕ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "ਡਿਫਾਲਟ ਕੈਲੰਡਰ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "ਡਿਫਾਲਟ ਟਾਸਕ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "ਡਿਫਾਲਟ ਮੀਮੋ ਲਿਸਟ ਵਾਂਗ ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "ਮੂਲ ਸਰੋਤ"
+msgstr "ਡਿਫਾਲਟ ਸਰੋਤ"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "ਇੱਕ ਕੈਲੰਡਰ ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਡਿਫਾਲਟ ਬਣਾਉਣ ਲਈ ਸਹੂਲਤ ਦਿੰਦੀ ਹੈ"
+msgid "Mark your preferred address book and calendar as default."
+msgstr "ਤੁਹਾਡੀ ਪਸੰਦੀਦਾ ਦਾ ਐਡਰੈੱਸ ਬੁੱਕ ਅਤੇ ਕੈਲੰਡਰ ਨੂੰ ਡਿਫਾਲਟ ਬਣਾਓ।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "ਸੁਰੱਖਿਆ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "ਬਿਨਾਂ-ਵਰਗ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "ਸੁਰੱਖਿਅਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "ਗੁਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "ਬਹੁਤ ਗੁਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "ਕੀ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "ਮੁੱਲ"
 
@@ -16685,8 +15666,9 @@ msgstr "ਈਮੇਲ ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਸ਼ਾਮਲ"
+#| msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16694,7 +15676,7 @@ msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
-msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਦੀ ਸੂਚੀ"
+msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ ਦੀ ਲਿਸਟ"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16703,12 +15685,11 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 "ਕੁੰਜੀ ਕਸਟਮ ਹੈੱਡਰਾਂ ਦੀ ਲਿਸਟ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਬਾਹਰ ਭੇਜ ਰਹੇ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ। "
-"ਇੱਕ ਹੈੱਡਰ ਜਾਂ ਹੈੱਡਰ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ: \"=\" ਦੇ ਬਾਅਦ ਕਸਟਮ ਹੈੱਡਰ ਦਾ ਨਾਂ ਅਤੇ ਮੁੱਲ \";\" "
-"ਨਾਲ ਵੱਖ।"
+"ਇੱਕ ਹੈੱਡਰ ਜਾਂ ਹੈੱਡਰ ਮੁੱਲ ਦੇਣ ਲਈ ਫਾਰਮੈਟ: \"=\" ਦੇ ਬਾਅਦ ਕਸਟਮ ਹੈੱਡਰ ਦਾ ਨਾਂ ਅਤੇ ਮੁੱਲ \";\" ਨਾਲ ਵੱਖ।"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰ ਖੋਲੋ"
+msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰ ਖੋਲ੍ਹੋ"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
@@ -16744,11 +15725,11 @@ msgid ""
 "password authentication."
 msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਐਕਸ਼ਚੇਜ਼ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਜੋੜੇਗੀ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "ਦਫਤਰੋਂ ਬਾਹਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 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."
@@ -16756,90 +15737,93 @@ msgstr ""
 "ਹੇਠਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਸੁਨੇਹਾ ਆਟੋਮੈਟਿਕ ਹੀ ਉਹਨਾਂ ਸਾਰੇ ਪੱਤਰ ਭੇਜਣ ਵਾਲਿਆਂ ਨੂੰ ਭੇਜ ਦਿੱਤਾ\n"
 "ਜਾਵੇਗਾ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਦਫਤਰੋਂ ਬਾਹਰ ਹੋਣ ਦੀ ਸੂਰਤ ਵਿੱਚ ਪੱਤਰ ਭੇਜਣ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਤੋਂ ਬਾਹਰ ਹਾਂ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "ਮੈਂ ਦਫ਼ਤਰ ਵਿੱਚ ਹਾਂ"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "ਪਾਸਵਰਡ ਤਬਦੀਲ"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "ਐਕਸਚੇਜ਼ ਅਕਾਊਂਟ ਲਈ ਡੈਲੀਗੇਟ ਸੈਟਿੰਗ ਪਰਬੰਧਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "ਡੈਲੀਗੇਸ਼ਨ ਸਹਾਇਕ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "ਫੁਟਕਲ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "ਸਭ ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰਾਂ ਦਾ ਅਕਾਰ ਵੇਖਾਓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਸੈਟਿੰਗ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "ਮੇਲਬਾਕਸ ਨਾਂ ਦਿਓ(_p)"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "ਮੇਲਬਾਕਸ ਨਾਂ ਯੂਜ਼ਰ ਨਾਂ ਤੋਂ ਵੱਖਰਾ ਹੈ(_d)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "ਮੇਲਬਾਕਸ(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿਕਤਾ ਟਾਈਪ(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "ਅਕਾਰ:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16880,38 +15864,35 @@ msgstr "ਨਵਾਂ ਪਾਸਵਰਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਪਾਸਵਰਡ ਹੁਣੇ ਬਦਲੋ।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "ਪਸੰਦੀਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "ਸੰਪਾਦਕ (ਪੜਨ, ਲਿਖਣ, ਸੋਧਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "ਲੇਖਕ (ਪੜਨ, ਲਿਖਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "ਪੜਚੋਲਕਰਤਾ (ਪੜਨ ਲਈ ਹੀ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਅਧਿਕਾਰ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ਲਈ ਅਧਿਕਾਰ"
@@ -16919,7 +15900,7 @@ msgstr "%s ਲਈ ਅਧਿਕਾਰ"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16929,84 +15910,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "ਤੁਹਾਨੂੰ ਮੇਰੇ ਫੋਲਡਰ ਲਈ ਹੇਠ ਦਿੱਤੇ ਅਧਿਕਾਰ ਦਿੱਤੇ ਗਏ ਹਨ:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "ਤੁਹਾਨੂੰ ਮੇਰੀਆਂ ਪ੍ਰਾਈਵੇਟ ਆਈਟਮਾਂ ਵੇਖਣ ਦਾ ਵੀ ਅਧਿਕਾਰ ਹੈ।"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "ਪਰ ਤੁਹਾਨੂੰ ਮੇਰੀਆਂ ਪ੍ਰਾਈਵੇਟ ਆਈਟਮਾਂ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ਤੁਹਾਨੂੰ %s ਲਈ ਇੱਕ ਡੈਲੀਗੇਟ ਦਾ ਅਹੁਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "ਇਸ ਲਈ ਪ੍ਰਤੀਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "ਕੀ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਦੀ ਲਈ ਪਹੁੰਚ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਖੁਦ ਨੂੰ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ਸਰਗਰਮ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ %s ਪ੍ਰਤੀਨਿਧ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ਪ੍ਰਤੀਨਿਧਾਂ ਸੂਚੀ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕੀ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ਪ੍ਰਤੀਨਿਧ %s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "ਪ੍ਰਤੀਨਿਧ ਸੂਚੀ ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "ਕੈਲੰਡਰ(_a):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "ਸੰਪਰਕ(_n):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "ਪ੍ਰਤੀਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"ਕੋਈ ਨਹੀਂ\n"
+"ਰੀਵਿਊਰ (ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ)\n"
+"ਲੇਖਕ (ਪੜ੍ਹਨ, ਬਣਾਉ)\n"
+"ਐਡੀਟਰ (ਪੜ੍ਹਨ, ਬਣਾਉ, ਸੋਧਣ)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "ਅਧਿਕਾਰ ਨਹੀ ਹੈ"
 
@@ -17033,6 +16026,7 @@ msgstr "ਸੰਖੇਪ ਅਧਿਕਾਰ(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "ਕੰਮ(_T):"
 
@@ -17050,11 +16044,11 @@ msgid "Folder Size"
 msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "ਯੂਜ਼ਰ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂਬਰ ਬਣਾਓ"
@@ -17063,20 +16057,20 @@ msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਫੋਲਡਰਾਂ ਲਈ ਮੈਂ�
 msgid "Exchange Folder Tree"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
@@ -17141,18 +16135,18 @@ msgstr "ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ੭ ਦਿਨ�
 msgid "_Change Password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "ਯੂਜ਼ਰ ਜੋੜੋ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ"
 
@@ -17270,11 +16264,11 @@ msgstr "ਸੰਵੇਦਨਸ਼ੀਲਤਾ(_S): "
 msgid "_User"
 msgstr "ਯੂਜ਼ਰ(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "ਯੂਜ਼ਰ ਚੁਣੋ"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ..."
 
@@ -17287,10 +16281,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਦੇ ਕੈਲੰਡਰ ਦੇ ਮੈਂਬਰ ਬਣੋ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਨਾਲ ਸਬੰਧਤ ਖਾਸ ਕਾਰਵਾਈਆਂ ਅਤੇ ਫੀਚਰ ਦੇ ਸਮੂਹ ਨੂੰ ਹੈਂਡਲ ਕਰਦੀ ਹੈ।"
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "ਈਵੇਲੂਸ਼ਨ-ਐਕਸਚੇਜ਼ ਇਕਸਟੈਨਸ਼ਨ ਪੈਕੇਜ ਐਕਟੀਵੇਟ ਕਰੋ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17438,7 +16430,7 @@ msgid "Folder offline"
 msgstr "ਫੋਲਡਰ ਆਫਲਾਇਨ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "ਸਧਾਰਨ ਗਲਤੀ"
 
@@ -17556,7 +16548,9 @@ msgid "Unknown error looking up {0}"
 msgstr "ਖੋਜ {0} ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਹੈ।"
 
@@ -17635,65 +16629,88 @@ msgid "Check folder permissions"
 msgstr "ਫੋਲਡਰ ਅਧਿਕਾਰ ਚੈੱਕ ਕਰੋ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "ਜਦੋਂ ਮੇਲ ਕੰਪੋਜ਼ਰ ਵਿੱਚ ਸਵਿੱਚ ਦੱਬੀ ਜਾਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਐਡੀਟਰ ਚਲਾਓ"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "ਜਦੋਂ  ਵੀ ਨਵੀਂ ਮੇਲ ਲਿਖਣੀ ਸ਼ੁਰੂ ਹੋਵੇ ਤਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਚਲਾਓ"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "ਡਿਫਾਲਟ ਬਾਹਰੀ ਐਡੀਟਰ"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "ਮੂਲ ਕਮਾਂਡ, ਜੋ ਕਿ ਐਡੀਟਰ ਵਜੋਂ ਵਰਤੀ ਜਾਣੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਨੂੰ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਵਰਤਣ ਲਈ ਪਲੱਗਇਨ। ਤੁਸੀਂ ਕੇਵਲ ਸਮਤਲ-ਪਾਠ ਸੁਨੇਹੇ ਹੀ ਭੇਜ ਸਕਦੇ ਹੋ।"
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "ਬਾਹਰੀ ਐਡੀਟਰ"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਨੂੰ ਪਲੇਨ-ਟੈਕਸਟ ਮੇਲ ਸੁਨੇਹੇ ਲਿਖਣ ਲਈ ਵਰਤੋਂ।"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "ਆਰਜ਼ੀ ਫਾਇਲ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "ਐਡੀਟਰ ਚੱਲਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੀ ਮੇਲ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਆਰਜ਼ੀ ਫਾਈਲ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#| msgid "External Editor"
+msgid "External editor still running"
+msgstr "ਬਾਹਰੀ ਐਡੀਟਰ ਹਾਲੇ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"ਬਾਹਰੀ ਸੰਪਾਦਕ ਹਾਲੇ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ। ਮੇਲ ਕੰਪੋਜ਼ਰ ਵਿੰਡੋ ਸੰਪਾਦਕ ਦੇ ਚੱਲਦੇ ਰਹਿਣ ਦੀ ਹਾਲਤ ਵਿੱਚ "
+"ਬੰਦ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"ਤੁਹਾਡੀ ਪਲੱਗਇਨ ਪਸੰਦ ਵਿੱਚ ਬਾਹਰੀ ਐਡੀਟਰ ਸੈੱਟ ਕੀਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇੱਕ ਵੱਖਰਾਐਡੀਟਰ "
-"ਸੈੱਟ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ। "
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "ਬਾਹਰੀ ਐਡੀਟਰ ਵਿੱਚ ਕੰਪੋਜ਼ ਕਰੋ(_E)"
+"ਤੁਹਾਡੀ ਪਲੱਗਇਨ ਪਸੰਦ ਵਿੱਚ ਬਾਹਰੀ ਐਡੀਟਰ ਸੈੱਟ ਕੀਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਇੱਕ ਵੱਖਰਾ "
+"ਐਡੀਟਰ ਸੈੱਟ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ। "
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "ਸੁਨੇਹੇ ਬਾਹਰੀ ਐਡੀਟਰ ਨਾਲ ਲਿਖੋ"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "ਐਡੀਟਰ ਚਾਲੂ ਕਰਨ ਲਈ ਚਲਾਉਣ ਵਾਸਤੇ ਕਮਾਂਡ:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim\""
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs ਲਈ \"xemacs\" ਵਰਤੋਂ\n"
-"VI ਲਈ \"gvim\" ਵਰਤੋਂ"
+"VI ਲਈ \"gvim -f\" ਵਰਤੋਂ"
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#| msgid "Compose in _External Editor"
+msgid "Compose in External Editor"
+msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ ਵਿੱਚ ਲਿਖੋ"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17708,38 +16725,51 @@ msgid "_Face"
 msgstr "ਫੇਸ(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#| msgid ""
+#| "Attach Face header to outgoing messages. First time the user needs to "
+#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#| "evolution/faces This will be used in messages that are sent further."
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਫੇਸ ਹੈੱਡਰ ਅਟੈਚ ਹੈ। ਪਹਿਲੀ ਵਾਰ ਯੂਜ਼ਰ ਨੂੰ ੪੮*੪੮ png ਚਿੱਤਰ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ "
-"ਹੁੰਦੀ ਹੈ। ਇਸ ਬੇਸ੬੪ ਇੰਕੋਡ ਮੁਤਾਬਕ ਹੈ ਅਤੇ ~/.evolution/faces ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾਂਦਾ ਹੈ। ਇਸ ਨੂੰ ਭੇਜਣ "
-"ਲਈ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+"ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਛੋਟੀ ਜਿਹੀ ਤਸਵੀਰ ਬਾਹਰ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹਿਆਂ ਨਾਲ ਅਟੈਚ ਕਰੋ\n"
+"\n"
+"ਪਹਿਲੀ ਵਾਰ ਯੂਜ਼ਰ ਨੂੰ ੪੮*੪੮ png ਚਿੱਤਰ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ "
+"ਹੁੰਦੀ ਹੈ। ਇਸ ਬੇਸ੬੪ (Base-64) ਇੰਕੋਡ ਮੁਤਾਬਕ ਹੈ ਅਤੇ ~/.evolution/faces ਵਿੱਚ "
+"ਸੰਭਾਲਿਆ ਜਾਂਦਾ ਹੈ। ਇਸ ਨੂੰ ਭੇਜਣ ਲਈ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "ਫੋਲਡਰ \"%s\" ਅਮਨਜ਼ੂਰ"
+msgstr "ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "ਫੋਲਡਰ ਲੜੀ ਪਰਸੰਗ ਮੇਨੂ ਵਿੱਚ ਪੱਤਰ ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "ਫੋਲਡਰ ਮੈਂਬਰੀ ਹਟਾਓ"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "IMAP ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਫੋਲਡਰ ਲੜੀ ਵਿੱਚ ਸੱਜਾ ਕਲਿੱਕ ਕਰੋ"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "ਗੂਗਲ"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ਯੂਜ਼ਰ %s ਨੂੰ ਮੈਂਬਰੀ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਅਸੈਸ ਲਿਸਟ ਲਈ ਪਾਸਵਰਡ ਦਿਓ।"
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17748,45 +16778,41 @@ msgstr ""
 "ਗੂਗਲ ਸਰਵਰ ਤੋਂ ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "ਕੈਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ(_l)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "ਗੂਗਲ"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>ਸਰਵਰ</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+msgid "Add Google Calendars to Evolution."
+msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
+#| msgid "Gnome Calendar"
+msgid "Google Calendars"
 msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "ਜਾਂਚ ਲਿਸਟ"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਈਜ਼ ਸਹਿਯੋਗ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "ਗਰੁੱਪਵਾਈਜ ਅਕਾਊਂਟ ਸੈਟਅੱਪ"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17811,11 +16837,11 @@ msgstr ""
 "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ 'ਅੱਗੇ' ਦਬਾਓ\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲ ਕਰੋ"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "ਸਾਂਝਾ ਫੋਲਡਰ ਇੰਸਟਾਲੇਸ਼ਨ"
 
@@ -17853,11 +16879,11 @@ msgstr "ਯੋਗ(_E)"
 msgid "_Junk List"
 msgstr "ਜੰਕ ਲਿਸਟ(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -17865,11 +16891,11 @@ msgstr ""
 "ਇੱਕ ਸੁਨੇਹੇ ਨੂੰ ਮੁੜ-ਜਾਂਚਣ ਨਾਲ ਇਸ ਨੂੰ ਪ੍ਰਾਪਤ-ਕਰਤਾ ਦੇ ਮੇਲ ਬਕਸੇ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਇਹ ਕਰਨ "
 "ਲਈ ਯਕੀਨੀ ਹੋ?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "ਸੁਨੇਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮੁੜ-ਖੋਜਿਆ ਗਿਆ"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "ਪੱਤਰ ਮੁੜ-ਜਾਂਚ"
 
@@ -17878,92 +16904,130 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਸੁਨੇਹਿਆਂ ਲਈ ਭੇਜਣ ਚੋਣਾਂ ਸ਼ਾਮਲ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "ਗਰੁੱਪਵਾਇਜ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "ਆਪਣੇ ਗਰੁੱਪਵਾਇਜ ਅਕਾਊਂਟ ਵਿੱਚ ਸੁਧਾਰ ਕਰੋ।"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "ਗਰੁੱਪਵਾਇਜ ਫੀਚਰ"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "ਸੁਨੇਹਾ ਪਿੱਛਾ ਖੋਜ ਫੇਲ੍ਹ ਹੋਈ"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "ਸਰਵਰ ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਪਿੱਛਾ-ਖੋਜ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#  mail:no-rename-folder-exists secondary
+#  mail:vfolder-notunique secondary
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "ਅਕਾਊਂਟ &quot;{0}&quot; ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਆਪਣਾ ਫੋਲਡਰ ਟਰੀ ਚੈਕ ਕਰੋ ਜੀ।"
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "ਅਕਾਊਂਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "ਗਲਤ ਯੂਜ਼ਰ"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"&quot;{0}&quot; ਵਜੋਂ ਪਰਾਕਸੀ ਲਾਗਇਨ ਫੇਲ੍ਹ ਰਿਹਾ। ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਚੈੱਕ ਕਰੋ ਅਤੇ ਮੁੜ-ਲਾਗਇਨ ਦੀ "
+"ਟਰਾਈ ਕਰੋ।"
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "ਯੂਜ਼ਰ &quot;{0}&quot; ਲਈ ਪਰਾਕਸੀ ਅਸੈੱਸ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕੀ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "ਯੂਜ਼ਰ ਦਿਓ"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "ਤੁਸੀਂ ਇਸ ਯੂਜ਼ਰ ਲਈ ਪਹਿਲਾਂ ਹੀ ਪਰਾਕਸੀ ਅਦਿਕਾਰ ਦਿੱਤੇ ਹਨ।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਹੱਕ ਦੇਣ ਲਈ ਇੱਕ ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ।"
 
-#  mail:no-rename-folder-exists secondary
-#  mail:vfolder-notunique secondary
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "ਅਕਾਊਂਟ &quot;{0}&quot; ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਆਪਣਾ ਫੋਲਡਰ ਟਰੀ ਚੈਕ ਕਰੋ ਜੀ।"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "ਤੁਸੀਂ ਦਿੱਤੇ ਯੂਜ਼ਰ &quot;{0}&quot; ਨਾਲ ਇਹ ਫੋਲਡਰ ਸਾਂਝਾ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#  XXX we shouldn't be popping up dialogs in this code.
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "ਅਕਾਊਂਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "ਤੁਹਾਨੂੰ ਇਕ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ, ਜੋ ਕਿ ਲਿਸਟ ਵਿੱਚ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"&quot;{0}&quot; ਵਜੋਂ ਪਰਾਕਸੀ ਲਾਗਇਨ ਫੇਲ੍ਹ ਰਿਹਾ। ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਚੈੱਕ ਕਰੋ ਅਤੇ ਮੁੜ-ਲਾਗਇਨ ਦੀ "
-"ਟਰਾਈ ਕਰੋ।"
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਮੀਟਿੰਗ ਮੁੜ-ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਮੁੜ-ਹੋਣ ਵਾਲੀ ਮੀਟਿੰਗ ਫੇਰ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to retract the original item ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਅਸਲੀ ਆਈਟਮਾਂ ਨੂੰ ਮੁੜ-ਜਾਂਚਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "ਅਸਲੀ ਨੂੰ ਪ੍ਰਾਪਤ ਕਰਤਾ ਦੇ ਮੇਲ-ਬਾਕਸ ਵਿੱਚੋਂ ਵੀ ਹਟਾਇਆ ਜਾਵੇਗਾ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "ਇਹ ਮੁੜ-ਹੋਣ ਵਾਲੀ ਮੀਟਿੰਗ ਹੈ"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "ਇਹ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵੇਰਵੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਏਗਾ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"ਇਹ ਮੌਜੂਦਾ ਮੀਟਿੰਗ ਵੇਰਵੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਏਗਾ। ਮੁੜ-ਹੋਣ ਵਾਲਾ ਨਿਯਮ "
+"ਮੁੜ-ਲਿਖਣ ਦੀ ਲੋੜ ਹੈ।"
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਮਨਜ਼ੂਰ ਕਰਦੇ ਹੋ?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਲਈ ਇਨਕਾਰ ਕਰਦੇ ਹੋ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "ਤੁਸੀਂ ਦਿੱਤੇ ਯੂਜ਼ਰ &quot;{0}&quot; ਨਾਲ ਇਹ ਫੋਲਡਰ ਸਾਂਝਾ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "ਤੁਹਾਨੂੰ ਇਕ ਯੂਜ਼ਰ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ, ਜੋ ਕਿ ਲਿਸਟ ਵਿੱਚ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "ਅਜ਼ਮਾਇਸੀ ਆਰਜ਼ੀ"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "ਮੀਟਿੰਗ ਮੁੜ-ਭੇਜੋ(_n)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ਯੂਜ਼ਰ :</b>"
@@ -17977,7 +17041,7 @@ msgid "Con_tacts..."
 msgstr "ਸੰਪਰਕ(_t)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
@@ -18060,10 +17124,10 @@ msgstr "<b>ਅਕਾਊਂਟ ਨਾਂ</b>"
 msgid "Proxy Login"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਇਨ"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%1$s %2$s (ਯੂਜ਼ਰ %3$s) ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
@@ -18071,17 +17135,17 @@ msgstr "%1$s %2$s (ਯੂਜ਼ਰ %3$s) ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "ਪਰਾਕਸੀ ਲਾਗਇਨ(_P)..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਆਨਲਾਇਨ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਯੋਗ ਹੋਇਆ ਤਾਂ ਹੀ ਪਰਾਕਸੀ ਟੈਬ ਉਪਲੱਬਧ ਹੋਵੇਗੀ।"
 
@@ -18089,102 +17153,102 @@ msgstr "ਜੇਕਰ ਅਕਾਊਂਟ ਯੋਗ ਹੋਇਆ ਤਾਂ ਹੀ
 msgid "Advanced send options"
 msgstr "ਤਕਨੀਕੀ ਭੇਜਣ ਚੋਣਾਂ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "ਯੂਜ਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "ਯੂਜ਼ਰ ਦਿਓ ਅਤੇ ਅਧਿਕਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "ਨਵਾਂ ਸਾਂਝਾ ਫੋਲਡਰ(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "ਸਾਂਝ"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "ਕਸਟਮ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "ਸੋਧ"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "ਸੁਨੇਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "ਵਲੋਂ:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "ਲਿਖਣ ਮਿਤੀ:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ਕੀਤੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "ਖੋਲ੍ਹੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "ਮਨਜ਼ੂਰ ਕੀਤੇ: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "ਹਟਾਏ: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "ਇਨਕਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "ਪੂਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "ਅਣ-ਡਿਲਵਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 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 "ਹੁਲਾ ਕੈਲੰਡਰ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+msgid "Add Hula support to Evolution."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਲਈ ਹੁਲਾ ਸਹਿਯੋਗ ਸ਼ਾਮਲ।"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "ਹੂਲਾ ਅਕਾਊਂਟ ਸੈੱਟਅੱਪ"
+msgid "Hula Support"
+msgstr "ਹੁਲਾ ਸਹਿਯੋਗ"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "ਪਸੰਦੀਦਾ ਹੈੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP ਹੈੱਡਰ"
 
@@ -18201,10 +17265,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ਮੁੱਢਲੇ ਅਤੇ ਮੇਲਿੰਗ ਸੂਚੀ ਹੈੱਡਰ (ਮੂਲ) (_M)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_l)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18213,7 +17273,7 @@ msgstr ""
 "ਵਾਧੂ ਹੈੱਡਰ ਦਿੰਦੀ ਹੈ, ਜਿਸ ਦੀ ਤੁਹਾਨੂੰ ਸਟੈਂਡਰਡ ਹੈੱਡਰ ਵਿੱਚ ਜੋੜਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n"
 "ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਦੇ ਹੋ ਜੇ ਤੁਸੀਂ \"ਸਭ ਹੈੱਡਰ\" ਦੀ ਚੋਣ ਕਰਦੇ ਹੋ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18221,7 +17281,7 @@ msgstr ""
 "ਆਪਣੀ IMAP ਹੈੱਡਰ ਪਸੰਦ ਚੁਣੋ। \n"
 "ਜਿੰਨੇ ਹੈੱਡਰ ਵੱਧ ਉਨ੍ਹਾਂ ਹੀ ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਉੱਤੇ ਸਮਾਂ ਲੱਗੇਗਾ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18229,53 +17289,24 @@ msgstr ""
 "ਮੂਲ ਹੈੱਡਰ - (ਸਭ ਤੋਂ ਤੇਜ਼) (_B)\n"
 "ਇਹ ਚੁਣੋ, ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਮੇਲਿੰਗ ਸੂਚੀ ਉੱਤੇ ਅਧਾਰਿਤ ਫਿਲਟਰ ਨਹੀਂ ਹਨ"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#| msgid "Fetch A_ll Headers"
+msgid "_Fetch All Headers"
+msgstr "ਸਭ ਹੈੱਡਰ ਲਵੋ(_F)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "IMAP ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
+msgid "Fine-tune your IMAP accounts."
+msgstr "ਆਪਣੇ IMAP ਅਕਾਊਂਟ ਵਿੱਚ ਸੁਧਾਰ ਕਰੋ।"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP ਫੀਚਰ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "ਕੈਲੰਡਰ ਆਯਾਤ(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "ਕੰਮ ਆਯਾਤ(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "ICS ਆਯਾਤ"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "ਕੰਮ ਸੂਚੀ ਚੁਣੋ"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "ਕੈਲੰਡਰ ਚੁਣੋ"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "ਆਯਾਤ(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "ਆਯਾਤ ਲਈ ਕੈਲੰਡਰ"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS ਨੱਥੀ ਕੈਲੰਡਰ ਲਈ ਆਯਾਤ ਕਰੋ।"
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "ਹਾਰਡਵੇਅਰ ਅਬਸਟਸ਼ਨ ਲੇਅਰ ਲੋਡ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18283,7 +17314,7 @@ msgstr ""
 "\"hald\" ਸਰਵਿਸ ਲੋੜੀਦੀ ਸੀ, ਪਰ ਇਸ ਵੇਲੇ ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ। ਸਰਵਿਸ ਯੋਗ ਕਰੋ ਅਤੇ ਇਹ ਪਰੋਗਰਾਮ ਮੁੜ-"
 "ਚਾਓ ਜਾਂ ਆਪਣੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "ਇੱਕ iPod ਖੋਜ ਫੇਲ੍ਹ ਹੋਈ"
 
@@ -18301,204 +17332,204 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar ਫਾਰਮੈਟ (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "ਐਪਲ ਆਈਪੋਡ ਨਾਲ ਚੁਣੀ ਟਾਸਕ/ਮੀਮੋ/ਕੈਲੰਡਰ/ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "iPod ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "ਆਪਣਾ ਡਾਟਾ ਆਪਣੇ ਐਪਲ iPod ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ"
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod ਸਿਕਰੋਨਾਈਜ਼"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "'%s' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ 'ਚ ਅਸਫਲ"
+msgstr "'%s' ਕੈਲੰਡਰ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ਕੈਲੰਡਰ '%s' ਵਿੱਚ ਇੱਕ ਮੁਲਾਕਾਤ ਇਸ ਮੀਟਿੰਗ ਨਾਲ ਟਕਰਾ ਰਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ਕੈਲੰਡਰ ਵਿੱਚ ਮੁਲਾਕਾਤ ਮਿਲੀ ਹੈ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "ਕੋਈ ਵੀ ਕੈਲੰਡਰ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "ਕਿਸੇ ਵੀ ਕੈਲੰਡਰ ਵਿੱਚ ਇਹ ਮੀਟਿੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "ਕਿਸੇ ਕੰਮ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "ਕਿਸੇ ਮੀਮੋ ਸੂਚੀ ਵਿੱਚ ਇਹ ਕੰਮ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#| msgid "Opening calendar"
+msgid "Opening the calendar. Please wait.."
+msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "ਇਹ ਮੁਲਾਕਾਤ ਲਈ ਇੱਕ ਮੌਜੂਦਾ ਵਰਜਨ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "ਇਕਾਈ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ਕੈਲੰਡਰ ਤੋਂ ਇਕਾਈ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨਜ਼ੂਰ ਦੇ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ਅੰਤਰਮ ਦੇ ਤੌਰ ਤੇ ਕੈਲੰਡਰ '%s' ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ਇਨਕਾਰ ਵਾਂਗ ਭੇਜਿਆ ਕੈਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ਕੈਲੰਡਰ '%s' ਭੇਜਿਆ ਰੱਦ ਵਾਂਗ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰਗਠਕ ਨੇ ਪ੍ਰਤੀਨਿਧ %s ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ਇੱਕ ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਹੋਣ ਦੀ ਸੂਚਨਾ ਭੇਜੋ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ੍ਰਤੀਨਿਧ ਨੂੰ ਰੱਦ ਕਰਨਾ ਬਾਰੇ ਜਾਣਕਾਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ ਗਲਤ ਹੋਣ ਕਰਕੇ ਦਰਸ਼ਕ ਜਾਣਕਾਰੀ ਦਾ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ਕੈਲੰਡਰ %s ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼ਕ ਸਥਿਤੀ ਨਵੀਨ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮੀਟਿੰਗ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਟਿੰਗ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "ਕੰਮ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਫ਼ਲ, ਕੰਮ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮੀਮੋ ਜਾਣਕਾਰੀ ਭੇਜਣ ਲਈ ਅਸਮੱਰਥ ਹੈ, ਮੀਮੋ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਠੀਕ ਆਈਕੈਲੰਡਰ (iCalendar) ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਇਕਾਈ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੈਲੰਡਰ ਤਾਂ ਹੈ, ਪਰ ਕੈਲੰਡਰ ਵਿੱਚ ਕੋਈ ਘਟਨਾਸ ਕੰਮ ਜਾਂ ਵੇਹਲਾ/ਰੁਝਿਆਂ ਜਾਣਕਾਰੀ ਨਹੀ ਹੈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥੀ ਕੈਲੰਡਰ ਵਿੱਚ ਕਈ ਆਈਟਮਾਂ ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "ਇਹਨਾਂ ਸਭ ਆਈਟਮਾਂ ਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲ਼ਈ, ਫਾਇਲ ਨੂੰ ਸੰਭਾਲਣਾ ਪਵੇਗਾ ਅਤੇ ਕੈਲੰਡਰ ਆਯਾਤ ਕਰਨਾ ਪਵੇਗਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "ਇਹ ਮੀਟਿੰਗ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "ਇਹ ਕੰਮ ਫੇਰ ਹੋਵੇਗੀ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "ਇਹ ਮੀਮੋ ਫੇਰ ਹੈ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "ਕਾਰਵਾਈ ਉਪਰੰਤ ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "ਅਪਵਾਦ ਖੋਜ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮੀਟਿੰਗ ਟਕਰਾ ਲੱਭਣ ਲਈ ਕੈਲੰਡਰ ਚੁਣੋ"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "ਅੱਜ"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18517,11 +17548,6 @@ msgstr "ਅੱਜ %H:%M:%S"
 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:219
-msgid "Tomorrow"
-msgstr "ਕੱਲ੍ਹ"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -18857,112 +17883,110 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨੇ ਅੱਗੇ ਦਿੱਤਾ ਸਾਂਝਾ ਮੀਮੋ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੈ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ(_O))"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "ਨਾ-ਮਨਜ਼ੂਰ(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "ਮਨਜ਼ੂਰ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨਜ਼ੂਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "ਸਭ ਆਰਜ਼ੀ ਮਨਜ਼ੂਰ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "ਆਰਜ਼ੀ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "ਸਭ ਮਨਜ਼ੂਰ(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "ਜਾਣਕਾਰੀ ਭੇਜੋ(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼ਕ ਹਾਲਤ ਅੱਪਡੇਟ(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "ਅੱਪਡੇਟ(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "ਟਿੱਪਣੀ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "ਭੇਜਣ ਵਾਲੇ ਨੂੰ ਜਵਾਬ ਦਿਓ(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼ਕਾਂ ਨੂੰ ਅੱਪਡੇਟ ਭੇਜੋ(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮੌਕਿਆਂ ਉੱਤੇ ਲਾਗੂ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "ਟਾਈਮ ਫਰੀ ਵਾਂਗ ਵੇਖੋ(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "ਇੰਹੈਰਿਟ ਰੀਮਾਇਡਰ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "ਕੰਮ(_T):"
-
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "ਮੀਮੋ :"
+#| msgid "_Memos"
+msgid "_Memos:"
+msgstr "ਮੀਮੋ(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਟੈਕਸਟ/ਕੈਲੰਡਰ ਭਾਗ ਵੇਖਾਓ"
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "ਪੱਤਰ ਸੁਨੇਹਿਆਂ ਵਿੱਚ \"ਟੈਕਸਟ/ਕੈਲੰਡਰ\" ਮਾਈਮ ਭਾਗ ਵੇਖੋ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18987,13 +18011,13 @@ msgid "Proxy _Logout"
 msgstr "ਪਰਾਕਸੀ ਲਾਗਆਉਟ(_L)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "ਅਕਾਊਂਟ ਅਯੋਗ ਕਰਨ ਮਨਜ਼ੂਰ ਹੈ।"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "ਅਕਾਊਂਟ ਅਯੋਗ"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਫੋਲਡਰ ਟਰੀ ਵਿੱਚ ਇਸ ਉੱਤੇ ਸੱਜਾ ਕਲਿੱਕ ਕਰਕੇ ਆਯੋਗ ਕਰੋ।"
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ਬੀਪ ਜਾਂ ਸਾਊਂਡ ਫਾਈਲ ਚਲਾਓ"
@@ -19060,20 +18084,20 @@ msgstr "ਕੀ ਆਈਕਾਨ ਝਪਕਦਾ ਹੋਣਾ ਚਾਹੀਦਾ �
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ਕੀ ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿਚਲੇ ਸੁਨੇਹਿਆਂ ਲਈ ਹੀ ਨੋਟੀਫਾਈ ਕਰਨਾ ਹੈ।"
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਦਾ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਿਸ਼ੇਸ਼ਤਾ"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19088,113 +18112,252 @@ msgstr[1] ""
 "ਤੁਹਾਨੂੰ %2$s ਵਿੱਚ %1$d ਨਵੇਂ ਸੁਨੇਹੇ\n"
 "ਆਏ ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ਤੁਹਾਨੂੰ ਇੱਕ ਨਵਾਂ %d  ਸੁਨੇਹਾ ਆਇਆ ਹੈ।"
 msgstr[1] "ਤੁਹਾਨੂੰ %d  ਨਵੇਂ ਸੁਨੇਹੇ ਆਏ ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "ਨਵੀਂ ਈਮੇਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਏ ਵਿੱਚ ਆਈਕਾਨ ਵੇਖੋ(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਵਿੱਚ ਆਈਕਾਨ ਝਪਕਾਓ(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "ਆਈਕਾਨ ਨਾਲ ਸੁਨੇਹਾ ਵੀ ਪੋਪਅੱਪ ਕਰੋ(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਣ ਉੱਤੇ ਸਾਊਂਡ ਚਲਾਓ(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "ਬੀਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "ਸਾਊਂਡ ਫਾਈਲ ਚਲਾਓ(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "ਖਾਸ ਫਾਇਲ ਨਾਂ(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "ਚਲਾਓ(_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "ਕੇਵਲ ਇਨ-ਬਾਕਸ ਵਿੱਚ ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਨੋਟੀਫਾਈ ਕਰੋ(_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "ਜਦੋਂ ਵੀ ਨਵਾਂ ਸੁਨੇਹੇ ਆਵੇ ਤਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾ ਦੇਵੇ।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"ਇੱਕ ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ ਜਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਆਈਕਾਨ ਨਾਲ ਨੋਟੀਫਾਈ ਕੀਤਾ ਜਾਂਦਾ ਹੈ "
-"ਅਤੇ ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਦਾ ਹੈ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+"ਚੁਣਿਆ ਕੈਲੰਡਰ ਵਿੱਚ ਈਵੈਂਟ '%s' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੇ ਈਵੈਂਟ ਨੂੰ ਸੋਧਣਾ ਚਾਹੁੰਦੇ "
+"ਹੋ?"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr "ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਟਾਸਕ '%s' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੀ ਟਾਸਕ ਨੂੰ ਸੋਧਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਮੀਮੋ '%s' ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਪੁਰਾਣੀ ਮੀਮੋ ਲਿਸਟ ਨੂੰ ਸੋਧਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"ਚੁਣੇ ਕੈਲੰਡਰ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਈਵੈਂਟ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੇਂ ਈਵੈਂਟ ਫੇਰ ਵੀ ਬਣਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਟਾਸਕ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੀਂ ਟਾਸਕ ਫੇਰ ਵੀ "
+"ਬਣਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਮੀਮੋ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੇਂ ਮੀਮੋ ਫੇਰ ਵੀ ਬਣਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"ਚੁਣੇ ਕੈਲੰਡਰ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਇੱਕ ਈਵੈਂਟ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵਾਂ ਈਵੈਂਟ ਫੇਰ ਵੀ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr[1] ""
+"ਚੁਣੇ ਕੈਲੰਡਰ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਈਵੈਂਟ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੇਂ ਈਵੈਂਟ ਫੇਰ ਵੀ ਬਣਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:429
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਤੋਂ ਮੀਟਿੰਗਾਂ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਇੱਕ ਟਾਸਕ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੀਂ ਟਾਸਕ ਫੇਰ ਵੀ "
+"ਬਣਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr[1] ""
+"ਚੁਣੀ ਟਾਸਕ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਟਾਸਕ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੀਂ ਟਾਸਕ ਫੇਰ ਵੀ "
+"ਬਣਾਉਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਮੀਮੋ ਪਹਿਲਾਂ ਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਨਵੇਂ ਮੀਮੋ ਫੇਰ ਵੀ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr[1] ""
+"ਚੁਣੀ ਮੀਮੋ ਲਿਸਟ ਵਿੱਚ ਦਿੱਤੇ ਪੱਤਰਾਂ ਲਈ ਕੁਝ ਮੀਮੋ ਪਹਿਲਾਂ ਹੀ ਹਨ। ਕੀ ਤੁਸੀਂ ਨਵੇਂ ਮੀਮੋ ਫੇਰ ਵੀ ਬਣਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[ਸੰਖੇਪ ਨਹੀਂ]"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਆਬਜੈਕਟ ਵਾਪਸ ਮਿਲਿਆ"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "ਮੀਟਿੰਗ ਲਈ ਪੱਤਰ"
+#: ../plugins/mail-to-task/mail-to-task.c:570, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "ਪਰੋਸੈਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਈਵੈਂਟ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਕੰਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗ ਤੋਂ ਕੰਮ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr "ਚੁਣਿਆ ਸਰੋਤ ਪੜ੍ਹਨ ਲਈ ਹੈ, ਇਸਕਰਕੇ ਮੀਮੋ ਉੱਥੇ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ। ਹੋਰ ਸਰੋਤ ਚੁਣੋ ਜੀ।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:821, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "ਸਰੋਤ ਲਿਸਟ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+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)"
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "ਮੀਮੋ ਬਣਾਓ(_o)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-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 "ਚੁਣੇ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਨਵੇਂ ਕੰਮ 'ਚ ਬਦਲੋ"
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "ਮੀਟਿੰਗ ਬਣਾਓ(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "ਟਾਸਕ ਬਣਾਓ(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "ਈਵੈਂਟ ਬਣਾਓ(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
+msgstr "ਪੱਤਰ ਤੋਂ ਕੰਮ"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਈਵੈਂਟ ਬਣਾਓ"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਮੀਟਿੰਗ ਬਣਾਓ"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵਾਂ ਮੀਮੋ ਬਣਾਓ"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਤੋਂ ਨਵੀਂ ਟਾਸਕ ਬਣਾਓ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19202,15 +18365,15 @@ msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮਾਲਕ(_o)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
-msgstr "ਸੂਚੀ ਅਕਾਇਵ ਲਵੋ(_a)"
+msgstr "ਲਿਸਟ ਅਕਾਇਵ ਲਵੋ(_a)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 msgid "Get list _usage information"
-msgstr "ਵਰਤੋਂ ਸੂਚੀ ਜਾਣਕਾਰੀ ਲਵੋਂ(_u)"
+msgstr "ਲਿਸਟ ਵਰਤੋਂ ਜਾਣਕਾਰੀ ਲਵੋਂ(_u)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
-msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਕਾਰਵਾਈ"
+msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਕਾਰਵਾਈ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
@@ -19218,20 +18381,23 @@ msgid "Mailing _List"
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "ਆਮ ਮੇਲਿੰਗ ਸੂਚੀ ਕਮਾਂਡਾਂ (ਮੈਂਬਰ ਬਣੋ, ਹਟੋ,...) ਉਪਲੱਬਧ ਕਰਵਾਉਦਾ ਹੈ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
-msgstr "ਸੂਚੀ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
+msgstr "ਲਿਸਟ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
-msgstr "ਸੂਚੀ ਲਈ ਮੈਂਬਰ(_S)"
+msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
-msgstr "ਸੂਚੀ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
+msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -19268,11 +18434,11 @@ msgid ""
 "mailing list. Contact the list owner for details."
 msgstr ""
 "ਇਸ ਮੇਲਿੰਗ ਸੂਚੀ ਤੇ ਪੱਤਰ ਭੇਜਣ ਤੇ ਰੋਕ ਹੈ। ਸੰਭਵ ਤੌਰ ਤੇ, ਇਹ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੀ ਪੱਤਰ ਸੂਚੀ ਹੈ। ਵਧੇਰੇ "
-"ਜਾਣਕਾਰੀ ਲਈ ਸੂਚੀ ਪ੍ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+"ਜਾਣਕਾਰੀ ਲਈ ਲਿਸਟ ਪ੍ਰਬੰਧ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਸੂਚੀ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
+msgstr "ਕੀ ਈ-ਮੇਲ ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਭੇਜਣਾ ਹੈ?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -19312,7 +18478,7 @@ msgstr "ਸੁਨੇਹਾ ਭੇਜੋ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
-msgstr "ਸੰਪਰਕ ਸੂਚੀ ਮਾਲਕ(_O)"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਮਾਲਕ(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
@@ -19320,43 +18486,43 @@ msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ �
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
-msgstr "ਸੂਚੀ ਅਕਾਇਵ ਲਵੋ(_A)"
+msgstr "ਲਿਸਟ ਅਕਾਇਵ ਲਵੋ(_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get List _Usage Information"
-msgstr "ਵਰਤੋਂ ਸੂਚੀ ਜਾਣਕਾਰੀ ਲਵੋਂ(_U)"
+msgstr "ਲਿਸਟ ਵਰਤੋਂ ਜਾਣਕਾਰੀ ਲਵੋਂ(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਸੂਚੀ ਦੇ ਅਕਾਇਵ ਖੋਜੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੇ ਅਕਾਇਵ ਖੋਜੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਸੂਚੀ ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਵੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਲਿਸਟ ਦੀ ਵਰਤੋਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਵੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਇੱਕ ਜਵਾਬ ਲਿਖੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਮੈਂਬਰ ਬਣੋ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰ ਬਣੋ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਸੂਚੀ ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
+msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਦੀ ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "ਸੂਚੀ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
+msgstr "ਲਿਸਟ ਲਈ ਸੁਨੇਹੇ ਭੇਜੋ(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
-msgstr "ਸੂਚੀ ਲਈ ਮੈਂਬਰ(_S)"
+msgstr "ਲਿਸਟ ਲਈ ਮੈਂਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
-msgstr "ਸੂਚੀ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
+msgstr "ਲਿਸਟ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਓ(_U)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
@@ -19370,13 +18536,15 @@ msgstr ""
 "ਇਸ ਨਾਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਹੀ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਮਾਰਕ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਮੌਜੂਦਾ ਫੋਲਡਰ ਦੇ ਨਾਲ ਸਭ ਅਧੀਨ-"
 "ਫੋਲਡਰ ਵੀ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਉੱਤੇ(_S)"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#| msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
+msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਅਤੇ ਸਬ-ਫੋਲਡਰਾਂ ਵਿੱਚ(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "ਕੇਵਲ ਮੌਜੂਦਾ ਫੋਲਡਰ(_F)"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "ਕੇਵਲ ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ(_F)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19387,20 +18555,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੇ ਹੋਏ ਬਣਾਓ(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "ਇੱਕ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆਂ ਬਣਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
+#| msgid "Mark all messages in the folder as read"
+msgid "Mark all messages in a folder as read."
+msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਮਾਰਕ ਕਰੋ"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "ਮੋਨੋ ਪਲੱਗ-ਇਨ ਦੇ ਸੈਟਿੰਗ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "ਮੋਨੋ ਲੋਡਰ"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "ਸਹਿਯੋਗ ਪਲੱਗਇਨ ਮੋਨੋ ਵਿੱਚ ਲਿਖੀਆਂ ਗਈਆਂ ਹਨ।"
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਲੱਗ-ਇਨਾਂ ਨੂੰ ਯੋਗ ਅਤੇ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+#| msgid "Change Evolution's settings"
+msgid "Manage your Evolution plugins."
+msgstr "ਤੁਹਾਡੇ ਈਵੇਲੂਸ਼ਨ ਪਲੱਗਇਨ ਪਰਬੰਧ।"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19437,30 +18607,23 @@ msgstr "ਸੰਖੇਪ"
 msgid "Plugin"
 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 messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML "
-"ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\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
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਮੋਡ"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#| msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਸੰਦ"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ਪੱਤਰ ਸੁਨੇਹੇ ਨੂੰ ਪਲੇਟ-ਟੈਕਸਟ ਵੇਖੋ, ਜੇ ਇਹ HTML ਸਮੱਗਰੀ ਵੀ ਰੱਖਦੀ ਹੋਵੇ।"
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
-msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖਾਓ"
+msgstr "ਜੇਕਰ HTML ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
@@ -19468,7 +18631,7 @@ msgstr "ਸਧਾਰਨ ਹੀ ਪਸੰਦ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
-msgstr "ਹਮੇਸ਼ਾ ਸਧਾਰਨ ਹੀ ਵੇਖਾਓ"
+msgstr "ਹਮੇਸ਼ਾ ਸਧਾਰਨ ਹੀ ਵੇਖੋ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
@@ -19479,8 +18642,8 @@ msgid "Evolution Profiler"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਰੋਫਾਇਲਰ"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "ਡਾਟਾ ਘਟਨਾਵਾਂ ਨੂੰ ਪਰੋਫਾਇਲ ਕਰਨ ਦਾ ਲਾਗ ਰੱਖੋ।"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਪਰੋਫਾਇਲ ਡਾਟਾ ਈਵੈਂਟ (ਡਿਵੈਲਪਰਾਂ ਲਈ ਹੀ)"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19495,44 +18658,76 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ਨਿੱਜੀ ਫੋਲਡਰ (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "ਮੁਲਾਕਾਤ(_p)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "ਜਰਨਲ ਐਂਟਰੀਆਂ(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "ਆਉਟਲੁੱਕ ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "ਕੈਲੰਡਰਾਂ ਨੂੰ ਵੈੱਬ ਉੱਤੇ ਪਰਕਾਸ਼ਿਤ ਹੋਣ ਲਈ ਮਨਜ਼ੂਰ ਕਰਦਾ ਹੈ"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "ਕੈਲੰਡਰ ਪਰਾਕਸ਼ਨ"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "ਟਿਕਾਣੇ"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
+msgid "Publish calendars to the web."
+msgstr "ਕੈਲੰਡਰ ਵੈੱਬ ਉੱਤੇ ਪਬਲਿਸ਼ ਕਰੋ।"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337, c-format
+#| msgid "Could not open source"
+msgid "Could not open %s:"
+msgstr "%s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97, c-format
+#| msgid "Could not parse PGP message: Unknown error"
+msgid "Could not open %s: Unknown error"
+msgstr "%s ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: ਅਣਜਾਣ ਗਲਤੀ"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "%s ਪਬਲਿਸ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "%s ਲਈ ਪਬਲਿਸ ਸਫ਼ਲ ਰਿਹਾ"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "%s ਦਾ ਮਾਊਂਟ ਫੇਲ੍ਹ:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਟਿਕਾਣਾ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#| msgid "Could not create message."
+msgid "Could not create publish thread."
+msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">ਟਿਕਾਣਾ</span>"
@@ -19587,29 +18782,44 @@ msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "ਸੇਵਾ ਕਿਸਮ(_T): "
+msgstr "ਸਰਵਿਸ ਕਿਸਮ(_T): "
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#| msgid "Time _zone:"
+msgid "Time _duration:"
+msgstr "ਸਮਾਂ ਅੰਤਰਾਲ(_d):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "ਫਾਇਲ(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "ਇੰਜ ਪਰਕਾਸ਼ਤ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"ਦਿਨ\n"
+"ਹਫ਼ਤੇ\n"
+"ਮਹੀਨੇ"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19617,11 +18827,17 @@ msgstr ""
 "iCal\n"
 "ਵੇਹਲਾ/ਰੁਝਿਆ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "ਕੈਲੰਡਰ ਪਬਲਿਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਕੈਲੰਡਰ ਬੈਕਐਡ ਹੁਣ ਮੌਜੂਦ ਨਹੀਂ ਰਿਹਾ।"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "ਨਵਾਂ ਟਿਕਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "ਟਿਕਾਣਾ ਸੋਧ"
 
@@ -19649,177 +18865,142 @@ msgstr "ਇੱਕ ਪਲੱਗਇਨ, ਜੋ ਹੋਰ ਪਲੱਗਇਨ ਲੋ
 msgid "Python Loader"
 msgstr "ਪਾਈਥਨ ਲੋਡਰ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (ਬਿਲਟ-ਇਨ)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ਨਹੀਂ ਲੱਭਿਆ, ਕੋਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ਪਾਈਪ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ਫੋਰਕ ਬਾਅਦ ਗਲਤੀ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin ਚਾਈਲਡ ਪਰੋਸੈਸ ਜਵਾਬ ਨਹੀਂ ਦਿੰਦਾ, ਖਤਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin ਚਾਈਲਡ ਪਰੋਸੈੱਸ ਦਖਲ ਦੀ ਉਡੀਕ, ਖਤਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ਲਈ ਪਾਈਪ ਫੇਲ੍ਹ, ਗਲਤੀ ਕੋਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ਇਹ Spamassasin ਨੂੰ ਹੋਰ ਵੀ ਭਰੋਸੇਯੋਗ ਬਣਾਉਦਾ ਹੈ, ਪਰ ਹੌਲੀ ਕਰਦਾ ਹੈ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮੋਟ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ(_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin ਇੰਸਟਾਲ "
-"ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰੋ।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "Spamassassin ਚੋਣਾਂ"
+#| msgid "SpamAssassin junk plugin"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin ਜੰਕ ਫਿਲਟਰ"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-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 "ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਨੱਥੀ ਸਭ ਦਸਤਾਵੇਜ਼ ਜਾਂ ਭਾਗਾਂ ਨੂੰ ਇੱਕੋ ਵਾਰ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "ਨੱਥੀ ਸੰਭਾਲੋ"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "ਨੱਥੀ ਸੰਭਾਲੋ..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "ਸਭ ਨੱਥੀ ਸੰਭਾਲੋ..."
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "ਸੰਭਾਲ ਮੂਲ ਨਾਂ ਚੁਣੋ"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME ਕਿਸਮ"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "ਸੰਭਾਲੋ"
+msgid "SpamAssassin Options"
+msgstr "Spamassassin ਚੋਣਾਂ"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "ਵੇਰਵਾ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "ਕੈਟਾਗਰੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "ਟਿੱਪਣੀ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "ਬਣਾਇਆ"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "ਸ਼ੁਰੂ"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "ਫੀ-ਸਦੀ ਮੁਕੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "ਦਰਸ਼ਕ ਲਿਸਟ"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "ਸੋਧਿਆ"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ"
+#: ../plugins/save-calendar/csv-format.c:523
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV ਫਾਰਮੈਟ ਲਈ ਤਕਨੀਕੀ ਚੋਣਾਂ(_d)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "ਸੁਝਾਇਆ ਹੈੱਡਰ"
+#: ../plugins/save-calendar/csv-format.c:530
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "ਹੈੱਡਰ ਅੱਗੇ ਜੋੜੋ(_h)"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "ਮੂਲ ਸੀਮਾ:"
+#: ../plugins/save-calendar/csv-format.c:539
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "ਮੁੱਲ ਸੀਮਾ(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "ਰਿਕਾਰਡ ਸੀਮਾ:"
+#: ../plugins/save-calendar/csv-format.c:546
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "ਰਿਕਾਰਡ ਸੀਮਾ(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ:"
+#: ../plugins/save-calendar/csv-format.c:553
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "ਮੁੱਲ ਇਸ ਨਾਲ ਢੱਕੇ(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਮੁੱਲ਼ ਫਾਰਮੈਟ (.csv)"
 
@@ -19828,8 +19009,9 @@ msgid "Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਜਾਂ ਕੰਮਾਂ ਨੂੰ ਡਿਸਕ 'ਤੇ ਸੰਭਾਲੋ।"
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
+msgstr "ਚੁਣੇ ਕੈਲੰਡਰ ਜਾਂ ਟਾਸਕ ਲਿਸਟ ਨੂੰ ਡਿਸਕ 'ਤੇ ਸੰਭਾਲੋ।"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19844,33 +19026,40 @@ msgstr "ਡਿਸਕ ਉੱਤੇ ਸੰਭਾਲੋ(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮੈਟ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+#| msgid "Format"
+msgid "_Format:"
+msgstr "ਫਾਰਮੈਟ(_F):"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾਇਲ ਚੁਣੋ"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "ਤੁਰੰਤ ਵੇਖਣ ਲਈ ਇੱਕ ਇੱਕਲੇ ਕੈਲੰਡਰ ਜਾਂ ਟਾਸਕ ਲਿਸਟ ਚੁਣੋ।"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "ਵੇਖਣ ਲਈ ਇੱਕ ਇੱਕਲੇ ਕੈਲੰਡਰ ਜਾਂ ਕੰਮ ਸਰੋਤ ਨੂੰ ਚੁਣੋ।"
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
-msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖਾਓ(_O)"
+msgstr "ਸਿਰਫ਼ ਇਹ ਕੈਲੰਡਰ ਹੀ ਵੇਖੋ(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "ਕੇਵਲ ਮੇਮਰੀ ਸੂਚੀ ਹੀ ਵੇਖੋ(_o)"
+msgstr "ਕੇਵਲ ਮੀਮੋ ਲਿਸਟ ਹੀ ਵੇਖੋ(_o)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "ਸਿਰਫ਼ ਇਹ ਕੰਮ ਸੂਚੀ ਹੀ ਵੇਖਾਓ(_O)"
+msgstr "ਸਿਰਫ਼ ਇਹ ਟਾਸਕ ਲਿਸਟ ਹੀ ਵੇਖੋ(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19880,55 +19069,56 @@ msgstr "ਆਪਣੇ ਸ਼ੁਰੂਆਤੀ ਅਕਾਊਂਟ ਸੈਟਅੱ
 msgid "Setup Assistant"
 msgstr "ਸੈਟਅੱਪ ਸਹਾਇਕ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਸੈੱਟਅੱਪ ਸਹਾਇਕ "
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "ਜੀ ਆਇਆ ਨੂੰ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"ਈਵੇਲੂਸ਼ਨ ਤੇ ਸਵਾਗਤ ਹੈ, ਅਗਲੇ ਕੁਝ ਪਰਦੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਤੁਹਾਡੇ ਈ-ਮੇਲ ਅਕਾਊਂਟਾਂ ਨਾਲ ਜੋੜਨ ਵਿੱਚ\n"
-"ਸਹਾਇਕ ਹੋਣਗੇ ਅਤੇ ਹੋਰ ਕਾਰਜਾਂ ਤੋਂ ਫਾਇਲਾਂ ਆਯਾਤ ਕਰਨ ਵਿੱਚ ਮੱਦਦ ਕਰਨਗੇ।\n"
+"ਈਵੇਲੂਸ਼ਨ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ। ਅੱਗੇ ਕੁਝ ਸਕਰੀਨਾਂ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਤੁਹਾਡੇ ਈ-ਮੇਲ ਅਕਾਊਂਟਾਂ ਨਾਲ ਜੋੜਨ ਵਿੱਚ\n"
+"ਸਹਾਇਕ ਹੋਣਗੀਆਂ ਅਤੇ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੋਂ ਫਾਇਲਾਂ ਇੰਪੋਰਟ ਕਰਨ ਵਿੱਚ ਮੱਦਦ ਕਰਨਗੇ।\n"
 "\n"
-"ਕਿਰਪਾ ਕਰਕੇ ਜਾਰੀ ਰਹਿਣ ਲਈ \"ਅੱਗੇ\" ਬਟਨ ਦਬਾਓ।"
+"ਜਾਰੀ ਰੱਖਣ ਥਈ \"ਅੱਗੇ\" ਬਟਨ ਨੂੰ ਦੱਬੋ ਜੀ। "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
-msgstr "ਫਾਇਲਾਂ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ"
+msgstr "ਫਾਇਲਾਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਆਯਾਤ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ:"
+msgstr "ਜਾਣਕਾਰੀ, ਜੋ ਵੀ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ ਜੀ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
-msgstr "ਵੱਲੋਂ %s:"
+msgstr "%s ਤੋਂ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
-msgstr "ਡਾਟਾ ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
+msgstr "ਡਾਟਾ ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
+msgstr "ਉਡੀਕੋ ਜੀ"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਕੀ ਸੁਨੇਹਿਆਂ ਦਾ ਥਰਿੱਡ ਵਿਸ਼ੇ ਨਾਲ ਸਬੰਧਤ ਰਹੇ।"
+#| msgid "Thread messages by subject"
+msgid "Sort mail message threads by subject."
+msgstr "ਪੱਤਰ ਸੁਨੇਹੇ ਮਸਲਾ ਦੇ ਵਿਸ਼ੇ ਰਾਹੀਂ ਲੜੀਬੱਧ ਕਰੋ।"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19949,15 +19139,15 @@ msgid ""
 "message body."
 msgstr "ਸੁਨੇਹਾ ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਟੈਪਲੇਟ ਪਲੱਗਇਨ ਸਬ-ਟਾਈਟਲ ਲਈ ਸ਼ਬਦ/ਮੁੱਲ ਜੋੜ ਦੀ ਲਿਸਟ ਹੈ।"
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
-msgstr "ਕੋਈ ਟਾਈਟਲ ਨਹੀਂ"
+msgstr "ਟਾਈਟਲ ਨਹੀਂ"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "ਟੈਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "ਟੈਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ"
 
@@ -19966,33 +19156,71 @@ msgid "Drafts based template plugin"
 msgstr "ਟੈਪਲੇਟ ਪਲੱਗਇਨ ਮੁਤਾਬਕ ਡਰਾਫਟ"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "ਇੱਕ ਸੈਂਪਲ ਪਲੱਗਇਨ, ਜੋ ਕਿ TNEF ਅਟੈਂਚਮੈਂਟ ਨੂੰ ਡੀਕੋਡ ਕਰਨ ਲਈ yTNEF ਵਰਤਦਾ ਹੈ।"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "ਮਾਈਕਰੋਸਾਫਟ ਆਉਟਲੁੱਕ ਤੋਂ TNEF (winmail.dat) ਡੀਕੋਡ ਕਰੋ।"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF ਅਟੈਂਚਮਿੰਟ ਡੀਕੋਡਰ"
+#| msgid "TNEF Attachment decoder"
+msgid "TNEF Decoder"
+msgstr "TNEF ਡੀਕੋਡਰ"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#| msgid "Multiple vCards"
+msgid "Inline vCards"
+msgstr "ਇਨ-ਲਾਈਨ vCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "ਮੇਲ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਸਿੱਧੇ vCard ਵੇਖੋ।"
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "ਪੂਰਾ vCard ਵੇਖੋ"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "ਥੋੜਾ vCard ਵੇਖੋ"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is one other contact."
+msgstr "ਇੱਕ ਹੋਰ ਸੰਪਰਕ ਹੈ।"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231, c-format
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "%d ਹੋਰ ਸੰਪਰਕ ਹੈ।"
+msgstr[1] "%d ਹੋਰ ਸੰਪਰਕ ਹਨ।"
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#| msgid "Save in address book"
+msgid "Save in Address Book"
+msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਸੰਭਾਲੋ"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV ਸੰਪਰਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+#| msgid "WebDAV contacts"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "WebDAV ਸੰਪਰਕ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ।"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV ਸੰਪਰਕ"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "ਜੇ-ਮੇਲ ਅਣਡਿੱਠਾ (_Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
+msgstr "ifMatch ਅਣਡਿੱਠਾ (_Apache < 2.2.8 ਦੀ ਲੋੜ ਹੈ)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -20074,42 +19302,62 @@ msgstr ""
 "keyring ਜਾਂ ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾਇਲ ਤੋਂ ਲਿਆ ਜਾਂਦਾ ਹੈ।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+#| msgid "Insert Attachment"
+msgid "Initial attachment view"
+msgstr "ਸ਼ੁਰੂਆਤੀ ਅਟੈਚਮੈਂਟ ਝਲਕ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#| msgid "Install the shared folder"
+msgid "Initial file chooser folder"
+msgstr "ਸ਼ੁਰੂਆਤੀ ਫਾਇਲ ਚੋਣਕਾਰ ਫੋਲਡਰ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser ਡਾਈਲਾਗ ਲਈ ਸ਼ੁਰੂਆਤੀ ਫੋਲਡਰ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਵਿਦਜੈੱਟ ਲਈ ਸ਼ੁਰੂਆਤੀ ਝਲਕ। \"0\" ਆਈਕਾਨ ਝਲਕ ਲਈ, \"1\" ਲਿਸਟ ਝਲਕ ਲਈ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ਫੋਲਡਰ, ਜੋ ਕਿ ਆਫਲ਼ਾਇਨ ਲਈ ਸਿਕਰੋਨਾਈਜ਼ ਕਰਨੇ ਹਨ, ਦੇ ਰਸਤੇ ਦੀ ਲਿਸਟ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "ਗ਼ੈਰ-ਪਰਾਕਸੀ ਹੋਸਟ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ਜਦੋਂ HTTP ਪਰਾਕਸੀ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਪਰਮਾਣਕਿਤਾ ਵਾਸਪੇ ਪਾਸਵਰਡ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੋਡ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS ਪਰਾਕਸੀ ਪੋਰਟ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਹੋਸਟ ਨਾਂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "ਸੁਰੱਖਿਅਤ HTTP ਪਰਾਕਸੀ ਪੋਰਟ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20120,41 +19368,41 @@ msgstr ""
 "ਨਹੀਂ\", \"ਖੁਦ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਦਿਓ\" ਅਤੇ \"autoconfig url ਵਿੱਚ ਦਿੱਤੀ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਵਰਤੋਂ"
 "\" ਹਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "ਬਾਹੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਡਾਈਲਾਗ ਛੱਡੋ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਦਿੰਦੀ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 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.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ ਦੀ ਡਿਫਾਲਟ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20162,19 +19410,19 @@ msgstr ""
 "ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "ਪਰਾਕਸੀ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ਪਰਕਾਸੀ ਸੁਰੱਖਿਅਤ HTTP ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "ਪਰਾਕਸੀ ਸਾਕਟ ਰਾਹੀਂ ਮਸ਼ੀਨ ਨਾਂ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20182,7 +19430,7 @@ msgstr ""
 "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/http_host\" ਰਾਹੀਂ ਦਿੱਤਾ "
 "ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20190,7 +19438,7 @@ msgstr ""
 "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ  \"/apps/evolution/shell/network_config/secure_host\" ਰਾਹੀਂ "
 "ਦਿੱਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20198,7 +19446,7 @@ msgstr ""
 "ਮਸ਼ੀਨ ਦੀ ਪੋਰਟ ਨੂੰ \"/apps/evolution/shell/network_config/socks_host\"ਰਾਹੀਂ ਦਿੱਤਾ "
 "ਜਾ ਸਕਦਾ ਹੈ, ਜੋ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਕਰਦਾ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20207,66 +19455,66 @@ msgstr ""
 "ਵਿੰਡੋ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਹੈ। \"ਟੈਕਸਟ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਟੂਲਬਾਰ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਟੂਲਬਾਰ"
 "\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਟੂਲਬਾਰ ਸੈਟਿੰਗ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦਾ ਸਟਾਇਲ ਲਿਆ ਜਾਵੇਗਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
-" ਇਸ ਕੁੰਜੀ ਵਿੱਚ ਹੋਸਟਾਂ ਦੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਸਿੱਧੇ ਕੁਨੈਕਟ ਹਨ, ਨਾ ਕਿ ਪਰਾਕਸੀ ਰਾਹੀਂ (ਜੇ ਇਹ ਐਕਟਿਵ ਹੋਵੇ)। ਇਹ "
-"ਮੁੱਲ ਵਿੱਚ ਹੋਸਟ-ਨਾਂ, ਡੋਮੇਨ (ਸ਼ੁਰੂਆਤੀ ਵਲਾਈਡ-ਕਾਰਡ *.foo.com ਆਦਿ ਨਾਲ), IP ਹੋਸਟ ਐਡਰੈੱਸ "
+" ਇਸ ਕੁੰਜੀ ਵਿੱਚ ਹੋਸਟਾਂ ਦੀ ਲਿਸਟ ਹੈ, ਜੋ ਕਿ ਸਿੱਧੇ ਕੁਨੈਕਟ ਹਨ, ਨਾ ਕਿ ਪਰਾਕਸੀ ਰਾਹੀਂ (ਜੇ ਇਹ ਐਕਟਿਵ "
+"ਹੋਵੇ)। ਇਹ ਮੁੱਲ ਵਿੱਚ ਹੋਸਟ-ਨਾਂ, ਡੋਮੇਨ (ਸ਼ੁਰੂਆਤੀ ਵਲਾਈਡ-ਕਾਰਡ *.foo.com ਆਦਿ ਨਾਲ), IP ਹੋਸਟ ਐਡਰੈੱਸ "
 "(IPv੪ ਅਤੇ IPv੬ ਦੋਵਾਂ) ਨਾਲ ਅਤੇ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਨਾਲ ਨੈੱਟਮਾਸਕ (ਕਿਵੇਂ ਕਿ 192.168.0.0/24) ਹਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "ਟੂਲਬਾਰ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "URL ਜੋ ਕਿ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਮੁੱਲ ਦਿੰਦਾ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "HTTP ਪਰਾਕਸੀ ਵਰਤੋਂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ਪਰਮਾਣਕਿਤਾ ਵਜੋਂ ਦੇਣ ਲਈ ਯੂਜ਼ਰ ਨਾਂ, ਜਦੋਂ ਕਿ HTTP ਪਰਾਕਸੀ ਜਾਰੀ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਢੰਗ ਨਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਵੇਗਾ, ਨਾਕਿ ਆਨਲਾਇਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "ਕੀ ਝਰੋਖੇ ਨੂੰ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ ਦਿੱਤਾ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "ਕੀ ਹਾਲਤ-ਪੱਟੀ ਵੇਖਾਈ ਜਾਵੇ ਜਾਂ ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਕਾਸ ਵਰਜਨ ਡਾਈਲਾਗ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਵਿੰਡੋ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਸਟਾਇਲ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡੋ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
@@ -20282,21 +19530,21 @@ msgstr "ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਦਬਾਓ"
 msgid "Click OK to close these connections and go offline"
 msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕਰਨ ਲਈ ਅਤੇ ਆਫਲਾਇਨ ਜਾਣ ਲਈ OK ਦਬਾਓ"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "ਚਲਾਉਣ ਲਈ ਆਯਾਤਕਾਰ ਦੀ ਕਿਸਮ ਚੁਣੋ:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "ਫਾਇਲ, ਜੋ ਵੀ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਵਿੱਚ ਆਯਾਤ ਕਰਨੀ ਹੈ ਅਤੇ ਇਸ ਦੀ ਕਿਸਮ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੋ।"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "ਇਸ ਆਯਾਤ ਲਈ ਨਿਯਤ ਸਥਾਨ ਚੁਣੋ"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20308,81 +19556,85 @@ msgstr ""
 "ਆਯਾਤ ਕੀਤੀ ਜਾ ਸਕੇ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹੁੰਦੇ\n"
 "ਹੋ ਤਾਂ \"ਪਿੱਛੇ\" ਬਟਨ ਨੂੰ ਦਬਾ ਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "ਫਾਇਲ਼ ਨਾਂ(_i):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "ਫਾਇਲ ਕਿਸਮ(_t):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "ਪੁਰਾਣੇ ਕਾਰਜ ਤੋਂ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਆਯਾਤ ਕਰੋ"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "ਇੱਕ ਇਕਹੇਰੀ ਫਾਇਲ ਆਯਾਤ ਕਰੋ(_s)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "ਆਯਾਤ(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਪਸੰਦ"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ਈਵੇਲੂਸ਼ਨ"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "ਗਨੋਮ ਪਾਇਲਟ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।"
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
-msgstr "%s ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ।"
+#: ../shell/e-shell-window-commands.c:78, c-format
+#| msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
+msgstr "%s ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ: (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "ਬੱਗ-ਬੱਡੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "ਬੱਗ-ਬੱਡੀ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਵੈੱਬਸਾਇਟ"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "ਆਨ-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ਆਫ਼-ਲਾਈਨ ਜਾਓ(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "ਆਫ-ਲਾਈਨ ਜਾਓ"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20390,11 +19642,11 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਈਨ ਹੈ।\n"
 "ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਈਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਈਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20402,52 +19654,52 @@ msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਈਨ ਹੈ।\n"
 "ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਈਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "ਅਣਜਾਣ ਸਿਸਟਮ ਗਲਤੀ ਹੈ।"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ਕਿਬਾ"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "OAF ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨਹੀਂ ਲੱਭਾ ਹੈ"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "ਨਵੀਂ ਜਾਂਚ"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "ਜਾਂਚ(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "ਇੱਕ ਨਵੀਂ ਜਾਂਚ ਇਕਾਈ ਬਣਾਓ"
 
@@ -20490,7 +19742,7 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20525,7 +19777,7 @@ msgstr ""
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
 "ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20533,43 +19785,43 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਖਾਸ ਭਾਗ ਦੀ ਸਰਗਰਮੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ ਈਵੇਲੂਸ਼ਨ ਭਾਗ ਮਜਬੂਰ ਕਰਕੇ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ਈਵੇਲੂਸ਼ਨ ੧.੪ ਤੋਂ ਮਜਬੂਰ ਕਰਕੇ ਵਾਪਿਸ"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮੇਲ, ਸੰਪਰਕ ਅਤੇ ਕੰਮ ਲਈ ਝਲਕ ਪੈਨ ਆਯੋਗ ਕਰੋ।"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ਈਵੇਲੂਸ਼ਨ PIM ਅਤੇ ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20726,7 +19978,7 @@ msgstr ""
 "\n"
 "ਵਿਸ਼ਵਾਸ ਸੈਟਿੰਗ ਵਿੱਚ ਸੋਧ:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20735,7 +19987,7 @@ msgstr ""
 "ਕਿਉਕਿ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਿਕਤਾ ਤੇ ਭਰੋਸਾਂ ਕਰਦੇ ਹੋ, ਸੋ ਤੁਸੀ ਇਸ ਸਰਟੀਫਿਕੇਟ ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ "
 "ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20745,8 +19997,8 @@ msgstr ""
 "ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਕਿ ਦਿਖਾਇਆ ਨਾ ਗਿਆ ਹੋਵੇ"
 
 #: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:609
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "ਅਯਾਤ ਕਰਨ ਲਈ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..."
 
@@ -20754,41 +20006,41 @@ msgstr "ਅਯਾਤ ਕਰਨ ਲਈ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..
 msgid "All PKCS12 files"
 msgstr "ਸਭ PKCS12 ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:396
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:486
-#: ../smime/gui/certificate-manager.c:711
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਾਂ"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:504
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "ਮਕਸਦ"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "ਕਰਮ ਅੰਕ"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "ਮਿਆਦ"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "ਸਭ ਈਮੇਲ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
-#: ../smime/gui/certificate-manager.c:495
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ"
 
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲਾਂ"
 
@@ -20891,7 +20143,7 @@ msgstr ""
 "ਕਿਸੇ ਕੰਮ ਲਈ ਇਸ CA ਤੇ ਭਰੋਸਾ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਵੇਖ ਲੈਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਇਸ "
 "ਦੀਆਂ ਪਾਲਸੀਆਂ ਤੇ ਹਦਾਇਤਾਂ ਜਾਂਚ ਲਵੋ।"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "ਸਰਟੀਫਿਕੇਟ"
 
@@ -20967,11 +20219,11 @@ msgstr "ਸੰਗਠਨ ਇਕਾਈ (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL ਕਲਾਇਟ ਸਰਟੀਫਿਕੇਟ"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"
 
@@ -21017,7 +20269,7 @@ 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:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
@@ -21026,161 +20278,161 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "ਵਰਜਨ"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "ਵਰਜਨ 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "ਵਰਜਨ ੩"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD੫ RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ਇਕ੍ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਕੁੰਜੀ ਵਰਤੋਂ"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "ਨੈੱਟਸਕੇਪ ਸਰਟੀਫਿਕੇਟ ਕਿਸਮ"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਕੀ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ਇਕਾਈ ਪਛਾਣਕਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "ਐਲੋਗਰਿਥਮ ਪਛਾਣਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "ਐਲੋਗਰਿਥਮ ਪੈਰਾਮੀਟਰ"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵਜਨਕ ਕੀ ਜਾਣਕਾਰੀ"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼ੇ ਦਾ ਸਰਵਜਨਕ ਕੀ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼ੇ ਦੀ ਸਰਵਜਨਕ ਕੀ"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "ਗਲਤੀ: ਕਾਰਜ ਵਾਧੇ ਲਈ ਅਸਫਲ"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "ਆਬਜੈਕਟ ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "ਈ-ਮੇਲ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "ਦਸਤਖਤ"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "ਨਾ-ਇਨਕਾਰ"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "ਕੀ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "ਡਾਟਾ ਇਨਸੀਫੀਰਮੈਂਟ"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "ਕੁੰਜੀ ਇਕਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤਖਤੀ"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "ਘਾਤਕ ਨਹੀਂ"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਐਲੋਗਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "ਜਾਰੀ ਕਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "ਜਾਰੀ ਕਰਤਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱਖਣ ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ ਮੁੱਲ"
 
@@ -21328,7 +20580,7 @@ msgstr "ਚੁਣੇ ਸੰਪਰਕ VCard ਵਜੋਂ ਸੰਭਾਲੋ"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ ਦੇ ਸੰਪਰਕਾਂ ਨੂੰ VCard ਵਾਂਗ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "ਸਭ ਚੁਣੋ"
 
@@ -21462,7 +20714,7 @@ msgid "Month"
 msgstr "ਮਹੀਨਾ"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
@@ -21470,8 +20722,8 @@ msgstr "ਅੱਗੇ"
 msgid "Previews the calendar to be printed"
 msgstr "ਪਰਿੰਟ ਕਰਨ ਵਾਲੇ ਕੈਲੰਡਰ ਦੀ ਝਲਕ"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
@@ -21780,7 +21032,7 @@ msgstr "ਮਸਲਾ ਸੁਨੇਹਾ ਲਿਸਟ"
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ ਗਰੁੱਪ(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "ਸੁਨੇਹਾ(_M)"
@@ -22035,199 +21287,183 @@ 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:69
-msgid "Post a Repl_y"
-msgstr "ਇੱਕ ਜਵਾਬ ਭੇਜੋ(_y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "ਸੁਨੇਹਾ ਸਰਵਜਨਕ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
-
-#: ../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:72
 msgid "Pr_evious Important Message"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਵੇਖਾਓ(_e)"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰਟ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਦੀ ਝਲਕ"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਪਰਿੰਟ ਕਰੋ"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਕਿਸੇ ਵੱਲ ਭੇਜੋ"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "ਟੈਕਸਟ ਨੂੰ ਅਸਲੀ ਆਕਾਰ ਮੁਤਾਬਕ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਟੈਕਸਟ ਫਾਇਲ਼ ਦੇ ਤੌਰ ਉੱਤੇ ਸੰਭਾਲੋ"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮੇਲਿੰਗ ਸੂਚੀ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "ਪਰਾਪਤ ਕਰਤਾ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_t)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼ੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_u)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "ਭੇਜਣ ਵਾਲੇ ਤੋਂ ਖੋਜ ਫੋਲਡਰ(_d)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਟੈਕਸਟ ਦੀ ਖੋਜ"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "ਸਭ ਟੈਕਸਟ ਚੁਣੋ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "ਇੱਕ ਸੁਨੇਹੇ ਵਿੱਚ ਸਭ ਟੈਕਸਟ ਚੁਣੋ"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਪਰਿੰਟਰ ਲਈ ਸਫਾ ਸੈਟਿੰਗ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹੇ ਸੁਨੇਹੇ ਵਿੱਚ ਕਰਸਰ ਝਪਕਦੀ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "ਸੁਨੇਹੇ ਸਭ ਈ-ਮੇਲ ਹੈੱਡਰਾਂ ਨਾਲ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "ਸੁਨੇਹੇ ਦੇ ਕੱਚੇ ਈ-ਮੇਲ ਸਰੋਤ ਵੇਖਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "ਚੁਣੇ ਸੁਨੇਹੇ ਨਾ-ਹਟਾਏ ਬਣਾਓ"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "ਨਾ-ਖਾਸ(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "ਜ਼ੂਮ ਬਾਹਰ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "ਨੱਥੀ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "ਗੁਪਤ-ਲੇਖਣ ਢੰਗ(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "ਸੁਨੇਹੇ 'ਚ ਖੋਜ(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "ਜਾਓ(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "ਖਾਸ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "ਲਾਈਨ ਵਿੱਚ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "ਜੰਕ(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "ਚਿੱਤਰ ਲੋਡ(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "ਸੁਨੇਹਾ ਸਰੋਤ(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "ਆਮ ਅਕਾਰ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "ਜੰਕ ਨਹੀਂ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "ਨਵੇਂ ਝਰੋਖੇ 'ਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "ਪੜ੍ਹਨ(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹਟਾਇਆ ਸੁਨੇਹਾ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "ਨਾ-ਪੜਿਆ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "ਜ਼ੂਮ(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "ਜ਼ੂਮ ਅੰਦਰ(_Z)"
 
@@ -22588,11 +21824,11 @@ msgid "With _Status"
 msgstr "ਹਾਲਤ ਨਾਲ(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22621,19 +21857,19 @@ msgstr ""
 "ਮਾਊਸ ਦਾ ਖੱਬਾ ਬਟਨ ਖੇਤਰ ਦਾ ਆਕਾਰ ਵੱਡਾ ਕਰਨ ਲਈ ਵਰਤੋਂ ਅਤੇ ਸਮਾਂ ਖੇਤਰ ਚੁਣੋ।\n"
 "ਮਾਊਸ ਦਾ ਸੱਜਾ ਬਟਨ ਖੇਤਰ ਘਟਾਉਣ ਦੇ ਕੰਮ ਆਵੇਗਾ।"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ਭੰਡਾਰ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ਲਈ ਝਲਕ ਪਰਿਭਾਸ਼ਾ"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "ਝਲਕ ਪਰਿਭਾਸ਼ਾ"
 
@@ -22643,17 +21879,16 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" ਲਈ ਝਲਕ ਪਰਿਭਾਸ਼ਿਤ"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "ਟੇਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "ਮੌਕਾ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਸੰਭਾਲੋ"
 
@@ -22666,17 +21901,17 @@ msgid "_Replace existing view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਤਬਦੀਲ(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ..."
 
@@ -22684,32 +21919,32 @@ msgstr "ਝਲਕ ਪ੍ਰਭਾਸ਼ਿਤ ਕਰੋ..."
 msgid "C_urrent View"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ(_u)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "ਝਲਕ ਚੁਣੋ: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ਮੌਜੂਦਾ ਝਲਕ ਇੱਕ ਕਸਟਮਾਈਜ਼ ਝਲਕ ਹੈ"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "ਕਸਟਮ ਝਲਕ ਸੰਭਾਲੋ..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "ਮੌਜੂਦਾ ਕਸਟਮਾਈਜ਼ ਵਿਊ ਸੰਭਾਲੋ"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "ਵਿਊ ਬਣਾਓ ਜਾਂ ਸੋਧ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "ਫੈਕਟਰੀ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "ਨਵੀਂ ਝਲਕ ਬਣਾਓ"
 
@@ -22725,64 +21960,182 @@ msgstr "ਝਲਕ ਦੀ ਕਿਸਮ"
 msgid "Type of view:"
 msgstr "ਝਲਕ ਦੀ ਕਿਸਮ:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "ਨੱਥੀ ਪੱਟੀ"
+#: ../widgets/misc/e-attachment.c:990
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "Attached message"
+msgstr "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#| msgid "attachment"
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "ਪਹਿਲਾਂ ਹੀ ਲੋਡ ਕਾਰਵਾਈ ਜਾਰੀ ਹੈ।"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "ਪਹਿਲਾਂ ਸੰਭਾਲਣ ਕਾਰਵਾਈ ਜਾਰੀ ਹੈ।"
+
+#: ../widgets/misc/e-attachment.c:1923, c-format
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "'%s' ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#: ../widgets/misc/e-attachment.c:1926, c-format
+#| msgid "Could not open the link."
+msgid "Could not load the attachment"
+msgstr "ਅਟੈਚਮੈਂਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment.c:2190, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "'%s' ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment.c:2193, c-format
+#| msgid "Could not open the link."
+msgid "Could not open the attachment"
+msgstr "ਅਟੈਚਮੈਂਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment.c:2635
+#| msgid "Attachment Reminder"
+msgid "Attachment contents not loaded"
+msgstr "ਅਟੈਚਮੈਂਟ ਸਮੱਗਰੀ ਲੋਡ ਨਹੀਂ ਹੈ"
+
+#: ../widgets/misc/e-attachment.c:2712, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "'%s' ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment.c:2715, c-format
+#| msgid "Select folder to save all attachments"
+msgid "Could not save the attachment"
+msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
+msgid "Attachment Properties"
+msgstr "ਅਟੈਚਮੈਂਟ ਵਿਸ਼ੇਸਤਾ"
+
+#: ../widgets/misc/e-attachment-dialog.c:328
+#| msgid "F_ilename:"
+msgid "_Filename:"
+msgstr "ਫਾਇਲਨਾਂ(_F):"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+#| msgid "MIME Type"
+msgid "MIME Type:"
+msgstr "MIME ਟਾਈਪ:"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
+msgid "Could not set as background"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#| msgid "Could not open the link."
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "ਅਟੈਚਮੈਂਟ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+msgstr[1] "ਅਟੈਚਮੈਂਟਾਂ ਭੇਜੀਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#| msgid "Send To:"
+msgid "_Send To..."
+msgstr "...ਨੂੰ ਭੇਜੋ(_S)..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#| msgid "Select folder to save selected attachments..."
+msgid "Send the selected attachments somewhere"
+msgstr "ਚੁਣੀ ਅਟੈਚਮੈਂਟ ਕਿਤੇ ਭੇਜੋ"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#| msgid "Loading..."
+msgid "Loading"
+msgstr "ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#| msgid "Shading"
+msgid "Saving"
+msgstr "ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਓਹਲੇ(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "ਅਟੈਚਮੈਂਟ ਪੱਟੀ ਵੇਖੋ(_A)"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+#: ../widgets/misc/e-attachment-store.c:541
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgid "Add Attachment"
+msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "ਅਟੈਚ(_t)"
 
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "ਨੱਥੀ ਵਿਸ਼ੇਸਤਾ"
+#: ../widgets/misc/e-attachment-store.c:607
+#| msgid "Save attachments"
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੋ"
+msgstr[1] "ਅਟੈਚਮੈਂਟਾਂ ਸੰਭਾਲੋ"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "ਫਾਇਲ਼ ਨਾਂ:"
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME ਕਿਸਮ:"
+#: ../widgets/misc/e-attachment-view.c:326
+#| msgid "_Add attachment..."
+msgid "A_dd Attachment..."
+msgstr "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਵੇਖਾਉਣ ਲਈ ਸੁਝਾਅ"
+#: ../widgets/misc/e-attachment-view.c:643, c-format
+#| msgid "Open in %s..."
+msgid "Open with \"%s\""
+msgstr "\"%s\" ਨਾਲ ਖੋਲ੍ਹੋ"
+
+#: ../widgets/misc/e-attachment-view.c:646, c-format
+#| msgid "Save attachment as"
+msgid "Open this attachment in %s"
+msgstr "ਇਹ ਅਟੈਚਮੈਂਟ %s ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "ਮਹੀਨਾ ਕੈਲੰਡਰ"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "ਰੰਗ ਭਰੋ"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK ਰੰਗ ਭਰੋ"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "ਸਟਿਪਲ ਭਰੋ"
 
@@ -22806,26 +22159,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "ਖਾਲੀ ਥਾਂ"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "ਹੁਣ"
 
@@ -22834,7 +22186,7 @@ msgstr "ਹੁਣ"
 msgid "The time must be in the format: %s"
 msgstr "ਸਮੇਂ ਦਾ ਫਾਰਮੈਟ ਇੰਝ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ੍ਰਤੀਸ਼ਤ ਖਾਸ ਤੌਰ ਤੇ ੦ ਤੇ ੧੦੦ ਦੇ ਦਰਮਿਆਨ ਹੋਣੀ ਲਾਜ਼ਮੀ ਹੈ"
 
@@ -22848,7 +22200,7 @@ msgstr "ਬਾਲਟਿਕ"
 
 #: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
-msgstr "ਕੇਦਰੀ ਯੂਰਪ"
+msgstr "ਕੇਂਦਰੀ ਯੂਰਪੀ"
 
 #: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
@@ -22897,7 +22249,7 @@ msgstr "ਪੱਛਮੀ ਯੂਰਪ, ਨਵਾਂ"
 #: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
-msgstr "ਮੂਲ"
+msgstr "ਪੁਰਾਤਨ"
 
 #: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
@@ -22915,7 +22267,7 @@ msgstr "ਦਿੱਖ"
 #: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
-msgstr "ਅਣਪਛਾਤਾ ਅੱਖਰ ਸਮੂਹ: %s"
+msgstr "ਅਣਜਾਣ ਅੱਖਰ ਸੈੱਟ: %s"
 
 #: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
@@ -22933,144 +22285,90 @@ msgstr "ਹੋਰ..."
 msgid "Ch_aracter Encoding"
 msgstr "ਅੱਖਰ ਇੰਕੋਡਿੰਗ(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "ਮਿਤੀ ਦੇਣ ਲਈ ਟੈਕਸਟ ਇੰਦਰਾਜ਼"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਾਉਣ ਲਈ ਇਹ ਬਟਨ ਦਬਾਓ"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾਂ ਚੁਣਨ ਲਈ ਲਟਕਦਾ ਬਕਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "ਹੁਣੇ(_w)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "ਅੱਜ(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "ਗਲਤ ਤਾਰੀਖ ਮੁੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "ਗਲਤ ਸਮਾਂ ਮੁੱਲ"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "ਫੈਲਿਆ"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "ਫੈਲਾਓ ਦੇ ਲੇਬਲ ਦਾ ਟੈਕਸਟ"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "ਹੇਠਾਂ ਰੇਖਾ ਵਰਤੋਂ"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr "ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਤਾਂ, ਟੈਕਸਟ ਵਿੱਚ ਦਿੱਤਾ ਅੱਖਰ ਪ੍ਰਵੇਸ਼ਕ ਕੀ ਨੂੰ ਵੇਖਾਏਗਾ"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "ਲੇਬਲ ਤੇ ਅਗਲੇ ਵਿੱਚਕਾਰ ਅੰਤਰ ਦਿਓ"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "ਲੇਬਲ ਵਿਦਗਿਟ"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "ਆਮ ਫੈਲਾਓ ਲੇਬਲ ਦੀ ਥਾਂ ਤੇ ਇੱਕ ਵਿਦਗਿਟ ਵੇਖਾਓ"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "ਫੈਲਾਓ ਆਕਾਰ"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "ਫੈਲਾਉ ਤੀਰ ਦਾ ਆਕਾਰ"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "ਸੰਕੇਤਕ ਥਾਂ"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "ਫੈਲਾਓ ਤੀਰ ਦੁਆਲੇ ਖਾਲੀ ਥਾਓ"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "ਤਕਨੀਕੀ ਖੋਜ"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "ਖੋਜ ਸੰਭਾਲੋ"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "ਖੋਜ ਸੰਭਾਲੋ(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲੀ ਖੋਜ ਵਿੱਚ ਸੋਧ(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "ਤਕਨੀਕੀ ਖੋਜ(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹਾ"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨਕਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23086,102 +22384,101 @@ msgstr "ਆਨਲਾਈਨ"
 msgid "The button state is online"
 msgstr "ਬਟਨ ਹਾਲਤ ਆਨਲਾਈਨ ਹੈ"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "ਨਾਲ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "ਕੈਟਾਗਰੀ ਸਿਕਰੋਨਾਈਜ਼:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "ਖੋਜ ਟਾਈਪ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "ਖੋਜ(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "ਹੁਣ ਖੋਜ(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "ਸਾਫ਼(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
-msgstr "ਇਕਾਈ ID"
+msgstr "ਆਈਟਮ ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
-msgstr "ਵੇਖਾਓ(_w): "
+msgstr "ਵੇਖੋ(_w): "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "ਖੋਜ(_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " ਅੰਦਰ(_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "ਕਰਸਰ ਕਾਲਮ"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "ਕ੍ਰਮਬੱਧਕ"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "ਚੋਣ ਢੰਗ"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "ਹਟਾਉਣ ਤੇ(_l):"
 
@@ -23203,21 +22500,21 @@ msgstr "<b>ਸਥਿਤੀ ਖੋਜ</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "ਸਵੈ-ਹਟਾਈ ਭੇਜੀ ਇਕਾਈ(_u)"
+msgstr "ਸਵੈ-ਹਟਾਈ ਭੇਜੀ ਆਈਟਮ(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
-msgstr "ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਭੇਜਣ ਇਕਾਈ ਬਣਾਓ(_e)"
+msgstr "ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਭੇਜਣ ਆਈਟਮ ਬਣਾਓ(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
-msgstr "ਪਹੁੰਚੇ ਅਤੇ ਖੋਲੇ(_v)"
+msgstr "ਪਹੁੰਚੇ ਅਤੇ ਖੋਲ੍ਹੇ(_v)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "ਸਧਾਰਨ ਚੋਣ(_r)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23225,7 +22522,7 @@ msgstr ""
 "ਕੋਈ\n"
 "ਪੱਤਰ ਨਹੀਂ"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23241,15 +22538,15 @@ msgstr ""
 "ਬਹੁਤ ਗੁਪਤ\n"
 "ਸਿਰਫ਼ ਤੁਹਾਡੇ ਲਈ"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "ਜਵਾਬ ਲੋੜੀਦਾ(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ਖੋਜ(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23261,30 +22558,35 @@ msgstr ""
 "ਮਿਆਰੀ\n"
 "ਘੱਟ"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "ਜਦੋਂ ਮਨਜ਼ੂਰ ਹੋਵੇ(_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "ਜਦੋਂ ਮੁਕੰਮਲ(_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "ਜਦੋਂ ਇਨਕਾਰ ਹੋਵੇ(_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "ਵਿੱਚ(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "ਬਾਅਦ(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "ਸਭ ਜਾਣਕਾਰੀ(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#| msgid "_Classification"
+msgid "_Classification:"
+msgstr "ਵਰਗੀਕਰਨ(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23311,46 +22613,26 @@ msgid "_When opened:"
 msgstr "ਜਦੋਂ ਖੋਲ੍ਹਿਆ ਜਾਵੇ(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "URL ਉੱਤੇ ਜਾਣ ਲਈ ਇੱਥੇ ਦਬਾਓ"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "ਮਾਸਟਰ ਕੈਟਾਗਰੀ ਸੂਚੀ ਸੋਧ..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "ਇਹਨਾਂ ਕੈਟਾਗਰੀਾਂ ਨਾਲ ਸਬੰਧਤ ਆਈਟਮਾਂ(_c):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "ਕੈਟਾਗਰੀ"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ਪੋਪਅੱਪ ਲਿਸਟ"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "ਚੁਣੇ ਕਾਲਮ"
@@ -23363,23 +22645,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚੁਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਲਾਈਨ"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -23403,12 +22685,12 @@ msgstr "ਨਾ ਕ੍ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "ਕੋਈ ਗਰੁੱਪਿੰਗ ਨਹੀਂ"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
-msgstr "ਖੇਤਰ ਵੇਖਾਓ"
+msgstr "ਖੇਤਰ ਵੇਖੋ"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
 
@@ -23417,7 +22699,7 @@ msgid "A_vailable Fields:"
 msgstr "ਉਪਲੱਬਧ ਖੇਤਰ(_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ ਕਰਮ"
 
@@ -23430,13 +22712,13 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "ਘੱਟਦਾ ਕਰਮ"
 
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "ਇਸ ਰਾਹੀਂ ਗਰੁੱਪ ਇਕਾਈ"
+msgstr "ਇਸ ਰਾਹੀਂ ਗਰੁੱਪ ਆਈਟਮ"
 
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
@@ -23444,7 +22726,7 @@ msgstr "ਹੇਠਾਂ ਭੇਜੋ(_D)"
 
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
-msgstr "ਤਾਂਹ ਭੇਜੋ(_U)"
+msgstr "ਉੱਤੇ ਭੇਜੋ(_U)"
 
 #: ../widgets/table/e-table-config.glade.h:12
 msgid "Show _field in View"
@@ -23484,29 +22766,15 @@ msgstr "ਝਲਕ ਵਿੱਚ ਖੇਤਰ ਵੇਖੋ(_S)"
 
 #: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
-msgstr "ਇਹ ਫੋਲਡਰ ਲੜੀਬੱਧ ਵੇਖਾਓ(_S):"
+msgstr "ਇਹ ਫੋਲਡਰ ਲੜੀਬੱਧ ਵੇਖੋ(_S):"
 
 #: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "ਲੜੀਬੱਧ(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD ਕੋਡ"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "ਪੂਰਾ ਹੈੱਡਰ"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
-msgstr "ਕਾਲਮ ਜੋੜੋ..."
+msgstr "ਕਾਲਮ ਸ਼ਾਮਲ..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -23520,308 +22788,1814 @@ msgstr ""
 "ਆਪਣੇ ਟੇਬਲ ਵਿੱਚ ਇੱਕ ਕਾਲਮ ਨੂੰ ਜੋੜਨ ਲਈ, ਇਸ\n"
 "ਨੂੰ ਉਸ ਜਗਾ ਉੱਤੇ ਸੁੱਟ ਦਿਓ, ਜਿੱਥੇ ਤੁਸੀਂ ਵੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d ਇਕਾਈ)"
-msgstr[1] "%s : %s (%d ਇਕਾਈ)"
+msgstr[0] "%s : %s (%d ਆਈਟਮ)"
+msgstr[1] "%s : %s (%d ਆਈਟਮਾਂ)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d ਇਕਾਈ)"
-msgstr[1] "%s (%d ਆਈਟਮਾਂਂ)"
+msgstr[0] "%s (%d ਆਈਟਮ)"
+msgstr[1] "%s (%d ਆਈਟਮਾਂ)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "ਫੋਕਸ ਖਿੱਚੋ"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਮੋਡ"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "ਚੋਣ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "ਮੁੱਢਲੀ ਲੰਬਾਈ"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "ਇਕਸਾਰ ਕਤਾਰ ਉਚਾਈ"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "ਸਥਿਰ"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ਕ੍ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "ਘੱਟਦਾ ਕ੍ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "ਗੈਰ-ਕ੍ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "ਇਸ ਖੇਤਰ ਨਾਲ ਗਰੁੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "ਬਕਸੇ ਨਾਲ ਗਰੁੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "ਇਹ ਕਾਲਮ ਹਟਾਓ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "ਕਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "ਇਕਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "ਵਧੀਆ ਫਿੱਟ(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "ਕਾਲਮ ਫਾਰਮੈਟ(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "ਕਸਟਮਾਈਜ਼ ਮੌਜੂਦਾ ਝਲਕ(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "ਲੜੀਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "ਫੋਂਟ ਵੇਰਵਾ"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "ਲੜੀ"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "ਟੇਬਲ ਹੈੱਡਰ"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "ਟੇਬਲ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "ਹਮੇਸ਼ਾ ਖੋਜੋ"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲਈ ਦਬਾਓ"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "ਲੜੀ"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree ਟੇਬਲ ਐਡਪਟਰ"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ਖੋਜ"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "ਲਾਈਨਾਂ ਖਿੱਚੋ ਅਤੇ +/- ਫੈਲਾਓ"
 
-#: ../widgets/text/e-text.c:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "ਫੈਲਾਓ ਆਕਾਰ"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "ਫੈਲਾਉ ਤੀਰ ਦਾ ਆਕਾਰ"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "ਇੰਪੁੱਟ ਢੰਗ"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
-msgstr "ਘਟਨਾ ਪ੍ਰੋਸੈਂਸਰ"
+msgstr "ਈਵੈਂਟ ਪ੍ਰੋਸੈਂਸਰ"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "ਗੂੜਾ"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "ਵਿੰਨ੍ਹੋ"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "ਅੰਕਰ"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "ਇਕਸਾਰ"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "ਕਲਿੱਪ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "ਕਲਿੱਪ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "ਕਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "ਕਲਿੱਪ ਚਤਰਭੁਜ ਭਰੋ"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X ਆਫਸੈੱਟ"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y ਆਫਸੈੱਟ"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "ਟੈਕਸਟ ਚੌੜਾਈ"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "ਟੈਕਸਟ ਉਚਾਈ"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "ਅੰਡਾਕਾਰ ਵਰਤੋਂ"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "ਅੰਡਾਕਾਰ"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "ਲਾਈਨ ਲਪੇਟੋ"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "ਅੰਤਰਾਲ ਅੱਖਰ"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "ਅਧਿਕਤਮ ਲਾਈਨਾਂ"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "ਹਾਸ਼ੀਆਂ ਖਿੱਚੋ"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "ਨਵੀਆਂ-ਲਾਈਨਾਂ ਮਨਜ਼ੂਰ"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ਬਟਨ ਬਣਾਓ"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM ਪਰਸੰਗ"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "ਪੋਪਅੱਪ ਸੰਭਾਲੋ"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "ਅਟੈਚਮਿੰਟ ਬਾਰ ਬਦਲੋ"
+
+#~ msgid "activate"
+#~ msgstr "ਐਕਟੀਵੇਟ"
+
+#~ msgid "3268"
+#~ msgstr "੩੨੬੮"
+
+#~ msgid "389"
+#~ msgstr "੩੮੯"
+
+#~ msgid "636"
+#~ msgstr "੬੩੬"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>ਕਿਸਮ</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਿਲ"
+
+#~ msgid "Anonymously"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgid "Basic"
+#~ msgstr "ਬੇਸਿਕ"
+
+#~ msgid "Distinguished name"
+#~ msgstr "ਵੱਖਰਾ ਨਾਂ"
+
+#~ msgid "Email address"
+#~ msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "ਸਭ ਸੰਭਵ ਖੋਜ ਆਧਾਰ ਵਰਤੋਂ"
+
+#~ msgid "Search filter"
+#~ msgstr "ਖੋਜ ਫਿਲਟਰ"
+
+#~ msgid "Sub"
+#~ msgstr "ਅਧੀਨ"
+
+#~ msgid "Using email address"
+#~ msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "ਐਡਰੈੱਸ-ਬੁੱਕ ਸ਼ਾਮਲ(_A)"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN ਮੈਸਜ਼ਰ"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਇਜ਼"
+
+#~ msgid "_Notes:"
+#~ msgstr "ਸੂਚਨਾ(_N):"
+
+#~ msgid "United States"
+#~ msgstr "ਅਮਰੀਕਾ"
+
+#~ msgid "Afghanistan"
+#~ msgstr "ਅਫਗਾਨਿਸਤਾਨ"
+
+#~ msgid "Albania"
+#~ msgstr "ਅਲਬੀਨਾ"
+
+#~ msgid "Algeria"
+#~ msgstr "ਅਲਜੀਰੀਆ"
+
+#~ msgid "American Samoa"
+#~ msgstr "ਅਮਰੀਕੀ ਸਾਮੋਨਾ"
+
+#~ msgid "Andorra"
+#~ msgstr "ਅਡੂਰਾ"
+
+#~ msgid "Angola"
+#~ msgstr "ਅੰਗੋਲਾ"
+
+#~ msgid "Anguilla"
+#~ msgstr "ਅੰਗੂਲੀਆਂ"
+
+#~ msgid "Antarctica"
+#~ msgstr "ਅੰਟਾਰਿਕਟਾ"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "ਐਟੀਗੁਆ ਤੇ ਬਾਰਬੁਡਾ"
+
+#~ msgid "Argentina"
+#~ msgstr "ਅਰਜਨਟੀਨਾ"
+
+#~ msgid "Armenia"
+#~ msgstr "ਅਰਮੀਨਾ"
+
+#~ msgid "Aruba"
+#~ msgstr "ਅਰੂਬਾ"
+
+#~ msgid "Australia"
+#~ msgstr "ਆਸਟਰੇਲੀਆ"
+
+#~ msgid "Austria"
+#~ msgstr "ਆਸਟਰੀਆ"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "ਅਜ਼ਰਬਾਈਜਾਨ"
+
+#~ msgid "Bahamas"
+#~ msgstr "ਬਾਹਾਮਾਸ"
+
+#~ msgid "Bahrain"
+#~ msgstr "ਬਹਿਰਾਨ"
+
+#~ msgid "Bangladesh"
+#~ msgstr "ਬੰਗਲਾਦੇਸ਼"
+
+#~ msgid "Barbados"
+#~ msgstr "ਬਾਰਬਾਡਾਸ"
+
+#~ msgid "Belarus"
+#~ msgstr "ਬੇਲਾਰੂਸ"
+
+#~ msgid "Belgium"
+#~ msgstr "ਬੈਲਜੀਅਮ"
+
+#~ msgid "Belize"
+#~ msgstr "ਬੀਲੀਜ਼ੀ"
+
+#~ msgid "Benin"
+#~ msgstr "ਬੀਨਾਨ"
+
+#~ msgid "Bermuda"
+#~ msgstr "ਬਾਰਾਮੂਡਾ"
+
+#~ msgid "Bhutan"
+#~ msgstr "ਭੁਟਾਨ"
+
+#~ msgid "Bolivia"
+#~ msgstr "ਬੋਲੋਵੀਆ"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "ਬੋਸੋਨੀਆ ਤੇ ਹਰਜ਼ੀਨਗੋਵੀਨਾ"
+
+#~ msgid "Botswana"
+#~ msgstr "ਬੂਟਸਵਾਨਾ"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "ਬੂਟਵਟ ਟਾਪੂ"
+
+#~ msgid "Brazil"
+#~ msgstr "ਬਰਾਜ਼ੀਲ"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "ਬਰਤਾਨੀਆ ਭਾਰਤੀ ਸਮੁੰਦਰੀ ਖੇਤਰ"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "ਬਰੂਨਈ ਡਾਰੂਸ਼ਲਾਮ"
+
+#~ msgid "Bulgaria"
+#~ msgstr "ਬੁਲਗਾਰੀਆ"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "ਬੂਪਕੀਨਾ ਫਾਸੋ"
+
+#~ msgid "Burundi"
+#~ msgstr "ਬੂਰੂਮਾਡੀ"
+
+#~ msgid "Cambodia"
+#~ msgstr "ਕੋਲੰਬੀਆ"
+
+#~ msgid "Cameroon"
+#~ msgstr "ਕੈਮਰੂਨ"
+
+#~ msgid "Canada"
+#~ msgstr "ਕੈਨੇਡਾ"
+
+#~ msgid "Cape Verde"
+#~ msgstr "ਕੇਪ ਵਾਰਡੀ"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "ਕਾਯਮਨ ਟਾਪੂ"
+
+#~ msgid "Central African Republic"
+#~ msgstr "ਕੇਦਰੀ ਅਫਰੀਕਾ ਗਣਰਾਜ਼"
+
+#~ msgid "Chad"
+#~ msgstr "ਚੰਦ"
+
+#~ msgid "Chile"
+#~ msgstr "ਚਿੱਲੀ"
+
+#~ msgid "China"
+#~ msgstr "ਚੀਨ"
+
+#~ msgid "Christmas Island"
+#~ msgstr "ਕ੍ਰਿਸਮਿਸ ਟਾਪੂ"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "ਕੋਕੋਸ(ਕਿਲਿੰਗ) ਟਾਪੂ"
+
+#~ msgid "Colombia"
+#~ msgstr "ਕੋਲੰਬੀਆ"
+
+#~ msgid "Comoros"
+#~ msgstr "ਕੋਮੋਰਸ"
+
+#~ msgid "Congo"
+#~ msgstr "ਕਾਂਗੋ"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "ਕਾਂਗੋ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
+
+#~ msgid "Cook Islands"
+#~ msgstr "ਕੁੱਕ ਟਾਪੂ"
+
+#~ msgid "Costa Rica"
+#~ msgstr "ਕਾਸਟ ਰੀਕਾ"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "ਕੋਟੀ ਡੀਵੋਰਆ"
+
+#~ msgid "Croatia"
+#~ msgstr "ਕਰੋਟੀਆ"
+
+#~ msgid "Cuba"
+#~ msgstr "ਕਿਊਬਾ"
+
+#~ msgid "Cyprus"
+#~ msgstr "ਕਿਊਰੂਸ"
+
+#~ msgid "Czech Republic"
+#~ msgstr "ਚੈਕ ਗਣਰਾਜ"
+
+#~ msgid "Denmark"
+#~ msgstr "ਡੈਨਮਾਰਕ"
+
+#~ msgid "Djibouti"
+#~ msgstr "ਡਜੀਬੂਟੀ"
+
+#~ msgid "Dominica"
+#~ msgstr "ਡੋਮੀਨੀਆ"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "ਡੋਮੀਨੀਆਨ ਗਣਰਾਜ਼"
+
+#~ msgid "Ecuador"
+#~ msgstr "ਏਕਵੇਡਰ"
+
+#~ msgid "Egypt"
+#~ msgstr "ਮਿਸਰ"
+
+#~ msgid "El Salvador"
+#~ msgstr "ਈਲ ਸਾਲੇਵਡੋਰ"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "ਭੂ-ਖੰਡੀ ਗੁਆਨਾ"
+
+#~ msgid "Eritrea"
+#~ msgstr "ਈਰਟੀਰਆ"
+
+#~ msgid "Estonia"
+#~ msgstr "ਈਸਟੋਨੀਆ"
+
+#~ msgid "Ethiopia"
+#~ msgstr "ਈਥੋਪਈਆ"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "ਫਾਕਲੈਡ ਟਾਪੂ"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "ਫਾਰੀਓ ਟਾਪੂ"
+
+#~ msgid "Fiji"
+#~ msgstr "ਫਿਜ਼ੀ"
+
+#~ msgid "Finland"
+#~ msgstr "ਫਿਨਲੈਡ"
+
+#~ msgid "France"
+#~ msgstr "ਫਰਾਂਸ"
+
+#~ msgid "French Guiana"
+#~ msgstr "ਫਰੇਚ ਗੁਆਨਾ"
+
+#~ msgid "French Polynesia"
+#~ msgstr "ਫਰੈਂਚ ਪੋਲੀਸੇਲੇਵੀਆ"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "ਫਰੈਂਚ ਦੱਖਣੀ ਖੇਤਰ"
+
+#~ msgid "Gabon"
+#~ msgstr "ਗਾਬੋਨ"
+
+#~ msgid "Gambia"
+#~ msgstr "ਗਾਬੀਆ"
+
+#~ msgid "Georgia"
+#~ msgstr "ਜਾਰਜੀਆ"
+
+#~ msgid "Germany"
+#~ msgstr "ਜਰਮਨੀ"
+
+#~ msgid "Ghana"
+#~ msgstr "ਗਾਨਾ"
+
+#~ msgid "Gibraltar"
+#~ msgstr "ਗੀਬਰਾਲਟਾਰ"
+
+#~ msgid "Greece"
+#~ msgstr "ਗਰੀਸ"
+
+#~ msgid "Greenland"
+#~ msgstr "ਗਰੀਨਲੈਡ"
+
+#~ msgid "Grenada"
+#~ msgstr "ਗਰੀਨਾਡਾਆ"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "ਗੁਆਡੀਲੂਪੀ"
+
+#~ msgid "Guam"
+#~ msgstr "ਗੁਆਮ"
+
+#~ msgid "Guatemala"
+#~ msgstr "ਗੂਆਟੇਮਾਲਾ"
+
+#~ msgid "Guernsey"
+#~ msgstr "ਗੂਈਮਸੀਯਾ"
+
+#~ msgid "Guinea"
+#~ msgstr "ਗੂਈਨੀਆ"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "ਗੂਈਨੀਆ-ਬੀਸਓ"
+
+#~ msgid "Guyana"
+#~ msgstr "ਗੁਆਨਾ"
+
+#~ msgid "Haiti"
+#~ msgstr "ਹਾਈਟੀ"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "ਹਾਰਡ ਤੇ ਮੈਕਡਾਨਲਡ ਟਾਪੂ"
+
+#~ msgid "Holy See"
+#~ msgstr "ਹੋਲੀ ਸੀ"
+
+#~ msgid "Honduras"
+#~ msgstr "ਹਾਨਡੂਰਸ"
+
+#~ msgid "Hong Kong"
+#~ msgstr "ਹਾਂਗ ਕਾਂਗ"
+
+#~ msgid "Hungary"
+#~ msgstr "ਹੰਗਰੀ"
+
+#~ msgid "Iceland"
+#~ msgstr "ਆਈਸਲੈਂਡ"
+
+#~ msgid "India"
+#~ msgstr "ਭਾਰਤ"
+
+#~ msgid "Indonesia"
+#~ msgstr "ਇੰਡੋਨੇਸੀਆ"
+
+#~ msgid "Iran"
+#~ msgstr "ਈਰਾਨ"
+
+#~ msgid "Iraq"
+#~ msgstr "ਇਰਾਕ"
+
+#~ msgid "Ireland"
+#~ msgstr "ਆਇਰਲੈਡ"
+
+#~ msgid "Isle of Man"
+#~ msgstr "ਇਸਲੀ ਆਫ ਮੈਨ"
+
+#~ msgid "Israel"
+#~ msgstr "ਇਜ਼ਾਰਾਈਲ"
+
+#~ msgid "Italy"
+#~ msgstr "ਇਟਲੀ"
+
+#~ msgid "Jamaica"
+#~ msgstr "ਜੈਮਾਈਕਾ"
+
+#~ msgid "Japan"
+#~ msgstr "ਜਾਪਾਨ"
+
+#~ msgid "Jersey"
+#~ msgstr "ਜ਼ੇਰਸਈ"
+
+#~ msgid "Jordan"
+#~ msgstr "ਜਾਰਡਨ"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "ਕਜ਼ਾਕਸਤਾਨ"
+
+#~ msgid "Kenya"
+#~ msgstr "ਕੀਨੀਆ"
+
+#~ msgid "Kiribati"
+#~ msgstr "ਕੀਰੀਬਾਟੀ"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "ਕੋਰੀਆ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ਼"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "ਕੋਰੀਆ ਗਣਰਾਜ਼"
+
+#~ msgid "Kuwait"
+#~ msgstr "ਕੁਵੈਤ"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "ਕਿਰਗਸਤਾਨ"
+
+#~ msgid "Laos"
+#~ msgstr "ਲਿਉਸ"
+
+#~ msgid "Latvia"
+#~ msgstr "ਲਾਟੀਵਾਆ"
+
+#~ msgid "Lebanon"
+#~ msgstr "ਲੀਬਨਾਨ"
+
+#~ msgid "Lesotho"
+#~ msgstr "ਲੀਸੋਥੋ"
+
+#~ msgid "Liberia"
+#~ msgstr "ਲੀਬਾਰੀਆ"
+
+#~ msgid "Libya"
+#~ msgstr "ਲੀਬੀਆ"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "ਲੀਚਟੀਨੀਆ"
+
+#~ msgid "Lithuania"
+#~ msgstr "ਲੀਥੂਆਨੀਆ"
+
+#~ msgid "Luxembourg"
+#~ msgstr "ਲ਼ਕਸ਼ਬਰਗ"
+
+#~ msgid "Macao"
+#~ msgstr "ਮੈਕਸੀਕੋ"
+
+#~ msgid "Macedonia"
+#~ msgstr "ਮੈਕਡੋਨੀਆ"
+
+#~ msgid "Madagascar"
+#~ msgstr "ਮੈਡਾਗਾਸਕਰ"
+
+#~ msgid "Malawi"
+#~ msgstr "ਮਾਲਾਵੀਆ"
+
+#~ msgid "Malaysia"
+#~ msgstr "ਮਲੇਸੀਆ"
+
+#~ msgid "Maldives"
+#~ msgstr "ਮਾਲਦੀਪ"
+
+#~ msgid "Mali"
+#~ msgstr "ਮਾਲੀ"
+
+#~ msgid "Malta"
+#~ msgstr "ਮਾਲਟਾ"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "ਮਾਰਸ਼ਲ ਟਾਪੂ"
+
+#~ msgid "Martinique"
+#~ msgstr "ਮਾਰਟੀਨੀਕਿਊ"
+
+#~ msgid "Mauritania"
+#~ msgstr "ਮਾਓਰੀਟਆਨਾ"
+
+#~ msgid "Mauritius"
+#~ msgstr "ਮਾਓਟੀਸ"
+
+#~ msgid "Mayotte"
+#~ msgstr "ਮਾਈਟੀ"
+
+#~ msgid "Mexico"
+#~ msgstr "ਮੈਕਸੀਕੋ"
+
+#~ msgid "Micronesia"
+#~ msgstr "ਮਾਕਰੋਨੀਸ਼ੀਆ"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "ਮੋਲਡੋਵਾ ਗਣਰਾਜ"
+
+#~ msgid "Monaco"
+#~ msgstr "ਮੋਨਸ਼ੀਆ"
+
+#~ msgid "Mongolia"
+#~ msgstr "ਮੰਗੋਲੀਆ"
+
+#~ msgid "Montserrat"
+#~ msgstr "ਮੋਨਟਸ਼ਟੀਟ"
+
+#~ msgid "Morocco"
+#~ msgstr "ਮੋਰੋਸ਼ਸ"
+
+#~ msgid "Mozambique"
+#~ msgstr "ਮੋਜ਼ਾਮਬੀਕਿਉ"
+
+#~ msgid "Myanmar"
+#~ msgstr "ਮਿਆਮਾਰ"
+
+#~ msgid "Namibia"
+#~ msgstr "ਨੀਮੀਬੀਆ"
+
+#~ msgid "Nauru"
+#~ msgstr "ਨੀਓਰੂ"
+
+#~ msgid "Nepal"
+#~ msgstr "ਨੇਪਾਲ"
+
+#~ msgid "Netherlands"
+#~ msgstr "ਨੀਦਰਲੈਂਡ"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "ਨੀਦਰਲੈਂਡ ਐਟੀਲਸ"
+
+#~ msgid "New Caledonia"
+#~ msgstr "ਨਵਾਂ ਕਾਲੀਡੋਨੀਆਂ"
+
+#~ msgid "New Zealand"
+#~ msgstr "ਨਿਊਜੀਲੈਂਡ"
+
+#~ msgid "Nicaragua"
+#~ msgstr "ਨਿਕਾਰਗੁਆ"
+
+#~ msgid "Niger"
+#~ msgstr "ਨੀਜ਼ਰ"
+
+#~ msgid "Nigeria"
+#~ msgstr "ਨੀਜ਼ੀਰਆ"
+
+#~ msgid "Niue"
+#~ msgstr "ਨੀਊਈ"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "ਨੋਰਫੋਕ ਟਾਪੂ"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "ਉੱਤਰੀ ਮਰੀਵੀਆਨਾ ਟਾਪੂ"
+
+#~ msgid "Norway"
+#~ msgstr "ਨਾਰਵੇ"
+
+#~ msgid "Oman"
+#~ msgstr "ਓਮਾਨ"
+
+#~ msgid "Pakistan"
+#~ msgstr "ਪਾਕਿਸਤਾਨ"
+
+#~ msgid "Palau"
+#~ msgstr "ਪਾਲਾਊ"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "ਫਿਲੀਸਤੀਨ ਭਾਗ"
+
+#~ msgid "Panama"
+#~ msgstr "ਪੈਨਾਮਾ"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "ਪਾਪੂਆ ਨਵਾਂ ਗੂਈਨਿਆ"
+
+#~ msgid "Paraguay"
+#~ msgstr "ਪੇਰੂਗਵੇ"
+
+#~ msgid "Peru"
+#~ msgstr "ਪੇਰੂ"
+
+#~ msgid "Philippines"
+#~ msgstr "ਫਿਲਿਪੀਨੀਜ਼"
+
+#~ msgid "Pitcairn"
+#~ msgstr "ਪਿਟਸਾਰਨ"
+
+#~ msgid "Poland"
+#~ msgstr "ਪੋਲੈਂਡ"
+
+#~ msgid "Portugal"
+#~ msgstr "ਪੁਰਤਗਾਲ"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "ਪੁਈਰਟੋ ਰੀਸੋ"
+
+#~ msgid "Qatar"
+#~ msgstr "ਕਤਰ"
+
+#~ msgid "Reunion"
+#~ msgstr "ਰੀਯੁਨੀਅਨ"
+
+#~ msgid "Romania"
+#~ msgstr "ਰੋਮਾਨੀਆ"
+
+#~ msgid "Russian Federation"
+#~ msgstr "ਰੂਸੀ ਗਣਰਾਜ"
+
+#~ msgid "Rwanda"
+#~ msgstr "ਰਵਾਂਡਾਂ"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "ਸੇਂਟ ਕਿੱਟਸ ਐਂਡ ਨੀਵਿਸ"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "ਸੇਂਟ ਲੂਸੀਆ"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "ਸੇਂਟ ਵੀਨਸੈਂਟ ਐਂਡ ਦੀ ਗਰੀਨਾ-ਡੀਨਸ"
+
+#~ msgid "Samoa"
+#~ msgstr "ਸਾਮੀਆ"
+
+#~ msgid "San Marino"
+#~ msgstr "ਸਾਨ ਮਾਰੀਨੂ"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "ਸਾਓ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "ਸਾਊਦੀ ਅਰਬ"
+
+#~ msgid "Senegal"
+#~ msgstr "ਸੈਨੇਗਾਲ"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "ਸਰਬੀਆ ਐਂਡ ਮੋਨਟੀਓਗਰੋ"
+
+#~ msgid "Seychelles"
+#~ msgstr "ਸੀਆਚਿਲਸ"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "ਸੀਈਰਆ ਲਿਏਨ"
+
+#~ msgid "Singapore"
+#~ msgstr "ਸਿੰਘਾਪੁਰ"
+
+#~ msgid "Slovakia"
+#~ msgstr "ਸਲੋਵਾਕੀਆ"
+
+#~ msgid "Slovenia"
+#~ msgstr "ਸਲੋਵੀਨੀਆ"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "ਸੋਲੋਮੋਨ ਟਾਪੂ"
+
+#~ msgid "Somalia"
+#~ msgstr "ਸੋਮਾਲੀਆ"
+
+#~ msgid "South Africa"
+#~ msgstr "ਦੱਖਣੀ ਅਫਰੀਕਾ"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "ਦੱਖਣੀ ਜਾਰਜੀਆਂ ਤੇ ਦੱਖਣੀ ਸੈਡਵਿੱਚ ਟਾਪੂ"
+
+#~ msgid "Spain"
+#~ msgstr "ਸਪੇਨ"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "ਸ੍ਰੀਲੰਕਾ"
+
+#~ msgid "St. Helena"
+#~ msgstr "ਸੇਂਟ ਹੀਲੀਨਆ"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "ਸੇਂਟ ਪੀਰੀਅਰ ਤੇ ਮੀਕਿਉਨ"
+
+#~ msgid "Sudan"
+#~ msgstr "ਸੂਡਾਨ"
+
+#~ msgid "Suriname"
+#~ msgstr "ਸੂਰੀਨਾਂ"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "ਸਵਾਲਬਰਡ ਕੇ ਜਾਨ ਮਾਈਯਾਮ ਟਾਪੂ"
+
+#~ msgid "Swaziland"
+#~ msgstr "ਸਵਾਜ਼ੀਲੈਂਡ"
+
+#~ msgid "Sweden"
+#~ msgstr "ਸਵੀਡਨ"
+
+#~ msgid "Switzerland"
+#~ msgstr "ਸਵਿਟਰਜ਼ਰਲੈਂਡ"
+
+#~ msgid "Syria"
+#~ msgstr "ਸੀਰੀਆ"
+
+#~ msgid "Taiwan"
+#~ msgstr "ਤਾਈਵਾਨ"
+
+#~ msgid "Tajikistan"
+#~ msgstr "ਤਜ਼ਾਕਸਤਾਨ"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "ਤਨਜਾਨੀਆਂ, ਗਣਰਾਜ"
+
+#~ msgid "Thailand"
+#~ msgstr "ਥਾਈਲੈਂਡ"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "ਟੀਮੁਰ-ਲੀਸਟੀ"
+
+#~ msgid "Togo"
+#~ msgstr "ਟੂਗੂ"
+
+#~ msgid "Tokelau"
+#~ msgstr "ਟੂਕੀਲਾਊ"
+
+#~ msgid "Tonga"
+#~ msgstr "ਟੂਨਗਾ"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "ਟਰੀਨੀਡ ਤੇ ਟੋਬਾਗੂ"
+
+#~ msgid "Tunisia"
+#~ msgstr "ਟੁਨੀਸ਼ੀਆ"
+
+#~ msgid "Turkey"
+#~ msgstr "ਤੁਰਕੀ"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "ਤੁਰਕਸਤਾਨ"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "ਤੁਰਕ ਤੇ ਕਾਸਕੋਸ ਟਾਪੂ"
+
+#~ msgid "Tuvalu"
+#~ msgstr "ਟੂਵਾਲੂ"
+
+#~ msgid "Uganda"
+#~ msgstr "ਯੂਗਾਂਡਾ"
+
+#~ msgid "Ukraine"
+#~ msgstr "ਯੂਕਰੇਨ"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "ਸੰਯੁਕਤ ਰਾਜ ਅਮੀਰਾਤ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "ਬਰਤਾਨੀਆ"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "ਅਮਰੀਕਾ ਦੇ ਛੋਟੇ ਟਾਪੂ"
+
+#~ msgid "Uruguay"
+#~ msgstr "ਉਰੂਗਵੇ"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "ਉਜ਼ੇਬਕਸਤਾਨ"
+
+#~ msgid "Vanuatu"
+#~ msgstr "ਵਾਨੂਟੂ"
+
+#~ msgid "Venezuela"
+#~ msgstr "ਵੈਨੂਜੇਏਲਾ"
+
+#~ msgid "Viet Nam"
+#~ msgstr "ਵੀਅਤਨਾਂ"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "ਵਿਰਗਿਨ ਟਾਪੂ ਬਰਤਾਨੀਆ"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "ਵਿਰਗਿਨ ਟਾਪੂ, ਅਮਰੀਕਾ"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "ਵਾਲਿਸ਼ ਤੇ ਫੂਟੂਨਾ ਟਾਪੂ"
+
+#~ msgid "Western Sahara"
+#~ msgstr "ਦੱਖਣੀ ਸਹਾਰਾ"
+
+#~ msgid "Yemen"
+#~ msgstr "ਯਮਨ"
+
+#~ msgid "Zambia"
+#~ msgstr "ਜੈਂਬੀਆ"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "ਜਿੰਬਾਬਾਵੇ"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "ਯਾਹੂ ਸੁਨੇਹੇਦਾਰ"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "ਗਡੂ-ਗਡੂ ਸੁਨੇਹੇਦਾਰ"
+
+#~ msgid "Service"
+#~ msgstr "ਸੇਵਾ"
+
+#~ msgid "Username"
+#~ msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+
+#~ msgid "Address _2:"
+#~ msgstr "ਐਡਰੈੱਸ _੨:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "ਸ਼ਹਿਰ(_t):"
+
+#~ msgid "Countr_y:"
+#~ msgstr "ਦੇਸ਼(_y):"
+
+#~ msgid "Full Address"
+#~ msgstr "ਪੂਰਾ ਐਡਰੈੱਸ"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "ਪਿੰਨ ਕੋਡ(_Z):"
+
+#~ msgid "Dr."
+#~ msgstr "ਡਾ."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "ਜੂਨੀਅਰ"
+
+#~ msgid "Miss"
+#~ msgstr "ਕੁਮਾਰੀ"
+
+#~ msgid "Mr."
+#~ msgstr "ਸ੍ਰੀਮਾਨ"
+
+#~ msgid "Mrs."
+#~ msgstr "ਸ੍ਰੀਮਤੀ"
+
+#~ msgid "Ms."
+#~ msgstr "ਸ੍ਰੀਮਤੀ"
+
+#~ msgid "Sr."
+#~ msgstr "ਸੀਨੀਅਰ"
+
+#~ msgid "Add IM Account"
+#~ msgstr "IM ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕਰੋ"
+
+#~ msgid "_Account name:"
+#~ msgstr "ਅਕਾਊਂਟ ਨਾਂ(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM ਸੇਵਾ:"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 ਬਿੰਦੂ ਤਾਹੂਮਾ"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "੮ ਬਿੰਦੂ ਤਾਹੂਮਾ"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "ਅੰਤ ਤੇ ਖਾਲੀ ਫਾਰਮ:"
+
+#~ msgid "Body"
+#~ msgstr "ਭਾਗ"
+
+#~ msgid "Bottom:"
+#~ msgstr "ਹੇਠਾਂ:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "ਆਕਾਰ:"
+
+#~ msgid "F_ont..."
+#~ msgstr "ਫੋਂਟ(_o)..."
+
+#~ msgid "Fonts"
+#~ msgstr "ਫੋਂਟ"
+
+#~ msgid "Footer:"
+#~ msgstr "ਪਦਲੇਖ:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "ਹੈੱਡਰ/ਪਦਲੇਖ"
+
+#~ msgid "Headings"
+#~ msgstr "ਹੈਡਿੰਗ"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "ਹਰ ਪੱਤਰ ਲਈ ਹੈਡਿੰਗ"
+
+#~ msgid "Height:"
+#~ msgstr "ਉਚਾਈ:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ਹੁਣੇ ਹਰ ਬਾਅਦ ਕਰੋ"
+
+#~ msgid "Include:"
+#~ msgstr "ਸ਼ਾਮਿਲ:"
+
+#~ msgid "Landscape"
+#~ msgstr "ਲੈਡਸਕੇਪ"
+
+#~ msgid "Left:"
+#~ msgstr "ਖੱਬਾ:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "ਪਾਸੇ ਤੇ ਪੱਤਰ ਟੈਬਾਂ"
+
+#~ msgid "Margins"
+#~ msgstr "ਹਾਸ਼ੀਆ"
+
+#~ msgid "Number of columns:"
+#~ msgstr "ਕਾਲਮਾਂ ਦੀ ਗਿਣਤੀ:"
+
+#~ msgid "Options"
+#~ msgstr "ਚੋਣ"
+
+#~ msgid "Orientation"
+#~ msgstr "ਸਥਿਤੀ"
+
+#~ msgid "Page"
+#~ msgstr "ਸਫਾ"
+
+#~ msgid "Page Setup:"
+#~ msgstr "ਸਫ਼ਾ ਨਿਰਧਾਰਨ:"
+
+#~ msgid "Paper"
+#~ msgstr "ਸਫਾ"
+
+#~ msgid "Paper source:"
+#~ msgstr "ਸਫ਼ਾ ਸਰੋਤ:"
+
+#~ msgid "Portrait"
+#~ msgstr "ਪੋਰਟਰੇਟ"
+
+#~ msgid "Preview:"
+#~ msgstr "ਝਲਕ:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "ਸਲੇਟੀ ਛਾਂ ਨਾਲ ਪਰਿੰਟ ਕਰੋ"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "ਜਿਸਤ ਸਫਿਆਂ ਤੇ ਉਲਟ"
+
+#~ msgid "Right:"
+#~ msgstr "ਸੱਜਾ:"
+
+#~ msgid "Sections:"
+#~ msgstr "ਖੰਡ:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ਇੱਕ ਨਵੇਂ ਸਫ਼ੇ ਸ਼ੁਰੂ ਕਰੋ"
+
+#~ msgid "Style name:"
+#~ msgstr "ਸ਼ੈਲੀ ਨਾਂ:"
+
+#~ msgid "Top:"
+#~ msgstr "ਉਪਰ:"
+
+#~ msgid "Width:"
+#~ msgstr "ਚੌੜਾਈ:"
+
+#~ msgid "_Font..."
+#~ msgstr "ਫੋਂਟ(_F)..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "ਕੀ ਘਟਨਾ ਵੇਖਾਉਣ ਦੌਰਾਨ ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ।"
+
+#~ msgid "daylight savings time"
+#~ msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾਂ"
+
+#~ msgid "after"
+#~ msgstr "ਬਾਅਦ"
+
+#~ msgid "day(s)"
+#~ msgstr "ਦਿਨ"
+
+#~ msgid "end of appointment"
+#~ msgstr "ਮੁਲਾਕਾਤ ਦਾ ਅੰਤ"
+
+#~ msgid "hour(s)"
+#~ msgstr "ਘੰਟੇ"
+
+#~ msgid "minute(s)"
+#~ msgstr "ਮਿੰਟ"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "ਦਿਨ-ਰਾਤ ਰੌਸ਼ਨੀ ਸਮਾਂ ਲਈ ਅਨੁਕੂਲ(_v)"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "ਅਟੈਚ ਕੀਤਾ ਸੁਨੇਹਾ - %s"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> ਨੱਥੀ"
+#~ msgstr[1] "<b>%d</b> ਨੱਥੀ"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
+
+#~ msgid "Show Attachments"
+#~ msgstr "ਨੱਥੀ ਵੇਖਾਓ"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ੧ ਦਿਨ ਪਹਿਲਾਂ"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ ੧ ਘੰਟਾ"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "ਮੁਲਾਕਾਤ ਤੋਂ ਪਹਿਲਾਂ ੧੫ ਮਿੰਟ"
+
+#~ msgid "for"
+#~ msgstr "ਲਈ"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>ਦਰਸ਼ਕ(_e)</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "ਪ੍ਰਬੰਧਕ ਤਬਦੀਲ(_O):"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "ਸੰਪਰਕ(_N)..."
+
+#~ msgid "forever"
+#~ msgstr "ਹਮੇਸ਼ਾ"
+
+#~ msgid "month(s)"
+#~ msgstr "ਮਹੀਨਾ"
+
+#~ msgid "week(s)"
+#~ msgstr "ਹਫਤਾ"
+
+#~ msgid "year(s)"
+#~ msgstr "ਸਾਲ"
+
+#~ msgid "_Save Selected"
+#~ msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
+
+#~ msgid "April"
+#~ msgstr "ਅਪਰੈਲ"
+
+#~ msgid "August"
+#~ msgstr "ਅਗਸਤ"
+
+#~ msgid "December"
+#~ msgstr "ਦਸੰਬਰ"
+
+#~ msgid "February"
+#~ msgstr "ਫਰਵਰੀ"
+
+#~ msgid "January"
+#~ msgstr "ਜਨਵਰੀ"
+
+#~ msgid "July"
+#~ msgstr "ਜੁਲਾਈ"
+
+#~ msgid "June"
+#~ msgstr "ਜੂਨ"
+
+#~ msgid "March"
+#~ msgstr "ਮਾਰਚ"
+
+#~ msgid "May"
+#~ msgstr "ਮਈ"
+
+#~ msgid "November"
+#~ msgstr "ਨਵੰਬਰ"
+
+#~ msgid "October"
+#~ msgstr "ਅਕਤੂਬਰ"
+
+#~ msgid "September"
+#~ msgstr "ਸਤੰਬਰ"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "ਆਟੋ-ਸੰਭਾਲੀ ਫਾਈਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "ਭੇਜਣਾ ਖੇਤਰ(_P)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਭੇਜੋ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#~ msgid "_Subject Field"
+#~ msgstr "ਵਿਸ਼ਾ ਖੇਤਰ(_S)"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "ਬਦਲੋ ਕਿ ਕੀ ਵਿਸ਼ਾ ਖੇਤਰ ਵੇਖਾਇਆ ਜਾਵੇ"
+
+#~ msgid "_To Field"
+#~ msgstr "ਵੱਲ ਖੇਤਰ(_T)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "ਤਬਦੀਲ ਕਰੋ ਕਿ ਵੱਲ ਖੇਤਰ ਵੇਖਿਆ ਜਾਵੇ"
+
+#~ msgid "ago"
+#~ msgstr "ਪਹਿਲਾਂ"
+
+#~ msgid "months"
+#~ msgstr "ਮਹੀਨੇ"
+
+#~ msgid "the current time"
+#~ msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
+
+#~ msgid "the time you specify"
+#~ msgstr "ਸਮਾਂ ਜੋ ਤੁਸੀਂ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਹੈ"
+
+#~ msgid "years"
+#~ msgstr "ਸਾਲ"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "ਸੁਨੇਹਾ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "C_all To..."
+#~ msgstr "ਕਾਲ ਕਰੋ(_a)..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "%B %d, %Y, %l:%M %p ਵਜੇ ਸਮਾਪਤ"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d ਨੱਥੀ(_t)"
+#~ msgstr[1] "%d ਨੱਥੀ(_t)"
+
+#~ msgid "S_ave"
+#~ msgstr "ਸੰਭਾਲੋ(_a)"
+
+#~ msgid "No Attachment"
+#~ msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#  translators: strftime format for local time equivalent in Date header display, without day
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "ਬਾਹੀ ਖੋਜ ਫੀਚਰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ ਤੁਸੀਂ ਟੈਕਸਟ ਵਿੱਚ ਲਿਖ ਕੇ ਖੋਜ ਸ਼ੁਰੂ ਕਰ ਸਕੋ। ਇਸ ਦਾ ਫਾਇਦਾ ਇਹ "
+#~ "ਹੈ ਕਿ ਤੁਸੀਂ ਬਾਹੀ ਵਿੱਚ ਫੋਲਡਰ ਨਾਂ ਲਿਖ ਕੇ ਹੀ ਖੋਜ ਕਰ ਸਕੋ ਅਤੇ ਖੋਜ ਆਟੋਮੈਟਿਕ ਹੀ ਉਸ ਫੋਲਡਰ ਉੱਤੇ "
+#~ "ਚਲੀ ਜਾਵੇ।"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "ਵੇਖੋ/Bcc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "ਵੇਖੋ/Cc ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "ਵੇਖੋ/ਵੱਲੋਂ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "ਵੇਖੋ/ਭੇਜੋ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "ਵੇਖੋ/ਜਵਾਬ ਮੇਨੂੰ ਇਕਾਈ ਚੁਣੀ ਗਈ ਹੈ।"
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
+
+#~ msgid "Do not quote"
+#~ msgstr "ਕੋਟ ਨਾ ਕਰੋ"
+
+#~ msgid "Inline"
+#~ msgstr "ਲਾਇਨ 'ਚ"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "ਇਨਲਾਇਨ (ਆਉਟਲੁੱਕ ਸਟਾਈਲ)"
+
+#~ msgid "Quoted"
+#~ msgstr "ਹਵਾਲਾ"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "S_OCKS ਹੋਸਟ:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "ਡਰਾਫਟ ਫੋਲਡਰ ਚੁਣੋ"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "ਭੇਜੇ ਫੋਲਡਰ ਚੁਣੋ"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "ਆਟੋਮੈਟਿਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ URL (_a):"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "ਅੱਖਰ ਅਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ(_S)"
+
+#~ msgid "F_ind:"
+#~ msgstr "ਖੋਜ(_i):"
+
+#~ msgid "Find in Message"
+#~ msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਲੱਭੋ"
+
+#~ msgid "None Selected"
+#~ msgstr "ਕੋਈ ਚੁਣਿਆ ਨਹੀਂ"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦਾ ਹੈ।"
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਅਟੈਚਮੈਂਟ ਦੀ ਸੂਹ ਲਵੋ ਅਤੇ ਜੇ ਅਟੈਚਮੈਂਟ ਨਾ ਹੋਵੇ ਤਾਂ ਚੇਤਾਵਨੀ ਦਿਓ"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਨੱਥੀ ਪਲੱਗ-ਇਨ ਨੂੰ ਲਾਈਨ 'ਚ ਵੇਖਾਓ ਅਤੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਸਿੱਧਾ ਚਲਾਉਣ "
+#~ "ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗ ਬੈਕਅੱਪ ਅਤੇ ਮੁੜ-ਪਰਾਪਤ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV ਕੈਲੰਡਰ ਸਰੋਤ"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "ਸਥਾਨਕ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP ਕੈਲੰਡਰ"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "ਵੈਬ-ਕੈਲ ਅਤੇ http ਕੈਲੰਡਰਾਂ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "ਮੌਸਮ ਕੈਲੰਡਰ ਲਈ ਮੂਲ ਸਹੂਲਤਾਂ ਦਿੰਦੀ ਹੈ।"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "ਇੱਕ ਟੈਕਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਾਪਅੱਪ ਮੇਨੂ ਦੀ ਝਲਕ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਕਲਿੱਪਬੋਰਡ ਤੋਂ ਚੀਜ਼ਾਂ "
+#~ "ਦੀ ਕਾਪੀ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr "ਇੱਕ ਕੈਲੰਡਰ ਜਾਂ ਐਡਰੈੱਸ-ਬੁੱਕ ਲਈ ਡਿਫਾਲਟ ਬਣਾਉਣ ਲਈ ਸਹੂਲਤ ਦਿੰਦੀ ਹੈ"
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "ਮੇਲਬਾਕਸ ਨਾਂ ਦਿਓ(_p)"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਐਕਸ਼ਚੇਜ਼ ਅਕਾਊਂਟ ਨਾਲ ਸਬੰਧਤ ਖਾਸ ਕਾਰਵਾਈਆਂ ਅਤੇ ਫੀਚਰ ਦੇ ਸਮੂਹ ਨੂੰ ਹੈਂਡਲ ਕਰਦੀ "
+#~ "ਹੈ।"
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "ਸੁਨੇਹੇ ਬਾਹਰੀ ਐਡੀਟਰ ਨਾਲ ਲਿਖੋ"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr "ਫੋਲਡਰ ਲੜੀ ਪਰਸੰਗ ਮੇਨੂ ਵਿੱਚ ਪੱਤਰ ਫੋਲਡਰ ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "Google sources"
+#~ msgstr "ਗੂਗਲ ਕੈਲੰਡਰ"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "ਗਰੁੱਪਵਾਈਜ਼ ਕੈਲੰਡਰ ਅਤੇ ਸੰਪਰਕ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "ਹੁਲਾ ਕੈਲੰਡਰ ਸਰੋਤ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "ਹੂਲਾ ਅਕਾਊਂਟ ਸੈੱਟਅੱਪ"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "IMAP ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਫੀਚਰਾਂ ਲਈ ਇੱਕ ਪਲੱਗਇਨ ਹੈ।"
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "ਕੈਲੰਡਰ ਆਯਾਤ(_I)"
+
+#~ msgid "Import ICS"
+#~ msgstr "ICS ਆਯਾਤ"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "ICS ਨੱਥੀ ਕੈਲੰਡਰ ਲਈ ਆਯਾਤ ਕਰੋ।"
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr "ਐਪਲ ਆਈਪੋਡ ਨਾਲ ਚੁਣੀ ਟਾਸਕ/ਮੀਮੋ/ਕੈਲੰਡਰ/ਐਡਰੈੱਸ-ਬੁੱਕ ਨੂੰ ਸਿਕਰੋਨਾਈਜ਼ ਕਰੋ"
+
+#~ msgid "_Tasks :"
+#~ msgstr "ਕੰਮ(_T):"
+
+#~ msgid "Memos :"
+#~ msgstr "ਮੀਮੋ :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "ਅਕਾਊਂਟ ਅਯੋਗ ਕਰਨ ਮਨਜ਼ੂਰ ਹੈ।"
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "ਇੱਕ ਡੀ-ਬੱਸ ਸੁਨੇਹਾ ਬਣਾਓ ਜਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਆਈਕਾਨ ਨਾਲ ਨੋਟੀਫਾਈ ਕੀਤਾ "
+#~ "ਜਾਂਦਾ ਹੈ ਅਤੇ ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਆਉਦਾ ਹੈ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾਂਦਾ ਹੈ।"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਤੋਂ ਮੀਟਿੰਗਾਂ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "ਮੀਟਿੰਗ ਲਈ ਤਬਦੀਲ(_v)"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "ਮੀਟਿੰਗ ਲਈ ਪੱਤਰ"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਪੱਤਰ ਸੁਨੇਹੇ ਦੇ ਭਾਗ ਤੋਂ ਕੰਮ ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "ਕੰਮ 'ਚ ਬਦਲੋ(_v)"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "ਇੱਕ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹਿਆਂ ਬਣਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "ਮੋਨੋ ਪਲੱਗ-ਇਨ ਦੇ ਸੈਟਿੰਗ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "ਇੱਕ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਪਲੱਗ-ਇਨਾਂ ਨੂੰ ਯੋਗ ਅਤੇ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "ਇੱਕ ਟੈਸਟ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML "
+#~ "ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+#~ "\n"
+#~ "ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਝਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "ਡਾਟਾ ਘਟਨਾਵਾਂ ਨੂੰ ਪਰੋਫਾਇਲ ਕਰਨ ਦਾ ਲਾਗ ਰੱਖੋ।"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (ਬਿਲਟ-ਇਨ)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "SpamAssassin ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਜੰਕ ਸੁਨੇਹੇ ਫਿਲਟਰ ਕਰਦੀ ਹੈ। ਇਹ ਪਲੱਗ-ਇਨ ਲਈ SpamAssassin "
+#~ "ਇੰਸਟਾਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਨੱਥੀ ਸਭ ਦਸਤਾਵੇਜ਼ ਜਾਂ ਭਾਗਾਂ ਨੂੰ ਇੱਕੋ ਵਾਰ ਸੰਭਾਲਣ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "Save Attachments..."
+#~ msgstr "ਨੱਥੀ ਸੰਭਾਲੋ..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "ਸਭ ਨੱਥੀ ਸੰਭਾਲੋ..."
+
+#~ msgid "Select save base name"
+#~ msgstr "ਸੰਭਾਲ ਮੂਲ ਨਾਂ ਚੁਣੋ"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਕੀ ਸੁਨੇਹਿਆਂ ਦਾ ਥਰਿੱਡ ਵਿਸ਼ੇ ਨਾਲ ਸਬੰਧਤ ਰਹੇ।"
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "ਇੱਕ ਸੈਂਪਲ ਪਲੱਗਇਨ, ਜੋ ਕਿ TNEF ਅਟੈਂਚਮੈਂਟ ਨੂੰ ਡੀਕੋਡ ਕਰਨ ਲਈ yTNEF ਵਰਤਦਾ ਹੈ।"
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "WebDAV ਸੰਪਰਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਇੱਕ ਪਲੱਗ-ਇਨ ਹੈ।"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "ਫੋਲਡਰ ਲਈ ਨਵਾਂ ਸੁਨੇਹਾ ਭੇਜੋ(_t)"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "ਇੱਕ ਜਵਾਬ ਭੇਜੋ(_y)"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "ਸੁਨੇਹਾ ਸਰਵਜਨਕ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "ਸਰਵਜਨਕ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨੇਹਾ ਜਵਾਬ ਲਈ ਭੇਜੋ"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "ਨੱਥੀ ਪੱਟੀ"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "ਫਾਇਲ਼ %s ਨੂੰ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:ਇੱਕ ਨਿਯਮਤ ਫਾਇਲ਼ ਨਹੀਂ"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME ਕਿਸਮ:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "ਨੱਥੀ ਦਾ ਆਟੋਮੈਟਿਕ ਵੇਖਾਉਣ ਲਈ ਸੁਝਾਅ"
+
+#~ msgid "Expanded"
+#~ msgstr "ਫੈਲਿਆ"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "ਫੈਲਾਓ ਨੂੰ ਫੈਲਾਇਆ ਜਾਵੇ ਜਾਂ ਨਾ"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "ਫੈਲਾਓ ਦੇ ਲੇਬਲ ਦਾ ਟੈਕਸਟ"
+
+#~ msgid "Use underline"
+#~ msgstr "ਹੇਠਾਂ ਰੇਖਾ ਵਰਤੋਂ"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr "ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਤਾਂ, ਟੈਕਸਟ ਵਿੱਚ ਦਿੱਤਾ ਅੱਖਰ ਪ੍ਰਵੇਸ਼ਕ ਕੀ ਨੂੰ ਵੇਖਾਏਗਾ"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "ਲੇਬਲ ਤੇ ਅਗਲੇ ਵਿੱਚਕਾਰ ਅੰਤਰ ਦਿਓ"
+
+#~ msgid "Label widget"
+#~ msgstr "ਲੇਬਲ ਵਿਦਗਿਟ"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "ਆਮ ਫੈਲਾਓ ਲੇਬਲ ਦੀ ਥਾਂ ਤੇ ਇੱਕ ਵਿਦਗਿਟ ਵੇਖਾਓ"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "ਸੰਕੇਤਕ ਥਾਂ"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "ਫੈਲਾਓ ਤੀਰ ਦੁਆਲੇ ਖਾਲੀ ਥਾਓ"
+
+#~ msgid "Current Message"
+#~ msgstr "ਮੌਜੂਦਾ ਸੁਨੇਹਾ"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "ਮਾਸਟਰ ਕੈਟਾਗਰੀ ਸੂਚੀ ਸੋਧ..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "ਇਹਨਾਂ ਕੈਟਾਗਰੀਾਂ ਨਾਲ ਸਬੰਧਤ ਆਈਟਮਾਂ(_c):"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "ਉਪਲੱਬਧ ਕੈਟਾਗਰੀ(_A):"
+
+#~ msgid "categories"
+#~ msgstr "ਕੈਟਾਗਰੀ"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD ਕੋਡ"
+
+#~ msgid "Full Header"
+#~ msgstr "ਪੂਰਾ ਹੈੱਡਰ"
+
+#~ msgid "Font Description"
+#~ msgstr "ਫੋਂਟ ਵੇਰਵਾ"
+
 #~ msgid "Novell Groupwise"
 #~ msgstr "ਨੋਵਲ ਗਰੁੱਪਵਾਇਜ਼"
author	A S Alam <aalam@users.sf.net>	2009-09-13 14:08:49 +0800
committer	A S Alam <aalam@users.sf.net>	2009-09-13 14:08:49 +0800
commit	fda6ddd97ce21108cb8462303b10cc9696d9b412 (patch)
tree	806b5233e0ae35386da90c6c0271b90f0f8c8eb9 /po/pa.po
parent	70ed8286d0293691e828ec46291fa1b0a549cc63 (diff)
download	gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.gz gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.bz2 gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.lz gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.xz gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.tar.zst gsoc2013-evolution-fda6ddd97ce21108cb8462303b10cc9696d9b412.zip