Translation updated by Ivar Smolin

2008-02-23 Priit Laes <plaes at svn dot gnome dot org> * et.po: Translation updated by Ivar Smolin svn path=/trunk/; revision=35074
author: Priit Laes <plaes at svn dot gnome dot org> 2008-02-23 16:29:21 +0800
committer: Priit Laes <plaes@src.gnome.org> 2008-02-23 16:29:21 +0800
commit: 9ee6e160a8bc34b70015dfd517176707eff1dd33 (patch)
tree: c9aba17a195637147b20f7b7849c2e3abaf4d886 /po/et.po
parent: 60f931b4065355b2df86ef63200e594cb061caf6 (diff)
download: gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.tar.gz
gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.tar.zst
gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.zip
1 files changed, 2776 insertions, 2228 deletions
diff --git a/po/et.po b/po/et.po
index f648ba9d44..fd37c8b6c8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,11 +2,11 @@
 # Estonian translation of Evolution.
 #
 # Copyright (C) 2001-2006 Free Software Foundation, Inc.
-# Copyright (C) 2007 The GNOME Project.
+# Copyright (C) 2007, 2008 The GNOME Project.
 # This file is distributed under the same license as the evolution package.
 #
 # Ilmar Kerm <ikerm@hot.ee>, 2001.
-# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005-2007.
+# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005-2008.
 # Kaarel Jõgi <kaarel@gg.ee>, 2002.
 # Priit Laes <amd@store20.com>, 2003-2007.
 #
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-27 20:27+0000\n"
-"PO-Revision-Date: 2007-11-28 08:01+0200\n"
+"POT-Creation-Date: 2008-02-17 20:31+0000\n"
+"PO-Revision-Date: 2008-02-22 22:38+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -172,7 +172,7 @@ msgstr "%A, %d. %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:750
 #: ../calendar/gui/e-day-view-top-item.c:1358
-#: ../calendar/gui/e-day-view.c:2188
+#: ../calendar/gui/e-day-view.c:2158
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -206,7 +206,7 @@ msgstr "%d. %B %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:776
 #: ../calendar/gui/e-day-view-top-item.c:1362
-#: ../calendar/gui/e-day-view.c:2204
+#: ../calendar/gui/e-day-view.c:2174
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -346,7 +346,17 @@ msgstr "Manuseriba sisse- ja väljalülitamine"
 msgid "activate"
 msgstr "aktiveerimine"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
+msgid ""
+"'{0}' is a read-only address book source. Switch to Contacts View and "
+"highlight an address book that can accept contacts."
+msgstr ""
+"Sul on valitud kirjutuskaitsega kalendriallikas. Kalendrivaates tuleks "
+"valida kalender, mis võimaldab muudatusi sisse viia."
+
+#: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -354,19 +364,23 @@ msgstr ""
 "Sellise aadressiga kontakt on juba olemas. Kas sa soovid lisada uut kaarti "
 "koos sama aadressiga?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Aadress '{0}' on juba olemas"
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Uut kontakti pole võimalik lisada"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Kontakti pole võimalik ümber tõsta."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor ei ole saadaval."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -376,15 +390,15 @@ msgstr ""
 "logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et "
 "caps lock ei oleks peal."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP serveri skeemiinfot pole võimalik hankida."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove addressbook."
 msgstr "Aadressiraamatut pole võimalik eemaldada."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../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 "
@@ -396,59 +410,59 @@ msgstr ""
 "Contacts) kontaktide kaustadele ligipääskuks kasuta mõnda muud Groupwise "
 "postiklienti."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Kustutada aadressiraamatu '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading addressbook."
 msgstr "Viga aadressiraamatu laadimisel."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Viga {0} salvestamisel {1} alla: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Tõrge LDAP serverisse autentimisel."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
 msgid "Failed to delete contact"
 msgstr "Tõrge kontakti kustutamisel"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise'i aadressiraamatu loomine:"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server ei saatnud korrektset skeemiinfot."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Permission Denied."
 msgstr "Juurdepääs keelatud."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Serveri versioon"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Some features may not work properly with your current server"
 msgstr "Mõned võimalused võivad sinu praeguse serveriga ebakorrektselt töötada"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Sinu valitud pilt on suur. Kas sa soovid seda vähendada ja siis salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -458,19 +472,19 @@ msgstr ""
 "funktsionaalsust. Samas võib see LDAP server olla halvasti seadistatud. Küsi "
 "oma süsteemihaldurilt, milliseid otsingupõhjasid sa peaksid kasutama."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "See aadressisaamat eemaldatakse lõplikult."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook could not be opened."
 msgstr "Seda aadressisaamatud pole võimalik avada."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "See aadressiraamatuserver ei oma ühtegi soovituslikku otsingupõhja."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -478,27 +492,27 @@ msgstr ""
 "See aadressiraamatu server võib olla kättesaamatu, serveri nimi võib olla "
 "valesti sisestatud või pole võrguühendus hetkel toimiv."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This server does not support LDAPv3 schema information."
 msgstr "See server ei toeta LDAPv3 skeemiandmeid."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatut pole võimalik avada"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to perform search."
 msgstr "Otsingut pole võimalik läbi viia."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Unable to save {0}."
 msgstr "{0} pole võimalik salvestada."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -507,7 +521,7 @@ msgstr ""
 "lähteraamatust pole seda võimalik kustutada. Kas sa soovid ümbertõstmise "
 "asemel salvestada koopiat?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -517,50 +531,50 @@ msgstr ""
 "tekitada probleeme. Parima tulemuse saavutamiseks peaksid sa serveritarkvara "
 "uuendama toetatud versiooniks"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Sa oled seda kontakti muutnud. Kas sa soovid neid muutuseid salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sinu {0} kontakte pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Hülga"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "Ä_ra salvesta"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr ""
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:44
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
@@ -598,7 +612,7 @@ msgstr "Seadista automaatlõpetamist siit"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1338
 #: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Kontaktid"
@@ -643,8 +657,8 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
 #: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:302
-#: ../mail/mail-vfolder.c:223
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
 
@@ -655,13 +669,12 @@ msgstr "Kohalikus arvutis"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
 #: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:248
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
 #: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:105
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "Isiklik"
 
@@ -714,7 +727,8 @@ msgid "_Type:"
 msgstr "L_iik:"
 
 #: ../addressbook/gui/component/addressbook-config.c:632
-msgid "Copy book content locally for offline operation"
+#, fuzzy
+msgid "Copy _book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
@@ -723,15 +737,15 @@ msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:392
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
@@ -750,7 +764,7 @@ msgid "Details"
 msgstr "Üksikasjad"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:869
+#: ../mail/em-folder-browser.c:935
 msgid "Searching"
 msgstr "Otsing"
 
@@ -764,12 +778,12 @@ msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -825,18 +839,18 @@ msgstr ""
 "Palun oota kuni Evolution migreerib Sinu Pilot Sync andmed..."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:504
+#: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
 #: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:512
+#: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
 
@@ -845,18 +859,18 @@ msgid "_New Address Book"
 msgstr "_Uus aadressiraamat"
 
 #: ../addressbook/gui/component/addressbook-view.c:955
-msgid "Save As Vcard..."
-msgstr "Salvestamine vKaardina..."
+msgid "Save As vCard..."
+msgstr "Salvesta vKaardina..."
 
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1384
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2123 ../mail/em-folder-view.c:1296
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Kustuta"
@@ -873,17 +887,24 @@ msgstr "Kontaktide allika valimine"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
-#: ../addressbook/gui/component/addressbook.c:197
+#: ../addressbook/gui/component/addressbook.c:200
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
 
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "Sisesta parool"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Automaatlõpetuse pikkus"
@@ -1199,7 +1220,8 @@ msgstr "_Sisselogimismeetod:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nimi:"
@@ -1213,7 +1235,7 @@ msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1234,10 +1256,9 @@ msgstr "kaarti"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2064
 #: ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:380
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "minutit"
 
@@ -1279,98 +1300,98 @@ msgstr "<b>Töö</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Kate_gooriad..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:550
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:565
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Pilt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postiaadress"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
 msgstr "H_üüdnimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:157
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "Töö"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "Aa_dress:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "Aasta_päev:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "Ass_istent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:901
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1840
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "Kalen_der:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "Kate_gooriad..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "_Linn:"
@@ -1447,7 +1468,7 @@ msgid "_Web Log:"
 msgstr "Veebilo_gi:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "K_us:"
 
@@ -1456,8 +1477,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Aadress"
 
@@ -1465,7 +1486,7 @@ msgstr "Aadress"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1473,8 +1494,8 @@ msgstr "Aadress"
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1832 ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
 msgid "Editable"
 msgstr "Redigeeritav"
 
@@ -2447,9 +2468,10 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../mail/em-mailer-prefs.c:481
 #: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../plugins/save-attachments/save-attachments.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
@@ -2463,7 +2485,7 @@ msgstr "AOL kiirsuhtlusklient"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2477,7 +2499,7 @@ msgstr "Gadu-Gadu Kiirsuhtlusklient"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2486,7 +2508,7 @@ msgid "Service"
 msgstr "Teenus"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:514
 #: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
@@ -2509,22 +2531,22 @@ msgid "Other"
 msgstr "Muu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "Groupwise"
 
@@ -2594,23 +2616,23 @@ msgstr "%s'%s' on tühi"
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "Täis_nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "E-_post:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:369
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "_Vali aadressiraamat"
 
@@ -2754,47 +2776,35 @@ msgid "_Location:"
 msgstr "Asuko_ht:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>Liikmed</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Lisa sõnum loendisse"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Aadressiraamatust e-posti aadressi lisamine"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "Liikmed"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Eemaldab e-postiaadressi loendist"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Vali..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sõnumi saatmisel sellesse loendisse"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "_Loendi nimi:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Vali"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "Kontaktiloendi liikmed"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
 #: ../addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2803,18 +2813,14 @@ msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 msgid "Book"
 msgstr "Raamat"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "_Liikmed"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
-msgid "Contact List Members"
-msgstr "Kontaktiloendi liikmed"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Muudetud kontakt:"
@@ -2862,9 +2868,10 @@ msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:258
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
 #: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
@@ -2913,12 +2920,12 @@ msgstr "Viga raamatu vaate hankimisel"
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
 #: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3543
-#: ../widgets/text/e-text.c:3544
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
 msgid "Model"
 msgstr "Mudel"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
@@ -2928,22 +2935,21 @@ msgstr "Allikas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Liik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1924
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
 msgstr "Salvesta vKaardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/e-calendar-table.c:1325
-#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_va"
@@ -2957,8 +2963,8 @@ msgid "New Contact _List..."
 msgstr "Uus kontaktide _loend..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Save as VCard..."
-msgstr "_Salvesta VKaardina"
+msgid "_Save as vCard..."
+msgstr "_Salvesta vKaardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
@@ -2999,10 +3005,10 @@ msgstr "Lõ_ika"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1333
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:928
-#: ../composer/e-msg-composer.c:3214 ../mail/em-folder-tree.c:1001
-#: ../mail/em-folder-view.c:1281 ../mail/message-list.c:1990
+#: ../calendar/gui/e-calendar-table.c:1370
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
+#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2062
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3022,13 +3028,13 @@ msgid "Any Category"
 msgstr "Iga kategooria"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "Muu viga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -3066,7 +3072,7 @@ msgid "Categories"
 msgstr "Kategooriad"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
 msgstr "Firma"
 
@@ -3115,22 +3121,22 @@ msgid "Journal"
 msgstr "Päevik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Juht"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Märkus"
 
@@ -3159,14 +3165,14 @@ msgid "Radio"
 msgstr "Raadio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Roll"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Abikaasa"
 
@@ -3207,8 +3213,8 @@ msgstr "Koduleht"
 #: ../widgets/table/e-table-group-container.c:967
 #: ../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/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
 msgid "Width"
 msgstr "Laius"
 
@@ -3222,8 +3228,8 @@ msgstr "Laius"
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
 msgid "Height"
 msgstr "Kõrgus"
 
@@ -3329,7 +3335,7 @@ msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2677
+#: ../mail/em-folder-view.c:2807
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
@@ -3343,42 +3349,44 @@ msgid "Copy _Email Address"
 msgstr "Kopeeri _e-posti aadress"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(kaart)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "Osakond"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "Eriala"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Ametikoht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "Videovestlus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:99
 #: ../calendar/gui/calendar-component.c:795
 #: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2379
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:575
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
@@ -3389,149 +3397,150 @@ msgstr "Videovestlus"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "Veebilogi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2318
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2319
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
 msgid "Anniversary"
 msgstr "Aastapäev"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "Õnnestus"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "Taustaprogramm on hõivatud"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei ole olemas"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "No Self Contact defined"
 msgstr "Enda kontakti ei ole kirjeldatud"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "Kontakti ei leitud"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "Kontakti ID on juba olemas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "Toetamata protokoll"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-cal-model-tasks.c:350
-#: ../calendar/gui/e-cal-model-tasks.c:665
-#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2419
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2521
 msgid "Canceled"
 msgstr "Katkestatud"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "Katkestamine pole võimalik"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/comp-editor-factory.c:422
 msgid "Authentication Failed"
 msgstr "Tõrge autentimisel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "No such source"
 msgstr "Sellist allikat ei ole olemas"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "Autonoomses olekus pole seda saadaval"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "Vigane serveri versioon"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3542,7 +3551,7 @@ msgstr ""
 "veel võrguvabas olekus kasutamiseks alla laaditud. Palun laadi korraks "
 "aadressiraamat võrgurežiimis, et selle sisu oleks võimalik alla laadida."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3551,7 +3560,7 @@ msgstr ""
 "Aadressiraamatut pole võimalik avada.  Palun kontrolli, kas rada %s on "
 "olemas ja kas sul on sellele vajalikud pääsuõigused."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3559,7 +3568,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus. Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav LDAP server ei ole kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3569,7 +3578,7 @@ msgstr ""
 "soovid kasutada Evolutioni koos LDAP'i toega, pead paigaldama omale vastava "
 "Evolutioni paki."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3577,7 +3586,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav server ei ole kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3585,7 +3594,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3596,46 +3605,46 @@ msgstr ""
 "jaoks määratud piirangu. Palun täpsusta oma otsingut või suurenda selle\n"
 "aadressiraamatu kataloogiserveri eelistustest ajapiirangut."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Selle aadressiraamatu taustaprogrammil pole võimalik seda päringut parsida."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Selle aadressiraamatu taustaprogramm keeldus päringut parsimast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "Viga loendi lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:666
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "Viga loendi muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:616
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3650,16 +3659,16 @@ msgstr[1] ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "_Don't Display"
 msgstr "Ä_ra kuva"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "Display _All Contacts"
 msgstr "_Kuva kõiki kontakte"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3668,64 +3677,64 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
 #. 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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakti"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:424
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:461
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "Aadressiraamatu valimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "nimekiri"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:727
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "Kontakti ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "Kontakti kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:732
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "Kontaktide ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "Kontaktide kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:960
-msgid "Multiple VCards"
-msgstr "Mitu VKaarti"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "Mitu vKaarti"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:963
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "VKaart %s kohta"
+msgid "vCard for %s"
+msgstr "vKaart %s kohta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#: ../addressbook/gui/widgets/eab-gui-util.c:1022
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
 msgid "Contact information"
 msgstr "Kontaktandmed"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1024
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktandmed - %s"
@@ -3743,12 +3752,12 @@ msgstr[1] ""
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:279
-msgid "Show Full VCard"
-msgstr "Kogu VKaardi kuvamine"
+msgid "Show Full vCard"
+msgstr "Kogu vKaardi kuvamine"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "Kompaktse VKaardi näitamine"
+msgid "Show Compact vCard"
+msgstr "Kompaktse vKaardi näitamine"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
@@ -3799,12 +3808,12 @@ msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VKaart (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vKaart (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolutioni VKaardi importija"
+msgid "Evolution vCard Importer"
+msgstr "Evolutioni vKaardi importija"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3847,7 +3856,7 @@ msgid "Format"
 msgstr "Vorming"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
@@ -3954,7 +3963,7 @@ msgstr "Varjutamine"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:967
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4077,7 +4086,16 @@ msgstr "Tavaolekus pole suuruse võtit tarvis."
 msgid "Unhandled error"
 msgstr "Käsitlemata viga"
 
-#: ../calendar/calendar.error.xml.h:1
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
+"a calendar that can accept appointments."
+msgstr ""
+"'{0}' on kirjutuskaitsega kalendriallikas. Kalendrivaates tuleks valida "
+"kalender, mis võimaldab muudatusi sisse viia."
+
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4085,7 +4103,7 @@ msgstr ""
 "Sündmusele mõtestatud kokkuvõtte lisamine annab sündmuse vastuvõtjatele aimu "
 "sündmuse sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4093,19 +4111,19 @@ msgstr ""
 "Ülesandele mõtestatud kokkuvõtte lisamine annab ülesande vastuvõtjatele aimu "
 "ülesande sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Kõik nendes märkmetes sisalduv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Kõik selles märkmes sisalduv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4113,126 +4131,126 @@ msgstr ""
 "Kõik nende sündmuste kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Kõik nende ülesannete kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Kõik selle sündmuse kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Kõik selle koosoleku kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Kõik selle märkme kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Kõik selle ülesande kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Kas sa soovid kustutada ülesannet '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Kas sa soovid kustutada sündmust nimega '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Kas sa soovid kustutada märget '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Kas sa soovid kustutada {0} sündmust?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Kas sa soovid kustutada {0} märget?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Kas sa soovid kustutada {0} ülesannet?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Kas sa soovid kustutada seda sündmust?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Kas sa soovid kustutada seda koosolekut?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 #: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this memo?"
 msgstr "Kas sa soovid kustutada seda märget?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa soovid kustutada seda ülesannet?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Oled sa kindel, et soovid seda märget ilma kokkuvõtteta salvestada?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Oled sa kindel, et soovid seda sündmust ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Cannot create a new event"
 msgstr "Uut sündmust pole võimalik luua"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete calendar '{0}'?"
 msgstr "Kas kustutada kalender '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Delete memo list '{0}'?"
 msgstr "Kas kustutata märkmeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
 msgid "Delete task list '{0}'?"
 msgstr "Kas kustutata ülesandeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:30
 msgid "Do _not Send"
 msgstr "Ä_ra saada"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid sündmust kustutada?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid ülesannet salvestada?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
 msgid "Editor could not be loaded."
 msgstr "Redaktorit pole võimalik laadida."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:34
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4240,26 +4258,26 @@ msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil ülesandele nõusolekut anda."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:35
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "osalejatel neile vastata."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading calendar"
 msgstr "Viga kalendri laadimisel"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:37
 msgid "Error loading memo list"
 msgstr "Viga märkmeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:38
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4267,7 +4285,7 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad kohtumise "
 "tühistamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4275,7 +4293,7 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad selle "
 "märkme kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4283,7 +4301,7 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4291,7 +4309,7 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende kalendreid "
 "ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4299,7 +4317,7 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende ülesannete "
 "nimekirja ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4307,7 +4325,7 @@ msgstr ""
 "Mõned manused on hetkel allalaadimisel. Sündmuse salvestamine võib tähendada "
 "nende manuste kaotsiminekut."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4315,84 +4333,84 @@ msgstr ""
 "Mõned manused on hetkel allalaadimisel. Ülesande salvestamine võib tähendada "
 "nende manuste kaotsiminekut."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Mõned võimalused võivad sinu praeguse serveriga ebakorrektselt töötada."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutioni kalender lõpetas ootamatult."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutioni märge lõpetas ootamatult."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:49
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutioni ülesanded lõpetasid ootamatult."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:50
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalender pole märgitud võrguvabas olekus kasutamiseks."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:51
 msgid "The memo list is not marked for offline usage"
 msgstr "Märkmeloend pole märgitud võrguvabas olekus kasutamiseks"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:52
 msgid "The task list is not marked for offline usage."
 msgstr "Ülesandeloend pole märgitud võrguvabas olekus kasutamiseks."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid "This memo list will be removed permanently."
 msgstr "See märkmeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this memo?"
 msgstr "Kas soovid selle märkme muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to save your changes to this task?"
 msgstr "Kas soovid selle ülesande muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Kas soovid saata selle märkme kohta tühistamisteate?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Kas soovid teistele osalejatele saata tühistamisteate?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send this task to participants?"
 msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send updated task information to participants?"
 msgstr "Kas soovid saata osalejatele värskemaid andmeid ülesande kohta?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4402,99 +4420,85 @@ msgstr ""
 "tekitada probleeme. Parima tulemuse saavutamiseks peaksid sa serveritarkvara "
 "uuendama toetatud versiooniks."
 
-#: ../calendar/calendar.error.xml.h:64
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-"Sul on valitud kirjutuskaitsega kalendriallikas. Kalendrivaates tuleks "
-"valida kalender, mis võimaldab muudatusi sisse viia."
-
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Sa oled muutnud seda sündmust, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "You have changed this task, but not yet saved it."
 msgstr "Sa oled muutnud seda ülesannet, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Sa oled muutnud seda märget, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Sinu kalendreid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Sinu märkmeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Sinu ülesandeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:72
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Hülga muudatused"
 
-#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:74
 msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
-#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:143
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Saada"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "_Send Notice"
 msgstr "Saada _teavitus"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:77
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Sisesta parool"
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:816
-#: ../calendar/conduits/memo/memo-conduit.c:817
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../calendar/conduits/calendar/calendar-conduit.c:1517
+#: ../calendar/conduits/calendar/calendar-conduit.c:1518
+#: ../calendar/conduits/memo/memo-conduit.c:818
+#: ../calendar/conduits/memo/memo-conduit.c:819
+#: ../calendar/conduits/todo/todo-conduit.c:1016
+#: ../calendar/conduits/todo/todo-conduit.c:1017
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/memo/memo-conduit.c:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../calendar/conduits/memo/memo-conduit.c:912
+#: ../calendar/conduits/memo/memo-conduit.c:915
 msgid "Could not read pilot's Memo application block"
 msgstr "Pilot'i märkmerakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/memo/memo-conduit.c:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../calendar/conduits/memo/memo-conduit.c:959
+#: ../calendar/conduits/memo/memo-conduit.c:962
 msgid "Could not write pilot's Memo application block"
 msgstr "Pilot'i märkmerakenduse blokki pole võimalik kirjutada"
 
@@ -4502,18 +4506,18 @@ msgstr "Pilot'i märkmerakenduse blokki pole võimalik kirjutada"
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1100
+#: ../calendar/conduits/todo/todo-conduit.c:1103
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1145
+#: ../calendar/conduits/todo/todo-conduit.c:1148
 msgid "Could not write pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki pole võimalik kirjutada"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2310
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
@@ -4559,22 +4563,22 @@ msgid "Memo_s"
 msgstr "_Märkmed"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1166
-#: ../calendar/gui/gnome-cal.c:1697 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1100 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
 #: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "Märkmed"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1433
-#: ../calendar/gui/gnome-cal.c:1569 ../calendar/gui/print.c:1875
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
 #: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1089 ../calendar/gui/tasks-control.c:494
-#: ../calendar/gui/tasks-control.c:510
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:587
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
@@ -4607,13 +4611,13 @@ msgstr[1] "minutit"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:381
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "tund"
 msgstr[1] "tundi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 msgid "Start time"
 msgstr "Algusaeg"
 
@@ -4624,10 +4628,10 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
 #: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1001
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Asukoht:"
 
@@ -4637,7 +4641,7 @@ msgstr "_Edasilükkamise aeg:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:164
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4658,31 +4662,32 @@ msgstr "_Lükka edasi"
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "Asukoha kohta andmed puuduvad."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sul on %d alarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1517
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4694,7 +4699,7 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4710,7 +4715,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
@@ -4990,12 +4995,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Olekuvälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
@@ -5257,7 +5262,7 @@ msgstr "Puhastada sündmustest, mis on vanemad kui"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:382
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "päeva"
@@ -5289,15 +5294,15 @@ msgstr "_Uus kalender"
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2118
+#: ../mail/em-folder-tree.c:2102
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
 #: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3745 ../mail/em-folder-tree.c:2132
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:37
+#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Omadused"
 
@@ -5404,7 +5409,7 @@ msgstr "Kalendri avamisel pole see meetod toetatud"
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
+#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -5570,7 +5575,7 @@ msgstr ""
 "aadressist.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hoiatused</span>"
 
@@ -5609,7 +5614,7 @@ msgid "Display"
 msgstr "Kuva"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
 #: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Reede"
@@ -5625,7 +5630,7 @@ msgstr ""
 "päeva"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Esmaspäev"
@@ -5649,7 +5654,7 @@ msgstr ""
 "Pühapäev"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "Värvuse valimine"
 
@@ -5659,7 +5664,7 @@ msgid "S_un"
 msgstr "_P"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
 #: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Laupäev"
@@ -5677,7 +5682,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valimisel kuvatakse nädalate numbreid"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Pühapäev"
@@ -5696,7 +5701,7 @@ msgid "Template:"
 msgstr "Mall:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Neljapäev"
@@ -5711,13 +5716,13 @@ msgid "Time format:"
 msgstr "Ajavorming:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Teisipäev"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Kolmapäev"
@@ -5892,149 +5897,150 @@ msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
 msgid " to "
 msgstr " kuni "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2251
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2342
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2253
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2344
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2258
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2349
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2260
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2961
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2966
-#: ../composer/e-msg-composer.c:3151
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3040
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3215
-#: ../mail/em-folder-tree.c:1002 ../mail/em-folder-utils.c:369
-#: ../mail/em-folder-view.c:1177 ../mail/message-list.c:1991
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2063
 msgid "_Move"
 msgstr "_Tõsta ümber"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3217
-#: ../mail/em-folder-tree.c:1004 ../mail/message-list.c:1993
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2065
 msgid "Cancel _Drag"
 msgstr "Tühista _lohistamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:669
+#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "manus"
+
+#: ../calendar/gui/dialogs/comp-editor.c:831
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2577
+#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Hide Attachment _Bar"
 msgstr "Peida manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1564
 msgid "Show Attachment _Bar"
 msgstr "Näita manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/dialogs/event-page.c:1969
-#: ../calendar/gui/dialogs/task-page.c:1259 ../composer/e-msg-composer.c:3744
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
-#: ../composer/e-msg-composer.c:3747
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../composer/e-msg-composer.c:3636
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1581
-#: ../mail/em-format-html-display.c:2320
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../mail/em-format-html-display.c:2374
 msgid "Show Attachments"
 msgstr "Näita manuseid"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Press space key to toggle attachment bar"
 msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2188
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2194
-#: ../calendar/gui/dialogs/comp-editor.c:2237
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2196
-#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2200
-#: ../calendar/gui/dialogs/comp-editor.c:2243
+#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2202
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2209
+#: ../calendar/gui/dialogs/comp-editor.c:2252
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2205
-#: ../calendar/gui/dialogs/comp-editor.c:2248
+#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2255
 #, c-format
 msgid "Memo - %s"
 msgstr "Märge - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2216
-#: ../calendar/gui/dialogs/comp-editor.c:2258
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2265
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2820 ../mail/em-utils.c:370
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:360
-msgid "attachment"
-msgstr "manus"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2909
-#: ../calendar/gui/dialogs/comp-editor.c:2963
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../calendar/gui/dialogs/comp-editor.c:2916
+#: ../calendar/gui/dialogs/comp-editor.c:2970
+#: ../calendar/gui/dialogs/comp-editor.c:2994
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Sellele kirjele tehtud muudatused tühistatakse uuenduste saabumise korral"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3016
+#: ../calendar/gui/dialogs/comp-editor.c:3023
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -6124,126 +6130,126 @@ msgstr "Sünd_mus"
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2837
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "See sündmus on alarmidega"
 
-#: ../calendar/gui/dialogs/event-page.c:908
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ko_rraldaja:"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-page.c:948
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:1130
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1133
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-#: ../calendar/gui/dialogs/memo-page.c:703
-#: ../calendar/gui/dialogs/task-page.c:886
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1315
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1507
-#: ../calendar/gui/dialogs/memo-page.c:742
-#: ../calendar/gui/dialogs/task-page.c:945
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "Valitud korraldajal pole enam kontot."
 
-#: ../calendar/gui/dialogs/event-page.c:1513
-#: ../calendar/gui/dialogs/memo-page.c:748
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/task-page.c:975
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: ../calendar/gui/dialogs/event-page.c:1970
-#: ../calendar/gui/dialogs/task-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "_Lisa "
 
-#: ../calendar/gui/dialogs/event-page.c:2713
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2757
-#: ../calendar/gui/dialogs/memo-page.c:958
-#: ../calendar/gui/dialogs/task-page.c:1921
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:3068
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:3081
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
 msgstr "Kohandatud"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3086
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-itip-control.c:1141 ../composer/e-msg-composer.c:2361
-#: ../filter/filter-rule.c:892 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:445
-#: ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:200
+#: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1999
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:2006
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "Puudub"
 
@@ -6263,11 +6269,6 @@ msgstr "15 minutit enne sündmust"
 msgid "Attendee_s..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Kate_gooriad..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Kohandatud alarm:"
@@ -6329,19 +6330,19 @@ msgstr "Korraldaja"
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2446
 msgid "Memo"
 msgstr "Märge"
 
-#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Märkmeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/memo-page.c:1104 ../mail/em-format-html.c:1527
-#: ../mail/em-format-html.c:1585 ../mail/em-format-html.c:1611
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Kellele"
 
@@ -6359,7 +6360,7 @@ msgid "_Description:"
 msgstr "_Kirjeldus:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:453
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
@@ -6396,17 +6397,17 @@ msgstr "Seda kirjet koos tulevikukirjetega"
 msgid "All Instances"
 msgstr "Kõiki kirjeid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolutionil pole võimalik muuta."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
@@ -6414,7 +6415,7 @@ msgstr "järgnevatel nädalapäevadel:"
 #. * (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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "esimene"
 
@@ -6423,7 +6424,7 @@ msgstr "esimene"
 #. * (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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "teine"
 
@@ -6431,7 +6432,7 @@ msgstr "teine"
 #. * (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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "kolmas"
 
@@ -6439,7 +6440,7 @@ msgstr "kolmas"
 #. * (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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "neljas"
 
@@ -6447,13 +6448,13 @@ msgstr "neljas"
 #. * (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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "last"
 msgstr "viimane"
 
 #. 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
@@ -6461,7 +6462,7 @@ msgstr "Muu kuupäev"
 #. * 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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "1-10"
 
@@ -6469,7 +6470,7 @@ msgstr "1-10"
 #. * 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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
 msgid "11th to 20th"
 msgstr "11-20"
 
@@ -6477,45 +6478,45 @@ msgstr "11-20"
 #. * 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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "21st to 31st"
 msgstr "21-31"
 
 #. 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "päev"
 
 #. 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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "iga"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Add exception"
 msgstr "Lisa erand"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
 msgstr "Muutmiseks pole võimalik valikut hankida."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
 msgstr "Muuda erandit"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
 msgstr "Kustutamiseks pole võimalik valikut hankida."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -6524,7 +6525,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
@@ -6587,47 +6588,50 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:663
-#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2416 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/print.c:2518 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1057
+#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
 msgid "High"
 msgstr "Kõrge"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-cal-model-tasks.c:736
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2413
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2515
 msgid "In Progress"
 msgstr "Töös"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1055
+#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Madal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
-#: ../mail/message-list.c:1056
+#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:361
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Keskmine"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2410
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:230
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2512
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -6640,7 +6644,7 @@ msgid "Stat_us:"
 msgstr "_Olek:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:363
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -6658,7 +6662,7 @@ msgid "_Web Page:"
 msgstr "_Koduleht:"
 
 #: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1322
 msgid "_Task"
 msgstr "_Ülesanne"
 
@@ -6666,17 +6670,17 @@ msgstr "_Ülesanne"
 msgid "Task Details"
 msgstr "Ülesande üksikasjad"
 
-#: ../calendar/gui/dialogs/task-page.c:461
+#: ../calendar/gui/dialogs/task-page.c:459
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Organi_zer:"
 msgstr "Korraldaja:"
 
-#: ../calendar/gui/dialogs/task-page.c:859
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
@@ -6778,7 +6782,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3075
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
 #, c-format
 msgid "Click to open %s"
 msgstr "Klõpsa %s avamiseks"
@@ -6798,7 +6802,7 @@ msgstr "Alguskuupäev:"
 #: ../calendar/gui/e-cal-component-memo-preview.c:225
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-itip-control.c:1201
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Kirjeldus:"
@@ -6823,7 +6827,7 @@ msgstr "Tähtaeg:"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-itip-control.c:1169
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Olek:"
 
@@ -6832,17 +6836,17 @@ msgid "Priority:"
 msgstr "Tähtsus:"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:338
 msgid "Public"
 msgstr "Avalik"
 
 #: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:306
+#: ../calendar/gui/e-calendar-table.c:339
 msgid "Private"
 msgstr "Isiklik"
 
 #: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:307
+#: ../calendar/gui/e-calendar-table.c:340
 msgid "Confidential"
 msgstr "Salajane"
 
@@ -6863,17 +6867,17 @@ msgid "Summary"
 msgstr "Kokkuvõte"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "Free"
 msgstr "Vaba"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../calendar/gui/e-cal-model-tasks.c:611
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6883,7 +6887,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
 #: ../calendar/gui/e-meeting-store.c:749
@@ -6891,7 +6895,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6905,11 +6909,12 @@ msgstr "Ei"
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../mail/em-utils.c:1288
-#: ../plugins/itip-formatter/itip-formatter.c:395
-#: ../plugins/itip-formatter/itip-formatter.c:2024
-#: ../plugins/plugin-manager/plugin-manager.c:82
-#: ../widgets/misc/e-attachment-bar.c:722
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:405
+#: ../plugins/itip-formatter/itip-formatter.c:2031
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -6926,7 +6931,7 @@ msgstr "Määratud"
 msgid "Save As..."
 msgstr "Salvestamine teise nimega..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
@@ -6935,9 +6940,9 @@ msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:922
-#: ../mail/em-folder-view.c:1292 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
@@ -6950,137 +6955,132 @@ msgstr "Säti _taustapildiks"
 msgid "_Save Selected"
 msgstr "_Salvesta valik"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:382
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:384
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:386
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:387
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:388
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:390
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:392
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Valitud objektide kustutamine"
 
-#: ../calendar/gui/e-calendar-table.c:915
-#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:952
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1099
-#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:817
-#: ../composer/e-msg-composer.c:1392
+#: ../calendar/gui/e-calendar-table.c:1136
+#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "Salvestamine teise nimega..."
 
-#: ../calendar/gui/e-calendar-table.c:1322
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Task"
 msgstr "Uus ü_lesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1326 ../calendar/gui/e-memo-table.c:921
+#: ../calendar/gui/e-calendar-table.c:1363 ../calendar/gui/e-memo-table.c:922
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1328
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:923
-#: ../mail/em-folder-view.c:1293
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+#, fuzzy
+msgid "P_rint..."
 msgstr "_Prindi..."
 
-#: ../calendar/gui/e-calendar-table.c:1332
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1369
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
 #: ../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 "_Lõika"
 
-#: ../calendar/gui/e-calendar-table.c:1334
-#: ../calendar/gui/e-calendar-view.c:1663
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1338 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1375 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1339 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1376 ../calendar/gui/e-memo-table.c:934
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-table.c:1377
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1341
+#: ../calendar/gui/e-calendar-table.c:1378
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1342
+#: ../calendar/gui/e-calendar-table.c:1379
 msgid "_Mark as Incomplete"
 msgstr "_Märgi kui lõpetamata"
 
-#: ../calendar/gui/e-calendar-table.c:1343
+#: ../calendar/gui/e-calendar-table.c:1380
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Märgi valitud ülesanded kui lõpetamata"
 
-#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-table.c:1385
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1622
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks klõpsa siia"
@@ -7112,107 +7112,112 @@ msgid "Start date"
 msgstr "Alguskuupäev"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Olek"
 
-#: ../calendar/gui/e-calendar-view.c:1343
+#: ../calendar/gui/e-calendar-view.c:1346
 msgid "Moving items"
 msgstr "Kirjete ümbertõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1345
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1655
+#: ../calendar/gui/e-calendar-view.c:1658
 msgid "New All Day _Event"
 msgstr "_Uus kogu päeva sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1656
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Meeting"
 msgstr "Uus _koosolek"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Select T_oday"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1679
+#, fuzzy
+msgid "Pri_nt..."
+msgstr "_Prindi..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Reply"
 msgstr "_Vasta"
 
-#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1286
+#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
 #: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2196
+#: ../calendar/gui/e-calendar-view.c:2202
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Korraldaja: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2200
+#: ../calendar/gui/e-calendar-view.c:2206
 #, c-format
 msgid "Organizer: %s"
 msgstr "Korraldaja: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
+#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2247
+#: ../calendar/gui/e-calendar-view.c:2256
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aeg: %s %s"
@@ -7252,21 +7257,21 @@ msgstr "%02i-minutiline jaotamine"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1354
-#: ../calendar/gui/e-day-view.c:2171
+#: ../calendar/gui/e-day-view.c:2141
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1566
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 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:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:509 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pl"
 
@@ -7390,12 +7395,12 @@ msgstr "iKalendri viga"
 
 #: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
 #: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
@@ -7411,21 +7416,21 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1174
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:2015
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:2018
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2025
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
@@ -7644,7 +7649,7 @@ msgid "Attendee status updated\n"
 msgstr "Osaleja olek värskendatud\n"
 
 #: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1242
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osaleja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
@@ -7691,7 +7696,7 @@ msgstr "Värskenda vastaja olekut"
 msgid "Send Latest Information"
 msgstr "Värskeimate andmete saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:753
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -7742,44 +7747,49 @@ msgstr "Osalejad"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Isik"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Ruum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Juht"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
@@ -7791,14 +7801,14 @@ msgstr "Vajab tegevust"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "Katseline"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2028
 msgid "Delegated"
 msgstr "Delegeeritud"
 
@@ -7808,7 +7818,7 @@ msgid "Attendee                          "
 msgstr "Osaleja                           "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-list-view.c:526
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -7820,7 +7830,7 @@ msgstr "Töös"
 #. 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7829,7 +7839,7 @@ msgstr "%A, %d. %B %Y"
 #. 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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -7839,67 +7849,67 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "Andmed puuduvad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "_Lõpp:"
 
@@ -7931,16 +7941,16 @@ msgstr "Keel"
 msgid "Member"
 msgstr "Liige"
 
-#: ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-memo-table.c:939
 msgid "_Delete Selected Memos"
 msgstr "_Kustuta valitud märkmed"
 
-#: ../calendar/gui/e-memo-table.c:1089 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Märkme lisamiseks klõpsa siia"
 
-#: ../calendar/gui/e-memos.c:805 ../calendar/gui/e-tasks.c:920
-#: ../calendar/gui/gnome-cal.c:2852
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2871
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7949,33 +7959,33 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:854
+#: ../calendar/gui/e-memos.c:839
 msgid "Loading memos"
 msgstr "Märkmete laadimine"
 
-#: ../calendar/gui/e-memos.c:935
+#: ../calendar/gui/e-memos.c:920
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Märkmete avamine asukohast %s"
 
-#: ../calendar/gui/e-memos.c:1108 ../calendar/gui/e-tasks.c:1325
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: ../calendar/gui/e-tasks.c:970
+#: ../calendar/gui/e-tasks.c:975
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:1057
+#: ../calendar/gui/e-tasks.c:1065
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ülesannete avamine asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1302
+#: ../calendar/gui/e-tasks.c:1310
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1352
+#: ../calendar/gui/e-tasks.c:1360
 msgid "Expunging"
 msgstr "Puhastamine"
 
@@ -7987,47 +7997,47 @@ msgstr "Ajavööndi valimine"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1547
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:826
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
-#: ../calendar/gui/gnome-cal.c:2504
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
 msgstr "_Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2505
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
 msgstr "_Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2510
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "_Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2676
+#: ../calendar/gui/gnome-cal.c:2695
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Sündmuste laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2714
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ülesannete laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2704
+#: ../calendar/gui/gnome-cal.c:2723
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Märkmete laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2811
+#: ../calendar/gui/gnome-cal.c:2830
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3768
+#: ../calendar/gui/gnome-cal.c:3787
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -8087,57 +8097,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:485
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osalejat"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
 msgid "Event information"
 msgstr "Andmed sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Task information"
 msgstr "Andmed ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
 msgid "Memo information"
 msgstr "Märkme andmed"
 
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud andmed"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:698
 msgid "Calendar information"
 msgstr "Kalendri andmed"
 
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:747
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:755
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:759
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:831
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud andmed (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:841
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:1008
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
@@ -8173,43 +8183,43 @@ msgstr ""
 msgid "There is no calendar available for creating memos"
 msgstr "Märkmete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/memos-component.c:1075
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Märkmete allika valija"
 
-#: ../calendar/gui/memos-component.c:1258
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "Uus märge"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "Mär_ge"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Uue märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1266
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "Uus jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "_Jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Uue jagatud märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1274
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "Uus märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "_Märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Uue märkmeloendi loomine"
 
@@ -8419,50 +8429,54 @@ msgstr "R"
 msgid "Sa"
 msgstr "L"
 
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/print.c:2442
 msgid "Appointment"
 msgstr "Sündmus"
 
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/print.c:2444
 msgid "Task"
 msgstr "Ülesanne"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2466
 #, c-format
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2488
+msgid "Attendees: "
+msgstr "Osalejad: "
+
+#: ../calendar/gui/print.c:2528
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: ../calendar/gui/print.c:2443
+#: ../calendar/gui/print.c:2545
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: ../calendar/gui/print.c:2455
+#: ../calendar/gui/print.c:2557
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2582
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: ../calendar/gui/print.c:2491
+#: ../calendar/gui/print.c:2593
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2695
 msgid "Upcoming Appointments"
 msgstr "Saabuvad sündmused"
 
@@ -8492,43 +8506,43 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/tasks-component.c:1064
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Ülesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1320
+#: ../calendar/gui/tasks-component.c:1321
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/tasks-component.c:1323
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1329
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1330
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1331
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1337
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1338
 msgid "Tas_k list"
 msgstr "Ü_lesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1339
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:454
+#: ../calendar/gui/tasks-control.c:455
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8539,26 +8553,21 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded?"
 
-#: ../calendar/gui/tasks-control.c:457 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:494 ../calendar/gui/tasks-control.c:510
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "Prindi ülesanded"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "PETKNRL"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Sündmused ja koosolekud"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1562
+#: ../plugins/itip-formatter/itip-formatter.c:1570
 msgid "Opening calendar"
 msgstr "Kalendri avamine"
 
@@ -10120,48 +10129,68 @@ msgstr "Vaikne_ookean/Wallis"
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:284
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
+
+#: ../composer/e-composer-post-header.c:117
+msgid "Posting destination"
+msgstr "Postituse sihtkoht"
+
+#: ../composer/e-composer-post-header.c:118
+msgid "Choose folders to post the message to."
+msgstr "Vali kaust, kuhu sõnum postitada."
+
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
+
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "Si_gnatuur:"
+
+#: ../composer/e-msg-composer-hdrs.c:326
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
-#: ../composer/e-msg-composer-hdrs.c:290
+#: ../composer/e-msg-composer-hdrs.c:332
 msgid "_Reply-To:"
 msgstr "Kellele-v_astata:"
 
-#: ../composer/e-msg-composer-hdrs.c:293
+#: ../composer/e-msg-composer-hdrs.c:335
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: ../composer/e-msg-composer-hdrs.c:295
+#: ../composer/e-msg-composer-hdrs.c:337
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: ../composer/e-msg-composer-hdrs.c:298
+#: ../composer/e-msg-composer-hdrs.c:340
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:300
+#: ../composer/e-msg-composer-hdrs.c:342
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: ../composer/e-msg-composer-hdrs.c:304
+#: ../composer/e-msg-composer-hdrs.c:346
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:306
-#, fuzzy
+#: ../composer/e-msg-composer-hdrs.c:348
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 "Sisesta aadressid, millele saadetakse sõnumi koopiad nii, et aadresse sõnumi "
-"saajate hulgas ei paista."
+"saajate hulgas ei paista"
 
-#: ../composer/e-msg-composer-hdrs.c:311
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_Post To:"
 msgstr "Ku_hu postitada:"
 
-#: ../composer/e-msg-composer-hdrs.c:314
+#: ../composer/e-msg-composer-hdrs.c:356
 msgid "S_ubject:"
 msgstr "T_eema:"
 
@@ -10169,18 +10198,18 @@ msgstr "T_eema:"
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-msg-composer-select-file.c:196
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "Manuse lisamine"
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:819
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
 "signeerimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:828
+#: ../composer/e-msg-composer.c:826
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10188,51 +10217,42 @@ msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:1338 ../composer/e-msg-composer.c:2606
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "Peida _manuseriba"
 
-#: ../composer/e-msg-composer.c:1341 ../composer/e-msg-composer.c:2609
-#: ../composer/e-msg-composer.c:3990
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3881
 msgid "Show _Attachment Bar"
 msgstr "Näita _manuseriba"
 
-#: ../composer/e-msg-composer.c:1373 ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../composer/e-msg-composer.c:1445
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "Faili pole võimalik avada"
 
-#: ../composer/e-msg-composer.c:1453
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-msg-composer.c:1740
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1776
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../composer/e-msg-composer.c:2241 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Automaatselt koostatud"
-
-#: ../composer/e-msg-composer.c:2344
-msgid "Si_gnature:"
-msgstr "Si_gnatuur:"
-
-#: ../composer/e-msg-composer.c:2620 ../composer/e-msg-composer.c:3872
-#: ../composer/e-msg-composer.c:3875
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:3764
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:5134
+#: ../composer/e-msg-composer.c:5034
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10380,7 +10400,7 @@ msgstr "Enne sõnumite koostamist tuleb sul seadistada postikonto."
 msgid "_Do not Recover"
 msgstr "Ära _taasta"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
 msgid "_Recover"
 msgstr "_Taasta"
 
@@ -10463,10 +10483,56 @@ msgstr "Fail &quot;{0}&quot; on juba olemas."
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:142
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "_Tähtis"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Töö"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Isiklik"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "Ü_lesanne"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "_Hiljem"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "Sildi _nimi:"
+
+#: ../e-util/e-util-labels.c:339
+#, fuzzy
+msgid "Edit Label"
+msgstr "Redigeeritav"
+
+#: ../e-util/e-util-labels.c:339
+#, fuzzy
+msgid "Add Label"
+msgstr "Silt"
+
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "Silt ei tohi olla tühi."
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "Sama sisuga silt on juba olemas. Palun muuda oma sildi nime."
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10587,31 +10653,15 @@ msgstr "Võrdlusaja valimine"
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Tähtis"
-
-#. green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:149
-msgid "To Do"
-msgstr "Ülesanne"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:96
-msgid "Later"
-msgstr "Hiljem"
-
 #: ../filter/filter-part.c:533
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
 #: ../filter/filter-rule.c:800
-msgid "_Search name:"
-msgstr "Otsingu_põhi:"
+#, fuzzy
+msgid "R_ule name:"
+msgstr "Reegli nimi"
 
 #: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
@@ -10655,11 +10705,11 @@ msgid "I_nclude threads"
 msgstr "Kaa_satavad lõimed"
 
 #: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10759,7 +10809,7 @@ msgstr "tulevikus"
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:187
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "sekundit"
 
@@ -10773,7 +10823,7 @@ msgstr "sinu poolt määratud aeg"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:383
+#: ../plugins/google-account-setup/google-source.c:398
 msgid "weeks"
 msgstr "nädalat"
 
@@ -10835,10 +10885,10 @@ msgstr "Evolutioni e-posti redaktori seadistuste juhtimine"
 msgid "Evolution Mail preferences control"
 msgstr "Evolutioni e-posti eelistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:606
-#: ../mail/importers/elm-importer.c:333 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:563 ../mail/mail-component.c:564
-#: ../mail/mail-component.c:728
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
+#: ../mail/mail-component.c:737
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -10849,7 +10899,7 @@ msgid "Mail Accounts"
 msgstr "Postikontod"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "E-posti eelistused"
 
@@ -10880,52 +10930,59 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "Automaatselt koostatud"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:2056
-#, fuzzy
+#: ../mail/em-account-editor.c:2053
 msgid "Check for _new messages every"
-msgstr "Uusi sõnumeid _kontrollitakse automaatselt vahemikuga"
+msgstr "Uusi sõnumeid _kontrollitakse iga"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:133
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "minu_ti järel"
+
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
-#, fuzzy
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
 msgid "Checking for New Messages"
-msgstr "Uute sõnumite kontroll"
+msgstr "Uute sõnumite kontrollimine"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -10934,8 +10991,8 @@ msgstr "Evolutioni kontoabiline"
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:943
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
 #: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "Lubatud"
@@ -10949,34 +11006,34 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:181 ../mail/mail-config.c:1036
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: ../mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: ../mail/em-composer-prefs.c:1012
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1696
+#: ../mail/em-composer-utils.c:1703
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1743
+#: ../mail/em-composer-utils.c:1750
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10984,7 +11041,7 @@ msgstr ""
 "Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell "
 "${24Hour}:${Minute}, kirjutas ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1884
+#: ../mail/em-composer-utils.c:1891
 msgid "-----Original Message-----"
 msgstr "-----Algupärane sõnum-----"
 
@@ -11010,248 +11067,279 @@ msgid "Attachments"
 msgstr "Manused"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Piiksu"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "Lõpetatud "
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "sisaldab"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Vastuvõtmise kuupäev"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Saatmise kuupäev"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ei lõpe stringiga"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "pole olemas"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "ei tagasta"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "ei kõla nagu"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "ei alga stringiga"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Puuduvad"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Mustand"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "lõpeb stringiga"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "On olemas"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "on olemas"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Avaldis"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Jälgimislipp"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "Tähtis"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "on"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "on pärast"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "on enne"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "on märgistatud"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "on väiksem kui"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "ei ole"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "on märgistamata"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "on määramata"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "on määratud"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Silt"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Postiloend"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Kõik sobivused"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Sõnumi keha"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Sõnumi päis"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "Sõnum on rämps"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "Sõnum ei ole rämpspost"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Tõsta kausta"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Suuna programmi"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
 msgid "Read"
 msgstr "Loetud"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Saajad"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "Regex sobivus"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "Vastatud"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "tagastab"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "tagastab suurema kui"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "tagastab väiksema kui"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Hinne"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "Määra olek"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "kõlab kui"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "Lähtekonto"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "Spetsiifiline päis"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "algab stringiga"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1684
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
 #: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Teema"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "Määramata olek"
 
@@ -11265,51 +11353,51 @@ msgstr "Siis"
 msgid "Add Ac_tion"
 msgstr "Lisa erand"
 
-#: ../mail/em-folder-browser.c:185
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "Loo o_tsingu põhjal otsingukaust..."
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "Kõik sõnumid"
 
-#: ../mail/em-folder-browser.c:208
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../mail/em-folder-browser.c:210
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "Silt puudub"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "Loetud sõnumid"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "Värsked sõnumid"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "Viimase 5 päeva sõnumid"
 
-#: ../mail/em-folder-browser.c:220
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "Manustega sõnumid"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "Tähtsad sõnumid"
 
-#: ../mail/em-folder-browser.c:222
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "Mitte rämpspost"
 
-#: ../mail/em-folder-browser.c:1045
+#: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
 msgstr "Kontootsing"
 
-#: ../mail/em-folder-browser.c:1089
+#: ../mail/em-folder-browser.c:1176
 msgid "All Account Search"
 msgstr "Otring kõigi kontode hulgast"
 
@@ -11329,7 +11417,7 @@ msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
 #: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Kausta omadused"
 
@@ -11338,7 +11426,8 @@ msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks klõpsa siia>"
 
 #: ../mail/em-folder-selector.c:262
-msgid "Create"
+#, fuzzy
+msgid "C_reate"
 msgstr "Loo"
 
 #: ../mail/em-folder-selector.c:266
@@ -11346,7 +11435,7 @@ msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:934 ../mail/mail-vfolder.c:1007
+#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
 msgid "Search Folders"
 msgstr "Otsingukaustad"
 
@@ -11355,27 +11444,27 @@ msgstr "Otsingukaustad"
 msgid "UNMATCHED"
 msgstr "MITTEVASTAV"
 
-#: ../mail/em-folder-tree-model.c:467 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "Mustandid"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:470 ../mail/em-folder-tree.c:2568
-#: ../mail/mail-component.c:153
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: ../mail/em-folder-tree-model.c:473 ../mail/mail-component.c:155
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "Väljundkast"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:156
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "Saadetud"
 
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree-model.c:804
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "Laadimine..."
 
@@ -11394,320 +11483,343 @@ msgstr "Laadimine..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: ../mail/em-folder-tree.c:894
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s ümbertõstmine"
 
-#: ../mail/em-folder-tree.c:896
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1895
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1971
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite ümbertõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:905 ../mail/message-list.c:1897
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1973
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sõnumeid pole võimalik ülemise taseme hoidlasse panna"
 
-#: ../mail/em-folder-tree.c:999 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2095
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2100
 msgid "_New Folder..."
 msgstr "_Uus kaust..."
 
-#: ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-tree.c:2103
 msgid "_Move..."
 msgstr "_Tõsta ümber..."
 
-#: ../mail/em-folder-tree.c:2126 ../ui/evolution-mail-list.xml.h:38
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Muuda _nime..."
 
-#: ../mail/em-folder-tree.c:2127
+#: ../mail/em-folder-tree.c:2111
 msgid "Re_fresh"
 msgstr "_Värskenda"
 
-#: ../mail/em-folder-tree.c:2128
+#: ../mail/em-folder-tree.c:2112
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2134 ../mail/mail.error.xml.h:139
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
-#: ../mail/em-folder-utils.c:105
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1177
-#: ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1206
 #: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: ../mail/em-folder-utils.c:590
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: ../mail/em-folder-utils.c:750
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Kausta loomine"
 
-#: ../mail/em-folder-utils.c:750
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1083 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Tõrge sõnumi kustutamisel"
 
-#: ../mail/em-folder-view.c:1084 ../mail/mail.error.xml.h:127
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sul pole selle sõnumi kustutamiseks piisavalt õiguseid."
 
-#: ../mail/em-folder-view.c:1285 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1287 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:578 ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Edasta"
 
 #. 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:1291 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: ../mail/em-folder-view.c:1297
+#: ../mail/em-folder-view.c:1342
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Prindi..."
+
+#: ../mail/em-folder-view.c:1346
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1298
+#: ../mail/em-folder-view.c:1347
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1299
+#: ../mail/em-folder-view.c:1348
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: ../mail/em-folder-view.c:1302
+#: ../mail/em-folder-view.c:1351
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: ../mail/em-folder-view.c:1303
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: ../mail/em-folder-view.c:1304
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks"
 
-#: ../mail/em-folder-view.c:1305
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as Un_important"
 msgstr "Märgi m_ittetähtsaks"
 
-#: ../mail/em-folder-view.c:1306
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: ../mail/em-folder-view.c:1307
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: ../mail/em-folder-view.c:1308
+#: ../mail/em-folder-view.c:1357
 msgid "Mark for Follo_w Up..."
 msgstr "Märgi _järeltoiminguks..."
 
-#: ../mail/em-folder-view.c:1310
+#: ../mail/em-folder-view.c:1359
 msgid "_Label"
 msgstr "Si_lt"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1311 ../widgets/misc/e-dateedit.c:496
+#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
 msgid "_None"
 msgstr "_Puudub"
 
-#: ../mail/em-folder-view.c:1316
+#: ../mail/em-folder-view.c:1363
+msgid "_New Label"
+msgstr "_Uus silt"
+
+#: ../mail/em-folder-view.c:1367
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../mail/em-folder-view.c:1317
+#: ../mail/em-folder-view.c:1368
 msgid "Cl_ear Flag"
 msgstr "_Eemalda märgistus"
 
-#: ../mail/em-folder-view.c:1320
+#: ../mail/em-folder-view.c:1371
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi põhjal reegel"
 
-#: ../mail/em-folder-view.c:1321
-msgid "Search Folder from _Subject"
+#. 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:1373
+#, fuzzy
+msgid "Search Folder based on _Subject"
 msgstr "Otsingukaust _teema järgi"
 
-#: ../mail/em-folder-view.c:1322
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1374
+#, fuzzy
+msgid "Search Folder based on Se_nder"
 msgstr "Otsingukaust _saatja järgi"
 
-#: ../mail/em-folder-view.c:1323
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1375
+#, fuzzy
+msgid "Search Folder based on _Recipients"
 msgstr "Otsingukaust _adressaatide järgi"
 
-#: ../mail/em-folder-view.c:1324
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1376
+#, fuzzy
+msgid "Search Folder based on Mailing _List"
 msgstr "Otsingukaust _postiloendi järgi"
 
-#: ../mail/em-folder-view.c:1328
-msgid "Filter on Sub_ject"
+#. 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:1381
+#, fuzzy
+msgid "Filter based on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: ../mail/em-folder-view.c:1329
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1382
+#, fuzzy
+msgid "Filter based on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: ../mail/em-folder-view.c:1330
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1383
+#, fuzzy
+msgid "Filter based on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: ../mail/em-folder-view.c:1331
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1384
+#, fuzzy
+msgid "Filter based on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2167 ../mail/em-folder-view.c:2211
+#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2429
+#: ../mail/em-folder-view.c:2528
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2448
+#: ../mail/em-folder-view.c:2547
 msgid "Retrieving Message..."
 msgstr "Sõnumi vastuvõtmine..."
 
-#: ../mail/em-folder-view.c:2676
+#: ../mail/em-folder-view.c:2806
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2679
+#: ../mail/em-folder-view.c:2809
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsingukaust"
 
-#: ../mail/em-folder-view.c:2680
+#: ../mail/em-folder-view.c:2810
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2681
+#: ../mail/em-folder-view.c:2811
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:3056
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klõpsa, et saata sõnumit aadressile %s"
 
-#: ../mail/em-folder-view.c:3068
+#: ../mail/em-folder-view.c:3320
 #, c-format
 msgid "Click to call %s"
 msgstr ""
 
-#: ../mail/em-folder-view.c:3073
+#: ../mail/em-folder-view.c:3325
 msgid "Click to hide/unhide addresses"
 msgstr "Klõpsa aadresside peitmiseks/nähtavale toomiseks"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
+#: ../mail/em-format-html-display.c:659
+#, fuzzy
+msgid "Fin_d:"
 msgstr "_Otsing:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:683
 msgid "_Previous"
 msgstr "_Eelmine"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
 msgid "_Next"
 msgstr "_Järgmine"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
 msgid "M_atch case"
 msgstr "_Tõstutundlik"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:992
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik tagada."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:993
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11715,11 +11827,11 @@ msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11727,11 +11839,11 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signatuur kehtib, kuid saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:995
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11739,11 +11851,11 @@ msgstr ""
 "See sõnum on signeeritud korrektse allkirjaga, kuid selle saatjat pole "
 "võimalik verifitseerida."
 
-#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
 msgid "Signature exists, but need public key"
 msgstr "Allkiri on olemas, kui vaja on ka avalikku võtit"
 
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:996
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11751,11 +11863,11 @@ msgstr ""
 "See sõnum on signeeritud allkirjaga, kuid sellele vastav avalik võti on "
 "puudu."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1003
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11763,11 +11875,11 @@ msgstr ""
 "See sõnum ei ole krüptitud ja seetõttu võib see interneti kaudu liikudes "
 "olla kolmandatele osapooltele nähtav."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:1004
 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 "
@@ -11777,22 +11889,22 @@ msgstr ""
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi sisu "
 "näha."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:1005
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:1006
 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 "
@@ -11801,92 +11913,92 @@ msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga. Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteeringut lahti murda."
 
-#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vaata sertifikaati"
 
-#: ../mail/em-format-html-display.c:1068
+#: ../mail/em-format-html-display.c:1122
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole vaadatav"
 
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1441
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1449
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1452
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "sellel ajal: %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1512
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1513
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1514
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1515
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:2173
 msgid "Save attachment as"
 msgstr "Manuse salvestamine kui"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2177
 msgid "Select folder to save all attachments"
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2228
 msgid "_Save Selected..."
 msgstr "_Salvesta valitud..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2241
+#: ../mail/em-format-html-display.c:2295
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ma_nus"
 msgstr[1] "%d ma_nust"
 
-#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
 msgid "S_ave"
 msgstr "Salves_ta"
 
-#: ../mail/em-format-html-display.c:2259
+#: ../mail/em-format-html-display.c:2313
 msgid "S_ave All"
 msgstr "_Salvesta kõik"
 
-#: ../mail/em-format-html-display.c:2322
+#: ../mail/em-format-html-display.c:2376
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
 msgid "View _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2455
+#: ../mail/em-format-html-display.c:2509
 msgid "Hide _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2510
+#: ../mail/em-format-html-display.c:2564
 msgid "O_pen With"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2581
+#: ../mail/em-format-html-display.c:2635
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -11899,108 +12011,108 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:916
 msgid "Unknown external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:924
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:954
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:965
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Viide kohalikult failile (%s) on saidis \"%s\" korrektne"
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:988
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Viide kaugandmetele (%s)"
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:999
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 
-#: ../mail/em-format-html.c:1220
+#: ../mail/em-format-html.c:1227
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1394
 msgid "Formatting Message..."
 msgstr "Sõnumi vormindamine..."
 
-#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1592
-#: ../mail/em-format-html.c:1614 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1529 ../mail/em-format-html.c:1598
-#: ../mail/em-format-html.c:1617 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1688 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1198
+#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1715
+#: ../mail/em-format-html.c:1733
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1720
+#: ../mail/em-format-html.c:1738
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1732 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:344
-#: ../widgets/misc/e-dateedit.c:366
+#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../mail/em-format-html.c:1755 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
 #. 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:1845
+#: ../mail/em-format-html.c:1866
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Selle sõnumi on <b>%2$s</b> nimel saatnud <b>%1$s</b>"
 
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
 msgid "From"
 msgstr "Saatja"
 
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:88
+#: ../mail/em-mailer-prefs.c:91
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
@@ -12041,48 +12153,82 @@ msgstr "Viga allkirja tõestamisel"
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1659
 msgid "Could not parse PGP message"
 msgstr "PGP-sõnumit pole võimalik analüüsida"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1659
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "Iga kord"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "Kord kuus"
 
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "Rämpspostile kohandatud päise lisamine"
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "Päise nimi:"
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "Päise väärtus sisaldab:"
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "Sisaldab väärtust"
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "Värvus"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr ""
+
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:789 ../mail/em-mailer-prefs.c:843
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin on saadaval ja binaarfail on paigaldatud."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:797 ../mail/em-mailer-prefs.c:852
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s plugin pole saadaval. Palun kontrolli, kas see pakk on paigaldatud."
 
-#: ../mail/em-mailer-prefs.c:818
+#: ../mail/em-mailer-prefs.c:1115
 msgid "No Junk plugin available"
 msgstr "Räpsposti plugin pole saadaval"
 
-#: ../mail/em-migrate.c:1210
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "Ülesanne"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "Hiljem"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12094,47 +12240,47 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vana POP `%s' hoia-serveris andmeid pole võimalik avada: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 hoia-serveris andmekataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
-#: ../mail/em-migrate.c:2742
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: ../mail/em-migrate.c:2761
+#: ../mail/em-migrate.c:2846
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12155,49 +12301,49 @@ msgstr "Vasta _postiloendisse"
 msgid "_Add to Address Book"
 msgstr "_Lisa aadressiraamatusse"
 
-#: ../mail/em-subscribe-editor.c:601
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:840
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: ../mail/em-subscribe-editor.c:861
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "Seda teadet enam uuesti mitte näidata."
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "Seda teadet enam _uuesti mitte näidata."
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Sõnumifiltrid"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:641
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:690
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1174
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
@@ -12215,39 +12361,50 @@ msgid "Allows evolution to display text part of limited size"
 msgstr "Piiratud suurusega tekstiosa kuvamise lubamine"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-#, fuzzy
-msgid "Automatic emoticon recognition"
-msgstr "Automaatne viidatuvastus"
+msgid "Always request read receipt"
+msgstr "Lugemiskinnitust küsimine alati"
 
 #: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Mitme sekundi vältel tuleb olekuribal veateadet kuvada."
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "Automaatne tujunäotuvastus"
+
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "Automaatne viidatuvastus"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "Otsi sissetuleva posti seest rämpsu"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "Tsitaatide esiletoomise värvus"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "Tsitaatide esiletoomise värvus."
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "Redaktoriakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "Redaktoriakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Saaja/Koopia/Pimekoopia väljadel olevate aadresside kokkusurumine"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12255,93 +12412,140 @@ msgstr ""
 "Saaja/Koopia/Pimekoopia väljadel olevate aadresside kokkusurumine "
 "address_count võtmes määratud arvuni."
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada."
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada."
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "Vaikimisi edastamisstiil"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "Redaktoriakna vaikimisi kõrgus"
-
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Default height of the Message Window"
-msgstr "Sõnumiakna vaikimisi kõrgus"
-
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "Tellimisdialoogi vaikimisi kõrgus"
-
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid "Default reply style"
-msgstr "Vastamise vaikimisi laad"
+msgid "Default height of the Composer Window."
+msgstr "Redaktoriakna vaikimisi kõrgus."
 
 #: ../mail/evolution-mail.schemas.in.h:20
-msgid "Default value for thread expand state"
-msgstr "Vaikimisi väärtus lõimede laiendamise olekule"
+msgid "Default height of the message window."
+msgstr "Sõnumiakna vaikimisi kõrgus."
 
 #: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default width of the Composer Window"
-msgstr "Redaktoriakna vaikimisi laius"
+msgid "Default height of the subscribe dialog."
+msgstr "Tellimisdialoogi vaikimisi kõrgus."
 
 #: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default width of the Message Window"
-msgstr "Sõnumiakna vaikimisi laius"
+msgid "Default reply style"
+msgstr "Vastamise vaikimisi laad"
 
 #: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default width of the Subscribe dialog"
-msgstr "Tellimisdialoogi vaikimisi laius"
+msgid "Default value for thread expand state"
+msgstr "Vaikimisi väärtus lõimede laiendamise olekule"
 
 #: ../mail/evolution-mail.schemas.in.h:24
-msgid "Directory for saving mail component files"
-msgstr "Mailikomponentide salvestamise kataloog"
+msgid "Default width of the Composer Window."
+msgstr "Redaktoriakna vaikimisi laius."
 
 #: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "Sõnumiakna vaikimisi laius."
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "Tellimisdialoogi vaikimisi laius."
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Directory for loading/attaching files to composer."
+msgstr "Koostajasse failide laadimise/manustamise kataloog."
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Directory for saving mail component files."
+msgstr "Mailikomponentide failide salvestamise kataloog."
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Õigekirjakontrolli poolt tuvastatud vigade esiletõstmine tippimise ajal."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Junk folders on exit"
 msgstr "Rämpspostikaustade tühjendamine programmi sulgemisel"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
 msgstr "Prügikaustade tühjendamine programmi sulgemisel"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Evolutionist väljumisel kõigi rämpspostikaustade tühjendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolutionist väljumisel kõigi prügikaustade tühjendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Kursorirežiimi lubamine - siis on sõnumi lugemisel kursori asukoht näha."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:40
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "Ettevaatava otsinguvõimaluse lubamine"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Enable or disable type ahead search feature"
 msgstr "Ettevaatava otsinguvõimaluse lubamine"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:42
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Otsingukaustad"
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
 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 "
@@ -12353,27 +12557,33 @@ msgstr ""
 "näiteks kausta, sisestades kausta nime ja see kaust aktiveeritakse "
 "automaatselt."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable to render message text part of limited size."
 msgstr "Piiratud suurusega tekstiosa kuvamise lubamine."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable/disable caret mode"
 msgstr "Kursorirežiimi lubamine/keelamine"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane"
 msgstr "Sõnumiloendi paani kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Kaustapõhise eelvaate peitmine ja valiku eemaldamine"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12381,7 +12591,7 @@ msgstr ""
 "Korraga kümne või enama sõnumi avamise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12389,7 +12599,7 @@ msgstr ""
 "Kui \"Eelvaate\" paan on sisse lülitatud, siis näidatakse seda vertikaalse "
 "vaate asemel külg-külje kõrval."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:53
 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 "
@@ -12400,50 +12610,53 @@ msgstr ""
 "andmebaasis kirjeldatud bonobo-vaaturkomponendiga ja seda vaaturit "
 "kasutatakse sisu kuvamiseks."
 
-#: ../mail/evolution-mail.schemas.in.h:41
-#, fuzzy
-msgid ""
-"It disables the feature where repeated prompts to ask if delete messages "
-"from search folder."
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
-"Selle abil keelatakse korduvad võrguvaba režiimi jaoks toimuva "
-"sünkroniseerimise kohta käiva kinnituse küsimised."
+"Sellega lubatakse ja keelatakse mitme sõnumi märkimise korral kinnituse "
+"küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:55
+#, fuzzy
 msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
 msgstr ""
 "Selle abil keelatakse korduvad võrguvaba režiimi jaoks toimuva "
 "sünkroniseerimise kohta käiva kinnituse küsimised."
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "It disables/enables the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:56
+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 ""
-"Sellega lubatakse ja keelatakse mitme sõnumi märkimise korral kinnituse "
-"küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Last time empty junk was run"
 msgstr "Viimane kord kui rämpsukausta tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of Labels and their associated colors"
 msgstr "Siltide ja nende värvuste loend"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12451,11 +12664,11 @@ msgstr ""
 "Evolutioni sõnumikomponendile teadaolevate kontode loend. Sisaldab "
 "alamkataloogide nimesid kataloogi /apps/evolution/mail/accounts suhtes."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "List of custom headers and whether they are enabled."
 msgstr "Kohandatud päiste ja nende lubamise tingimuste loend."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:65
 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."
@@ -12464,143 +12677,135 @@ msgstr ""
 "värvus vorminus sõnumeid, kus värvus on kirjeldatud HTML-ile sarnaselt "
 "kuueteistkümnendsüsteemis."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Mime-tüüpide loend bonobo komponendivaaturi kontrolliks"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "List of protocol names whose license has been accepted."
 msgstr "Aktsepteeritava litsentsiga protokollide nimede loend."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:69
 #, fuzzy
 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 contacts 2 - Always "
-"load images off the net"
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
 msgstr ""
 "HTML sõnumite piltide laadimine üle http(s) protokolli. Võimalikud väärtused "
 "on: 0 - Pilte ei laadita mitte kunagi võrgust alla 1 - Pildid laaditakse "
 "ainult kontaktide hulgast tulnud sõnumite puhul 2 - Pildid laaditakse alati "
 "võrgust alla"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout"
 msgstr "Sõnumi nähtuks märkimine pärast määratud ajapiirangu ületamist"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark as Seen after specified timeout."
 msgstr "Sõnumi nähtuks märkimine pärast määratud ajapiirangu ületamist."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\""
 msgstr "Tsitaatide märkimine sõnumi eelvaates"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tsitaatide märkimine sõnumi eelvaates."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default height"
 msgstr "Sõnumiakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Sõnumi kuvamise laad (\"tavaline\", \"kõik päised\", \"lähtekood\")"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Vähim arv päevi rämpsukausta tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Vähim arv päevi prügikasti tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Vähim arv päevi rämpsukausta tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Vähim arv päevi prügikasti tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "New Mail Notify sound file"
-msgstr "Helifail uutest sõnumitest teatamiseks"
-
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid "New Mail Notify type"
-msgstr "Uuest sõnumist teatamise tüüp"
-
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Aadresside arv, mis kuvatakse Saaja/Koopia/Pimekoopia väljadel"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt on empty subject"
 msgstr "Kinnituse küsimine tühja teema korral"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kausta puhastamisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Teemata sõnumi saatmisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Kinnituse küsimine, kui kasutaja soovib viivitamatult võrguvabat režiimi "
 "aktiveerida"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 #, fuzzy
 msgid "Prompt when deleting messages in search folder"
 msgstr "Tühja _teemareaga sõnumi saatmisel küsitakse kinnitust"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user only fills Bcc"
 msgstr "Ainult pimekoopiaga saatmisel kasutaja käest kinnituse küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Korraga kümne või enama sõnumi saatmise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12608,132 +12813,145 @@ msgstr ""
 "Kinnituse küsimine, kui püütakse saata HTML sõnumit isikule, kes ei soovi "
 "HTML sisuga sõnumeid vastu võtta."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
 "ega pimekoopa saajat määratud."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt while marking multiple messages"
 msgstr "Kinnituse küsimine mitme sõnumi märkimise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 #, fuzzy
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Tekstis olevate emotikonide äratundmine ja piltidega asendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Recognize links in text and replace them."
 msgstr "Tekstis olevate viitade äratundmine ja asendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:100
+#, fuzzy
+msgid "Run junk test on incoming mail."
 msgstr "Rämpspostikontrollitestide rakendamine sissetulevatele sõnumitele"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Save directory"
 msgstr "Salvestamise kataloog"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Saatja foto otsimine kohalikest aadressiraamatutest"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default"
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Send HTML mail by default."
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
+#, fuzzy
+msgid "Sender email-address column in the message list"
+msgstr "Saatja aadressi näitamine sõnumite loendi sõnumiveerus"
+
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Show photo of the sender"
 msgstr "Saatja foto näitamine"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:113
+#, fuzzy
 msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "Saatja aadressi näitamine sõnumite loendi sõnumiveerus"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Saatja foto näitamine sõnumi lugemispaanil."
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Saatja aadressi näitamine sõnumite loendi sõnumiveerus"
-
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Sound file to play when new mail arrives."
-msgstr "Helifail, mida esitatakse uute sõnumite saabumisel."
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Specifies the header to check for junk."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Kasutaja poolt valitud teavitamise liik uutele sõnumitele."
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default height"
 msgstr "Tellimisdialoogi vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Subscribe dialog default width"
 msgstr "Tellimisdialoogi vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Text message part limit"
 msgstr "Sõnumi tekstiosa piirang"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "The default plugin for Junk hook"
 msgstr "Vaikimisi plugin rämpsposti käsitlemiseks"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Viimane rämpsukausta tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Viimane prügikasti tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:125
+#, fuzzy
+msgid "The terminal font for mail display."
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:126
+#, fuzzy
+msgid "The variable width font for mail display."
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
 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 interms of KB."
@@ -12742,20 +12960,20 @@ msgstr ""
 "suurim suurus. Vaikimisi väärtus on 4MB / 4096 KB, väärtus määratakse "
 "kilobaitides."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 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 "
 "to the other available plugins."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 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;"
@@ -12767,11 +12985,11 @@ msgstr ""
 "&lt;header enabled&gt; - kui seda päiserida tuleks kuvada, siis on \"enabled"
 "\" määratud."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "This option would help in improving the speed of fetching."
 msgstr "See võti võib aidata tõhustada vastuvõtmise kiirust."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12779,15 +12997,16 @@ msgstr ""
 "Selle võtmega määratakse sõnumite nimekirja vaikimisi vaates näidatavate "
 "aadresside arv enne '...' näitamist."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
+#, fuzzy
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 "Selle sättega määratakse, kas lõimed peavad vaikimisi olema avatud või "
 "ahendatud olekus. Sätte muutmise korral vajab Evolution taaskäivitamist."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 #, fuzzy
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
@@ -12797,103 +13016,111 @@ msgstr ""
 "Selle sättega määratakse, kas lõimed peavad vaikimisi olema avatud või "
 "ahendatud olekus. Sätte muutmise korral vajab Evolution taaskäivitamist."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message list."
 msgstr "Sõnumiloendi paigutamine lõimedesse."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list"
 msgstr "Sõnumiloendi paigutamine lõimedesse"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Thread the message-list based on Subject"
 msgstr "Sõnumiloendi paigutamine lõimedesse Teema alusel"
 
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+msgid "Timeout for marking message as seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
+msgid "Timeout for marking message as seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin'i deemoni ja kliendi kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin'i deemoni ja kliendi (spamc/spamd) kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumi näitamisel"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only local spam tests."
 msgstr "Ainult kohalike rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ainult kohalike (mitte-DNS) rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Use side-by-side or wide layout"
 msgstr "Külg-külje kõrval paigutuse või laia paigutuse kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Pimekoopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Koopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked"
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/PostTo menu item is checked."
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vaade/Kellele-vastata menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Kellele-vastata menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12902,15 +13129,15 @@ msgstr ""
 "järgi paigutamist - seda juhul, kui sõnumite päised ei sisalda In-Reply-To "
 "või References ridu."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane"
 msgstr "Sõnumiloendi paani laius"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Width of the message-list pane."
 msgstr "Sõnumiloendi paani laius."
 
@@ -12918,11 +13145,11 @@ msgstr "Sõnumiloendi paani laius."
 msgid "Importing Elm data"
 msgstr "Elm'i andmete importimine"
 
-#: ../mail/importers/elm-importer.c:373
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "Evolutioni Elm'i importija"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "Postkasti importimine programmist Elm."
 
@@ -12946,12 +13173,12 @@ msgstr "Berkeley postkasti vormingus kaustade importija"
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:372
 #, c-format
 msgid "Scanning %s"
 msgstr "%s läbivaatamine"
@@ -12960,11 +13187,11 @@ msgstr "%s läbivaatamine"
 msgid "Importing Pine data"
 msgstr "Pine'i andmete importimine"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "Evolutioni Pine'i importija"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "Postkasti importimine programmist Pine."
 
@@ -12992,146 +13219,173 @@ msgstr "%s postiloend"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:533
 #, fuzzy, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valitud, "
 msgstr[1] "%d valitud, "
 
-#: ../mail/mail-component.c:528
+#: ../mail/mail-component.c:537
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d kustutatut"
 msgstr[1] "%d kustutatut"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d rämpssõnum"
 msgstr[1] "%d rämpssõnumit"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d mustand"
 msgstr[1] "%d mustandit"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:544
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d saadetud"
 msgstr[1] "%d saadetud"
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d saatmata"
 msgstr[1] "%d saatmata"
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lugemata, "
 msgstr[1] "%d lugemata, "
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kokku"
 msgstr[1] "%d kokku"
 
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:890
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: ../mail/mail-component.c:882
+#: ../mail/mail-component.c:891
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: ../mail/mail-component.c:883
+#: ../mail/mail-component.c:892
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:898
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:899
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:900
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:1038
+#: ../mail/mail-component.c:1047
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "_Tähtis"
+#: ../mail/mail-component.c:1516
+msgid "Error"
+msgstr ""
 
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "_Töö"
+#: ../mail/mail-component.c:1516
+msgid "Errors"
+msgstr ""
 
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "_Isiklik"
+#: ../mail/mail-component.c:1517
+msgid "Warnings and Errors"
+msgstr ""
 
-#. green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "Ü_lesanne"
+#: ../mail/mail-component.c:1518
+msgid "Debug"
+msgstr ""
 
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "_Hiljem"
+#: ../mail/mail-component.c:1518
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1628
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Veebilogi"
+
+#: ../mail/mail-component.c:1632
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#: ../mail/mail-component.c:1639
+msgid "seconds."
+msgstr "sekundit."
+
+#: ../mail/mail-component.c:1649
+#, fuzzy
+msgid "Log Messages:"
+msgstr "HTML-Sõnumid"
+
+#: ../mail/mail-component.c:1701
+msgid "Log Level"
+msgstr "Logimise tase"
+
+#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "Aeg"
+
+#: ../mail/mail-component.c:1715 ../mail/message-list.c:2403
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Sõnumid"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "T_uvasta toetatavad liigid"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr "(Märkus: Selle rakendamiseks on tarvilik rakenduse taaskäivitamine)"
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sender  Photograph</b>"
 msgstr "<b>Saatja foto</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>All_kirjad</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Ülapostitamise valik</b> (pole soovitatav)"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Konto andmed</span>"
 
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">Autentimise liik</span>"
-
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
@@ -13153,13 +13407,12 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sõnumite kustutamine</span>"
 
 #: ../mail/mail-config.glade.h:16
-#, fuzzy
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad _kirjapäised</span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Sildid ja värvused</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Sildid</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13178,47 +13431,47 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Sõnumi saajad</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
-msgid "<span weight=\"bold\">New Message Notification</span>"
-msgstr "<span weight=\"bold\">Uutest sõnumitest teavitamine</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Valikud</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Prinditud kirjatüübid</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Turvaline MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvalisus</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri sätted</span>"
 
+#: ../mail/mail-config.glade.h:32
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">Autentimise liik</span>"
+
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Kontohaldus"
@@ -13258,64 +13511,70 @@ msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Krüptitud sõnumi saatmisel krüptitakse alati ka _enda jaoks"
 
 #: ../mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "Küsi _lugemiskinnitust"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Algupärane sõnum lisatakse manusena"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Automatically insert _emoticon images"
 msgstr "Tuju_nägude pildid lisatakse automaatselt"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
+#, fuzzy
+msgid "C_heck custom headers for junk"
+msgstr "Sissetulevale postile rakendatakse _rämpsukontrolli"
+
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:52
 #, fuzzy
-msgid "Check in_coming messages for junk"
+msgid "Check incoming _messages for junk"
 msgstr "Sissetulevale postile rakendatakse _rämpsukontrolli"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sisestamise käigus kon_trollitakse õigekirja"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sissetulevate sõnumite seest rämpsu kontrollimine"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Värvus õigekirjakontrolli probleemsetele sõnade jaoks:"
 
-#: ../mail/mail-config.glade.h:56
-msgid "Colors"
-msgstr "Värvused"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Enne kataloogi puhastamist küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13331,144 +13590,164 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "_Vaikimisi kooditabel:"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Lõpetamisel kustutatakse _rämpspost"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not format text contents in messages if the text si_ze exceeds"
 msgstr "Sõnumite tekstiosa ei vo_rmindata kui selle suurus ületab"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "Algupärast sõnumit ei tsiteerita"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "E-posti kontod"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "E-posti _aadress:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikaustad"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Otsingukaustad"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "_Krüptimissertifikaat:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:85
 msgid "Fix_ed width Font:"
 msgstr "Fi_kseeritud laiusega kirjatüüp:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Sõnumid vormindatakse _HTML-is"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "Täis_nimi:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:90
 msgid "HTML Messages"
 msgstr "HTML-Sõnumid"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "Päised"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "_Tsitaate rõhutatakse"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Samal joonel"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline original message (Outlook style)"
 msgstr "Algse sõnumiga samal joonel (Outlook'i moodi)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:97
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Sildid"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "Keeltetabel"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "E-posti seadistused"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "Sõnumipäiste tabel"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "Postkasti asukoht"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+"Märkus: Sildi nimes olevat alakriipsu kasutatakse menüüdes mnemoonilise "
+"identifikaatorina."
+
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Märkus: parooli ei küsita enne kui esimesel ühendumisel"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: ../mail/mail-config.glade.h:107
-#, fuzzy
-msgid "Play sound file when new messages arri_ve"
-msgstr "Uue sõnumi saabumise_l esitatakse helifaili"
-
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13476,7 +13755,7 @@ msgstr ""
 "Palun siselda seda kontot kirjeldav nimi allolevasse kasti.\n"
 "Seda nime kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13485,7 +13764,7 @@ msgstr ""
 "siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
 "teenusepakkujalt."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:113
 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 "
@@ -13495,60 +13774,52 @@ msgstr ""
 "Mittekohustuslikud väljad võib täita siis, kui sa soovid nendes väljades "
 "olevaid andmeid lisada enda saadetud sõnumitesse."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "Palun vali järgnevate valikute vahel"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ainult _pimekoopias olevate adressaatidega varustatud sõnumi saatmise puhul "
 "küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "Tsiteeritakse algupärast sõnumit"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "_Parool jäetakse meelde"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "Kellele-_vastata:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Parool jäetakse _meelde"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:122
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Saatja _fotot otsitakse ainult kohalikust aadressiraamatust"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "_Vali..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "_Lugemiskinnitus saadetakse:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "Tavaline ki_rjatüüp:"
 
-#: ../mail/mail-config.glade.h:124
-msgid "Se_lect..."
-msgstr "V_ali..."
-
-#: ../mail/mail-config.glade.h:126
-msgid "Select Drafts Folder"
-msgstr "Mustandite kausta valimine"
-
 #: ../mail/mail-config.glade.h:127
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
@@ -13565,59 +13836,47 @@ msgstr "Vali HTML muutuva laiusega kirjatüüp"
 msgid "Select HTML variable width font for printing"
 msgstr "Vali printimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:131
-msgid "Select Sent Folder"
-msgstr "Saadetud sõnumite kausta valimine"
-
 #: ../mail/mail-config.glade.h:132
-msgid "Select sound file"
-msgstr "Helifaili valimine"
-
-#: ../mail/mail-config.glade.h:134
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Serveri l_iik:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:136
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:139
 msgid "Signatures Table"
 msgstr "Allkirjatabel"
 
-#: ../mail/mail-config.glade.h:142
-msgid "Specify _filename:"
-msgstr "_Faili nimi:"
-
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "Lii_k:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13625,7 +13884,7 @@ msgstr ""
 "Siinolev keelteloend kajastab ainult keeli, millede jaoks on sõnastik "
 "paigaldatud."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13634,7 +13893,12 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:146
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13642,16 +13906,16 @@ msgstr ""
 "Sisesta nimi, millega sa soovid sellele kontole viidata.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: ../mail/mail-config.glade.h:152 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:343
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13661,110 +13925,105 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "_Internetis asuvad pildid laaditakse alati"
 
-#: ../mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_Beep when new messages arrive"
-msgstr "Uue sõnumi saabumisel _piiksutakse"
-
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:156
 msgid "_Default junk plugin:"
 msgstr "Vaikimisi _rämpsuplugin:"
 
-#: ../mail/mail-config.glade.h:162
-#, fuzzy
-msgid "_Do not notify me when new messages arrive"
-msgstr "_Uutest sõnumitest ei teavitata"
-
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Edastamise laad:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:160
 msgid "_Keep Signature above the original message on replying"
 msgstr "Vastamisel paigutatakse a_llkiri algsest sõnumist ettepoole"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "Pildid _laaditakse kontaktide poolt saadetud sõnumites"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "See konto on _määratud minu vaikimisi kontoks"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "Sõnum _märgitakse loetuks pärast"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "Internetist ei laadita kunagi ü_htegi pilti"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Rada:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "HTML-sõnumi saatmisel seda mittesoovivatele kontakti(de)le _küsitakse "
 "kinnitust"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Tühja _teemareaga sõnumi saatmisel küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Skript:"
 
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Select..."
+msgstr "_Vali..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
 msgstr "_Pildianimatsioone näitatakse"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Show the photograph of sender in the message preview"
 msgstr "E-sõnumi eelvaates näidatakse saatja _fotot"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Kellele / Koopia / Pimekoopia välju vä_hendatakse"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "Tu_rvalise ühenduse kasutamine:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "_Kasutatakse teiste rakendustega sama kirjatüüpi"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "aadressini"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "värvusega"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "kirjeldus"
 
@@ -13812,7 +14071,7 @@ msgstr "Ot_sing:"
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
 msgid "Flag to Follow Up"
 msgstr "Märgistamine järeltoiminguks"
 
@@ -13864,7 +14123,7 @@ msgstr "_Märgistus:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Litsentsitingimustega _nõustumisel märgi see ruut"
 
-#: ../mail/mail-folder-cache.c:888
+#: ../mail/mail-folder-cache.c:823
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingimine"
@@ -13873,17 +14132,17 @@ msgstr "%s pingimine"
 msgid "Filtering Selected Messages"
 msgstr "Valitud sõnumite filtreerimine"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13892,12 +14151,17 @@ msgstr ""
 "Tõrge kausta %s lisamisel: %s\n"
 "Selle asemel lisatakse kausta `Saadetud'."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+#, fuzzy
+msgid "Sending message"
+msgstr "_Saada sõnum"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
@@ -13907,15 +14171,15 @@ msgstr "Sõnumi %d/%d saatmine"
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "Tühistatud."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
@@ -13929,77 +14193,77 @@ msgstr "Sõnumite ümbertõstmine kausta %s"
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1161
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1202
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1267
 #, c-format
 msgid "Opening store %s"
 msgstr "Hoidla %s avamine"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1338
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto '%s' sõnumite puhastamine ja salvestamine"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1545
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
 msgid "Expunging folder"
 msgstr "Kataloogi puhastamine"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1629
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1630
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1711
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d sõnumi vastuvõtmine"
 msgstr[1] "%d sõnumi vastuvõtmine"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1903
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14008,11 +14272,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14021,74 +14285,74 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' ettevalmistamine võrguvabaks režiimiks"
 
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2401
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Tühistamine..."
 
-#: ../mail/mail-send-recv.c:391
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "Posti saatmine ja vastuvõtmine"
 
-#: ../mail/mail-send-recv.c:398
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: ../mail/mail-send-recv.c:506 ../mail/mail-send-recv.c:579
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: ../mail/mail-send-recv.c:788
+#: ../mail/mail-send-recv.c:792
 msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:251
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
@@ -14101,7 +14365,6 @@ msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -14129,26 +14392,26 @@ msgstr "Edastatud sõnum"
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Otsingukausta ülesseadmine: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' otsingukaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' otsingukaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1059
 msgid "Edit Search Folder"
 msgstr "Otsingukausta redigeerimine"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1148
 msgid "New Search Folder"
 msgstr "Uus otsingukaust"
 
@@ -14532,67 +14795,67 @@ msgstr ""
 "klõpsad \"Kellele:\" nupul."
 
 #: ../mail/mail.error.xml.h:83
+#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 "Palun veendu, et järgnevad adressaadid soovivad ja suudavad HTML sõnumeid "
 "vastu võtta:\n"
 "{0}\n"
 "Kas saata?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "Palun sisesta selle signatuuri identifitseerimiseks unikaalne nimi."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "Serverist pärimine"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt küsitakse toetatud autentimismehhanismide nimekirja."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "Küsitakse lugemiskinnitust."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Otsingukaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Saada kinnitus"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Allkiri on juba olemas"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Sünkroniseeri"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Kas sünkroniseerida kaustad kohapeale, võrguvabas keskkonnas kasutamiseks?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14600,7 +14863,7 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14610,7 +14873,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14624,7 +14887,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Otsingukaustad on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14638,11 +14901,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Reeglid on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14650,19 +14913,19 @@ msgstr ""
 "See kaust on lisatud muu tegevuse tulemusel,\n"
 "kui vaja, saad selle lisamist Otsingukaustade redaktoris kinnitada."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Seda sõnumit pole võimalik saata kuna adressaadi konto pole lubatud"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi adressaati"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14670,11 +14933,11 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "See allkiri on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14682,11 +14945,11 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14694,46 +14957,46 @@ msgstr ""
 "Selle konto mustandite kausta pole võimalik avada. Kas kasutada selle asemel "
 "süsteemset mustandite kasuta?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Kasuta _vaikimisi valikut"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Sa pole kõiki vajalikke andmeid sisestanud."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas soovid igal juhul lõpetada?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Sul pole võimalik kahte sama nimega kontot luua."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14743,103 +15006,99 @@ msgstr ""
 "Kaustu on võimalik valida üksikult või ka kõik kohalikud kaustad, kõik "
 "võrgukaustad või kõik kohalikud ja võrgukaustad korraga."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Hülga muudatused"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "Ä_ra sünkroniseeri"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:143
 msgid "on Current Folder and _Subfolders"
 msgstr "_käesolevas kaustas ja alamkaustades"
 
-#: ../mail/message-list.c:1045
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1046
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1047
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1048
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1049
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1543 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1618 ../plugins/itip-formatter/itip-view.c:206
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1552 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1627 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1564 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1639 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1572 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1647 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1574 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: ../mail/message-list.c:2331 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Sõnumid"
-
-#: ../mail/message-list.c:3774
+#: ../mail/message-list.c:3846
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -14859,15 +15118,15 @@ msgstr "Märgistatud"
 msgid "Follow Up Flag"
 msgstr "Märgistatud järeltoiminguks"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Vastuvõetud"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Saadetud sõnumid"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Suurus"
@@ -14896,15 +15155,15 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Tagasiside pole tarvilik"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Vasta"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
 msgid "Review"
 msgstr "Vaata üle"
 
@@ -14945,6 +15204,11 @@ msgid "Enable attachment reminder plugin"
 msgstr "Manuste meeldetuletaja plugina lubamine"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+#, fuzzy
+msgid "Enable attachment reminder plugin."
+msgstr "Manuste meeldetuletaja plugina lubamine"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -14952,14 +15216,19 @@ msgstr ""
 "Fraaside kirjeldamine, mille esinemise korral näidatakse manuse puudumise "
 "kohta meeldetuletust"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:453
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#, fuzzy
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+"Fraaside kirjeldamine, mille esinemise korral näidatakse manuse puudumise "
+"kohta meeldetuletust"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
 msgid "Keywords"
 msgstr "Võtmesõnad"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:502
-msgid "Attachment Reminder Preferences"
-msgstr "Manuste meeldetuletaja eelistused"
-
 #: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
 msgid "Remind _missing attachments"
 msgstr "_Puuduvate manuste kohta näidatakse meeldetuletust"
@@ -15068,62 +15337,62 @@ msgstr "Evolutioni taaskäivitamine"
 msgid "With Graphical User Interface"
 msgstr "Koos graafilise kasutajaliidesega"
 
-#: ../plugins/backup-restore/backup.c:67
-#: ../plugins/backup-restore/backup.c:107
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
 msgid "Shutting down Evolution"
 msgstr "Evolutioni seiskamine"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:74
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolutioni kontode ja seadistuste varundamine"
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:78
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Evolutioni andmete (e-post, kontaktid, kalender, ülesanded, märkmed) "
 "varundamine"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
 msgstr "Varundamine on valmis"
 
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
 msgid "Restarting Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:114
 msgid "Backup current Evolution data"
 msgstr "Praeguse Evolutioni kataloogi varundamine"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:119
 msgid "Extracting files from backup"
 msgstr "Varukoopiast failide väljavõtmine"
 
-#: ../plugins/backup-restore/backup.c:122
+#: ../plugins/backup-restore/backup.c:125
 msgid "Loading Evolution settings"
 msgstr "Evolutioni sätete laadimine"
 
-#: ../plugins/backup-restore/backup.c:126
+#: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
 msgstr "Ajutiste varufailide eemaldamine"
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:249
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varundamine kataloogi %s"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:254
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Taastamine kataloogist %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Backup"
 msgstr "Evolutioni varundamine"
 
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Restore"
 msgstr "Evolutioni taastamine"
 
@@ -15192,28 +15461,28 @@ msgstr "_Taasta sätted..."
 msgid "_Backup Settings..."
 msgstr "_Varunda sätted..."
 
-#: ../plugins/bbdb/bbdb.c:533 ../plugins/bbdb/bbdb.c:542
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:557
+#: ../plugins/bbdb/bbdb.c:565
 #, fuzzy
 msgid ""
 "_Automatically create entries in the addressbook when responding to messages"
 msgstr "Sõnumile vastamisel luuakse automaatselt aa_dressiraamatu kirje"
 
-#: ../plugins/bbdb/bbdb.c:563
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vali automaatsetele kontaktidele aadressiraamat"
 
-#: ../plugins/bbdb/bbdb.c:578
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "Kiirsuhtluse kontaktid"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:593
+#: ../plugins/bbdb/bbdb.c:601
 msgid ""
 "Periodically synchronize contact information and images from Pidgin buddy "
 "list"
@@ -15221,12 +15490,12 @@ msgstr ""
 "Kontaktandmeid ja pilte sünkroniseeritakse perioodiliselt Pidgin'i "
 "sõbranimekirjaga"
 
-#: ../plugins/bbdb/bbdb.c:599
+#: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vali Pidgin'i sõbranimekirja jaoks aadressiraamat"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:610
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "Sünkroniseeri sõ_branimekiri kohe"
 
@@ -15245,14 +15514,12 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
-#, fuzzy
 msgid "Convert message text to _Unicode"
-msgstr "Sõnumi tekst teisendatakse _Unicode kooditabelisse"
+msgstr "Teisenda sõnumi tekst _Unicode kooditabelisse"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-#, fuzzy
 msgid "Convert mail messages to Unicode"
-msgstr "Sõnumi tekstiosa teisendamine Unicode kooditabelisse"
+msgstr "Sõnumite teisendamine Unicode kooditabelisse"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
@@ -15281,7 +15548,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:336
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "Kasutatakse _SSL-i"
 
@@ -15303,7 +15570,7 @@ msgstr "Kohalike kalendrite põhitalitluse tagamine."
 
 #: ../plugins/calendar-http/calendar-http.c:273
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:360
+#: ../plugins/google-account-setup/google-source.c:375
 msgid "_Refresh:"
 msgstr "Värskendamissa_gedus:"
 
@@ -15413,7 +15680,7 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Kas sa soovid Evolutioni määrata vaikimisi e-posti kliendiks?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:512
+#: ../shell/main.c:626
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15536,29 +15803,30 @@ msgstr "Kausta suurus"
 msgid "Exchange Settings"
 msgstr "Exchange sätted"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:618
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:840
-msgid "Authentication Type"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#, fuzzy
+msgid "_Authentication Type"
 msgstr "Autentimise liik"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:960
+#: ../plugins/exchange-operations/exchange-account-setup.c:974
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-account-setup.c:976
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 msgid "0 KB"
 msgstr "0 KB"
@@ -15609,34 +15877,32 @@ msgstr "Sinu käesolev parool on aegunud. Palun vaheta nüüd oma parool ära."
 msgid "Your password will expire in the next %d days"
 msgstr "Sinu parool aegub järgneva %d päeva jooksul"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
+#: ../plugins/exchange-operations/exchange-delegates-user.c:164
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1560
 msgid "Custom"
 msgstr "Kohandatud"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:194
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Toimetaja (lugemine, loomine, muutmine)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:198
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (lugemine, loomine)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Ülevaataja (ainult lugemiseks)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegeeritud õigused"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
+#: ../plugins/exchange-operations/exchange-delegates-user.c:263
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -15645,7 +15911,7 @@ msgstr "%s pääsuõigused"
 #. 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:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
 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."
@@ -15655,25 +15921,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "You have been given the following permissions on my folders:"
 msgstr "Samuti on Sulle antud õigus näha järgnevaid minu katalooge:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:376
 msgid "You are also permitted to see my private items."
 msgstr "Samuti on Sul lubatud näha minu isiklikke kirjeid."
 
 #. 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:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:383
 msgid "However you are not permitted to see my private items."
 msgstr "Siiski pole Sul lubatud näha minu isiklikke kirjeid."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#: ../plugins/exchange-operations/exchange-delegates-user.c:415
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sind on määratud kasutaja %s delegaadiks"
@@ -15775,7 +16041,7 @@ msgstr "Kausta nimi"
 msgid "Folder Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Teise kasutaja kausta tellimine"
@@ -16146,7 +16412,7 @@ msgid "Folder offline"
 msgstr "Kataloog pole võgus"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1283
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "Üldine viga"
 
@@ -16354,9 +16620,9 @@ msgstr "Kausta pääsuõiguste kontrollimine"
 #: ../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 mails."
+"plain-text messages."
 msgstr ""
-"Plugin e-sõnumi koostamisel välise redaktori kasutamiseks. Sellega on "
+"Plugin välise redaktori kasutamiseks e-sõnumi koostamisel. Sellega on "
 "võimalik saata ainult lihttekstilisi sõnumeid."
 
 #. the path to the shared library
@@ -16369,7 +16635,7 @@ msgid "Compose in External Editor"
 msgstr "Välise redaktor abil koostamine"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose mails using an external editor"
+msgid "Compose messages using an external editor"
 msgstr "Sõnumite koostamine välise redaktor abil"
 
 #: ../plugins/face/face.c:57
@@ -16399,7 +16665,7 @@ msgstr ""
 msgid "Face"
 msgstr "_Näopilt"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Kausta \"%s\" tellimusest loobumine"
@@ -16542,27 +16808,29 @@ msgstr "Nõustu katseliselt"
 msgid "<b>Users:</b>"
 msgstr "<b>Kasutajad:</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "_Kohanda teavitussõnumit"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktid..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
 #: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "Sõnum"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Jagatud kataloogi teavitus"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Osalejad saavad järgneva teate.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontaktid..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Kohanda teavitussõnumit"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Väljajagamata"
@@ -16612,13 +16880,13 @@ msgid "Subscribe to my _notifications"
 msgstr "Minu _märguannete saamine"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Loetud"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
-msgstr "_Kirjuta"
+msgstr "_Kirjutamine"
+
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr "Lu_gemine"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
@@ -16659,28 +16927,28 @@ msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on lubatud."
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "Sisesta kasutajad ja määra õigused"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "Uus _jagatud kataloog..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add   "
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
 msgid "Modify"
 msgstr ""
 
@@ -16730,7 +16998,6 @@ msgid "Completed: "
 msgstr "Lõpetatud: "
 
 #: ../plugins/groupwise-features/status-track.c:225
-#, fuzzy
 msgid "Undelivered: "
 msgstr "Kohale toimetamata: "
 
@@ -16746,11 +17013,11 @@ msgstr "Plugin Hula kalendriallikate seadistamiseks."
 msgid "Hula Account Setup"
 msgstr "Hula konto sätted"
 
-#: ../plugins/imap-features/imap-headers.c:319
+#: ../plugins/imap-features/imap-headers.c:322
 msgid "Custom Headers"
 msgstr "Kohandatud päised"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:335
 msgid "IMAP Headers"
 msgstr "IMAP-i päised"
 
@@ -16804,27 +17071,27 @@ msgstr "Plugin IMAP kontode võimaluste jaoks."
 msgid "IMAP Features"
 msgstr "IMAP-i võimalused"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Calendar"
 msgstr "_Impordi kalendrisse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:87
 msgid "_Import to Tasks"
 msgstr "_Impordi ülesannetesse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:205
 msgid "Import ICS"
 msgstr "Impordi ICS-i"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Task List"
 msgstr "Ülesandeloendi valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:232
 msgid "Select Calendar"
 msgstr "Kalendri valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../plugins/import-ics-attachments/icsimporter.c:262
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Impordi"
@@ -16868,10 +17135,10 @@ msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
 msgstr ""
-"Valitud ülesande/kalendri/aadressiraamatu sünkroniseerimine Apple iPod'iga"
+"Valitud ülesande/märkme/kalendri/aadressiraamatu sünkroniseerimine Apple "
+"iPod'iga"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16881,129 +17148,129 @@ msgstr "Sünkroniseeri iPod'iga"
 msgid "iPod Synchronization"
 msgstr "iPod'iga sünkroniseerimine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:429
-#: ../plugins/itip-formatter/itip-formatter.c:554
+#: ../plugins/itip-formatter/itip-formatter.c:439
+#: ../plugins/itip-formatter/itip-formatter.c:564
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Tõrge kalendri '%s' laadimisel"
 
-#: ../plugins/itip-formatter/itip-formatter.c:574
+#: ../plugins/itip-formatter/itip-formatter.c:584
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Kalendris '%s' olev sündmus on selle kohtumisega vastuolus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:600
+#: ../plugins/itip-formatter/itip-formatter.c:610
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Sündmus leiti kalendrist '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:676
+#: ../plugins/itip-formatter/itip-formatter.c:686
 msgid "Unable to find any calendars"
 msgstr "Ühtegi kalendrit pole võimalik leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:693
 msgid "Unable to find this meeting in any calendar"
 msgstr "Seda kohtumist pole võimalik ühestki kalendrist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this task in any task list"
 msgstr "Seda ülesannet pole võimalik ühestki ülesannete loendist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this memo in any memo list"
 msgstr "Seda märget pole võimalik ühestki märkmete loendist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:772
 msgid "Searching for an existing version of this appointment"
 msgstr "Selle sündumuse olemasoleva versiooni otsimine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:927
+#: ../plugins/itip-formatter/itip-formatter.c:935
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:993
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kirjet pole võimalik kalendrisse '%s' saata. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:997
+#: ../plugins/itip-formatter/itip-formatter.c:1005
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Saadetud kalendrisse '%s' kui aktsepteeritud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1009
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Saadetud kalendrisse '%s' kui katseline"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1006
+#: ../plugins/itip-formatter/itip-formatter.c:1014
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Saadetud kalendrisse '%s' kui keeldutud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1011
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Saadetud kalendrisse '%s' kui tühistatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1105
+#: ../plugins/itip-formatter/itip-formatter.c:1113
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Korraldaja eemaldas delegaadi %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1112
+#: ../plugins/itip-formatter/itip-formatter.c:1120
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegaadile saadeti tühistusteade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1114
+#: ../plugins/itip-formatter/itip-formatter.c:1122
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Delegaadile pole võimalik tühistusteadet saata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:1207
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Osaleja olekut pole võimalik uuendada, kuna selle olek on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1226
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Osalejat pole võimalik uuendada. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1230
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Attendee status updated"
 msgstr "Osaleja olek uuendatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 msgid "Meeting information sent"
 msgstr "Koosoleku andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 msgid "Task information sent"
 msgstr "Ülesande andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1261
+#: ../plugins/itip-formatter/itip-formatter.c:1269
 msgid "Memo information sent"
 msgstr "Märkme andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1270
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Koosoleku kohta pole võimalik andmeid saata kuna koosolekut pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ülesande kohta pole võimalik andmeid saata kuna ülesannet pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1284
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Märkme kohta pole võimalik andmeid saata kuna märget pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1374
 msgid "The calendar attached is not valid"
 msgstr "Manuses olev kalender on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1352
-#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17011,15 +17278,15 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender see kalender pole korrektses "
 "iCalendar vormingus."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1402
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1510
 msgid "The item in the calendar is not valid"
 msgstr "Kalendris olev kirje on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1411
+#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17027,11 +17294,11 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender ei sisalda sündmusi, ülesandeid ega "
 "vaba/hõivatud andmeid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1440
 msgid "The calendar attached contains multiple items"
 msgstr "Manuseks olev kalender sisaldab mitut kirjet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1441
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17039,487 +17306,492 @@ msgstr ""
 "Kõikide nende kirjete töötlemiseks peab fail olema salvestatud ja kalender "
 "imporditud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:2133
 msgid "This meeting recurs"
 msgstr "See koosolek kordub"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2136
 msgid "This task recurs"
 msgstr "See ülesanne kordub"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2132
+#: ../plugins/itip-formatter/itip-formatter.c:2139
 msgid "This memo recurs"
 msgstr "See märge kordub"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2354
 msgid "_Delete message after acting"
 msgstr "Pärast tegevuse läbiviimist sõnum _kustutatakse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/itip-formatter/itip-formatter.c:2377
+#: ../plugins/itip-formatter/itip-formatter.c:2364
+#: ../plugins/itip-formatter/itip-formatter.c:2396
 msgid "Conflict Search"
 msgstr "Vastuolude otsimine"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2360
+#: ../plugins/itip-formatter/itip-formatter.c:2379
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vali kalendrid, millest tuleb koosolekute vastuolusid otsida"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Täna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "Täna %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %H:%M:%S"
 msgstr "Täna %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "Täna %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "Homme"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "Homme kell %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "Homme kell %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "Homme kell %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Homme kell %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:257
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M %p"
 msgstr "%A, %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:284
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a, %e. %B %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> avaldas %s kaudu teabe järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> avaldas järgneva koosoleku teabe:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegeeris järgneva koosoleku sulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> soovib saada värskeimat teavet järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> soovib saada värskeimat teavet järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:389
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> saatis järgneva koosoleku tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> saatis järgneva koosoleku tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> tühistas järgneva koosoleku."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:401
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> tühistas %s kaudu järgnevad koosolekumuutused:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> keeldus järgnevatest koosoleku muudatusest."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> avaldas %s kaudu järgneva ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> avaldas järgmise ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> taotleb %s määramist järgneva ülesande täitjaks:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> määras %s kaudu sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> määras sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:471
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> saatis järgneva määratud ülesande vastuse tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> saatis järgneva määratud ülesande vastuse tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> tühistas järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:489
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> esitas järgnevad muudatused määratud ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> esitas järgnevad muudatused määratud ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus järgnevast määratud ülesandest:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> avaldas %s kaudu järgneva märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> avaldas järgmise märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale märkmele:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> soovib lisada olemasolevale märkmele:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> tühistas järgneva määratud märkme:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "_Ava kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
+#: ../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 "_Lükka tagasi"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "_Nõustu"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "_Lükka kõik tagasi"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "_Määra kõik katseliseks"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../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
 msgid "_Tentative"
 msgstr "_Määra katseliseks"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "_Nõustu kõigiga"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "_Saada andmed"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "_Värskenda osaleja olekut"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "_Uuenda"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1009
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Algus:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1018
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Lõpp:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1034
-#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Kommentaar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1070
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: ../plugins/itip-formatter/itip-view.c:1098
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "_Uuenduste saatmine osalejatele"
 
-#: ../plugins/itip-formatter/itip-view.c:1107
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Rakenda kõigile instantsidele"
 
-#: ../plugins/itip-formatter/itip-view.c:1842
+#: ../plugins/itip-formatter/itip-view.c:1119
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Näita aega kui _hõivatut"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Ülesanded :"
 
-#: ../plugins/itip-formatter/itip-view.c:1844
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Märkmed :"
 
@@ -17561,45 +17833,159 @@ msgid "Disable Account"
 msgstr "Konto keelamine"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Enable libnotify notifications of new mail"
-msgstr "Uue sõnumi korral libnotify teavitamise lubamine"
+msgid "Beep or play sound file."
+msgstr "Helifaili esitamine või piiksumine."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Every time a new mail arrives, pop up a libnotify notification."
-msgstr "Teavitusakna avamine iga uue sõnumi saabumisel."
+msgid "Blink icon in notification area."
+msgstr "Teavitusalal ikooni vilgutamine."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Make the status icon blink"
-msgstr "Olekuikooni vilgutamine"
+msgid "Enable D-Bus messages."
+msgstr "D-Bus'i teadete lubamine."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "When the new-mail status icon is visible, make it blink."
+msgid "Enable icon in notification area."
+msgstr "Teavitusalal ikooni lubamine."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "D-Bus'i teate genereerimine uue sõnumi saabumisel."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
 msgstr ""
-"Uute sõnumite olekuikooni vilgutamine iga uue sõnumi saabumisel (kui ikoon "
-"on nähtaval)."
+"Kui märgitud, siis tehakse uue sõnumi saabumisel piiksu, vastasel juhul "
+"esitatakse helifaili."
 
-#: ../plugins/mail-notification/mail-notification.c:132
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr "Uute sõnumite saabumisest teatamine ainult Sisendkausta kohta."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "Heli esitamine uute sõnumite saabumisel."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr "Hüpiksõnumi kuvamine koos ikooniga."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Uute sõnumite saabumisel teavitusalas uue sõnumi ikooni kuvamine."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr "Esitatava helifaili nimi."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Uute sõnumite saabumisel esitatava helifaili nimi (kui pole määratud, et "
+"helifaili esitamise asemel tuleb piiksuda)."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Kas uute sõnumite saabumisel tuleb esitada helifaili või piiksuda."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+"Kas uute sõnumite saabumisel tuleb ikooni juures näidata ka sõnumit või "
+"mitte."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr "Kas ikoon peab vilkuma või mitte."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+"Kas teavitusi tuleb näidata ainult Sisendkausta või ka teiste kaustade kohta."
+
+#: ../plugins/mail-notification/mail-notification.c:254
+msgid "Generate a _D-Bus message"
+msgstr "_D-Bus'i teate genereerimine"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
 #, c-format
-msgid "You have received %d new message in %s."
-msgid_plural "You have received %d new messages in %s."
-msgstr[0] "Sul on %d uus sõnum kaustas %s."
-msgstr[1] "Sul on %d uut sõnumit kaustas %s."
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] "Sul on %d uus sõnum\nkaustas %s."
+msgstr[1] "Sul on %d uut sõnumit\nkaustas %s."
+
+#: ../plugins/mail-notification/mail-notification.c:368
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Sul on %d uus sõnum."
+msgstr[1] "Sul on %d uut sõnumit."
 
-#: ../plugins/mail-notification/mail-notification.c:153
+#: ../plugins/mail-notification/mail-notification.c:380
+#: ../plugins/mail-notification/mail-notification.c:385
 msgid "New email"
 msgstr "Uus e-sõnum"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Sõnumist teavitamine"
+#: ../plugins/mail-notification/mail-notification.c:440
+msgid "Show icon in _notification area"
+msgstr "_Teavitusalas kuvatakse ikooni"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../plugins/mail-notification/mail-notification.c:443
+msgid "B_link icon in notification area"
+msgstr "Teavitusala ikooni _vilgutatakse"
+
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr "Ikooniga koos ku_vatakse ka sõnumit"
+
+#: ../plugins/mail-notification/mail-notification.c:626
+msgid "_Play sound when new messages arrive"
+msgstr "Uue sõnumi saabumise_l esitatakse heli"
+
+#: ../plugins/mail-notification/mail-notification.c:632
+#, fuzzy
+msgid "_Beep"
+msgstr "Piiksu"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+#, fuzzy
+msgid "Play _sound file"
+msgstr "Helifaili valimine"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "_Faili nimi:"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "Helifaili valimine"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+msgid "Pl_ay"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr "Uutest sõnumitest teatatakse ainult _Sisendkausta kohta"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"Notifies the user with an icon in notification area and a notification "
-"message whenever a new message has arrived."
+"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 ""
 "Uue sõnumi saabumisel kasutaja teavitamine teavitusala ja -sõnumi abil."
 
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "Sõnumist teavitamine"
+
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
@@ -17616,6 +18002,19 @@ msgstr "_Teisenda koosolekuks"
 msgid "Mail to meeting"
 msgstr "Sõnumi teisendamine koosolekuks"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Kalendrit pole võimalik avada. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Valitud allikas on kirjutuskaitsega, selle alla pole võimalik ülesandeid "
+"luua. Palun vali mõni teine allikas."
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -17831,22 +18230,13 @@ msgstr "Plugin, mille abil teostatakse mono pluginaid."
 msgid "Mono Loader"
 msgstr "Mono laadur"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Uue kirja saabumisel D-BUS sõnumi genereerimine"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Uuest sõnumist teavitamine"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Plugin määramaks millised pluginad on lubatud ja millised mitte."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:231
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "Pluginahaldur"
 
@@ -17858,25 +18248,33 @@ msgstr "Pluginate lubamine ja keelamine"
 msgid "_Plugins"
 msgstr "_Pluginad"
 
-#: ../plugins/plugin-manager/plugin-manager.c:55
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "Autor(id)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: ../plugins/plugin-manager/plugin-manager.c:234
-msgid "Con_figure"
-msgstr "_Seadista"
-
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Märkus: mõned muudatused rakenduvad alles pärast taaskäivitamist"
 
-#: ../plugins/plugin-manager/plugin-manager.c:298
-#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:260
+msgid "Overview"
+msgstr "Ülevaade"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+msgid "Configuration"
+msgstr "Seadistused"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr "Selle plugina jaoks puudub seadistamise valik."
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18170,27 +18568,27 @@ msgstr "Osalejajate loend"
 msgid "Modified"
 msgstr "Muudetud"
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "Laiendatud valikus CSV vormingule"
 
-#: ../plugins/save-calendar/csv-format.c:555
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "Päise lisamine"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "Väljaeraldaja:"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "Kirjete eraldaja:"
 
-#: ../plugins/save-calendar/csv-format.c:576
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "Väärtuste kapseldamine:"
 
-#: ../plugins/save-calendar/csv-format.c:598
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 
@@ -18215,7 +18613,7 @@ msgstr "_Salvesta kettale"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:393
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
@@ -18341,7 +18739,8 @@ msgid "Evolution Test component"
 msgstr "Evolutioni testkomponent"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+#, fuzzy
+msgid "A string description of the current printer settings."
 msgstr "Käesoleva printeri sätete kirjeldus stringina"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
@@ -18349,51 +18748,60 @@ msgid "Configuration version"
 msgstr "Seadistuste versioon"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Külgpaani vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Akna vaikimisi kõrgus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Akna vaikimisi olek"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Akna vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Käivitamisel vaikimisi näidatava komponendi ID või alias."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Autonoomses olekus kettale sünkroniseeritavate kaustade radade loend"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "Külgpaan on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Arendushoiatuse dialoogi jäetakse vahele"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+#, fuzzy
+msgid "Skip recovery warning dialog"
+msgstr "Arendushoiatuse dialoogi jäetakse vahele"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
 msgid "Start in offline mode"
 msgstr "Alustamine võrguvabas olekus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "Olekuriba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18401,19 +18809,19 @@ msgstr ""
 "Evolutioni viimati uuendatud seadistuste versioon kujul major/minor/"
 "configuration (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "Peaakna vaikimisi kõrgus pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "Peaakna vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18422,7 +18830,7 @@ msgstr ""
 "configuration, kus major on peamine versioon, minor alamversioon ja "
 "configuration seadistuste versioon (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18432,46 +18840,58 @@ msgstr ""
 "ikoonide, \"both\" nii tekstinuppude kui ikoonide jaoks ja \"toolbar\" "
 "juhuks, kui nuppude laad tuletatakse GNOME tööriistariba sätetest."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Millal Evolution alustab võrgurežiimi asemel võrguvabas režiimis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+#, fuzzy
+msgid "Whether crash detection should be done or not"
+msgstr "Millal aknanupud peaksid nähtavad olema."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "Millal aken peaks maksimeeritud olema ja millal mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Millal külgpaan peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "Millal olekuriba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Kas Evolutioni arendusversioonis tuleb hoiatusdialoogist üle hüpata või "
 "mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+#, fuzzy
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr ""
+"Kas Evolutioni arendusversioonis tuleb hoiatusdialoogist üle hüpata või "
+"mitte."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "Millal aknanupud peaksid nähtavad olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "Aknanupu stiil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "Aknanupud on nähtavad"
 
@@ -18568,6 +18988,13 @@ msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
+#. 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:50 ../shell/e-shell-window.c:342
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
 #: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
@@ -18592,7 +19019,7 @@ msgstr "Bug buddy veateatamisprogrammi pole võimalik käivitada."
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001.\n"
-"Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005-2007.\n"
+"Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005-2008.\n"
 "Kaarel Jõgi <kaarel@gg.ee>, 2002.\n"
 "Priit Laes <amd@store20.com>, 2003-2007."
 
@@ -18601,64 +19028,63 @@ msgid "Evolution Website"
 msgstr "Evolutioni veebisait"
 
 #: ../shell/e-shell-window-commands.c:692
-#, fuzzy
 msgid "Error opening the FAQ webpage."
-msgstr "Viga kalendri avamisel"
+msgstr "Viga KKK veebilehe avamisel."
 
-#: ../shell/e-shell-window-commands.c:888
+#: ../shell/e-shell-window-commands.c:889
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: ../shell/e-shell-window-commands.c:901 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: ../shell/e-shell-window-commands.c:914
+#: ../shell/e-shell-window-commands.c:915
 msgid "Work Offline"
 msgstr "Siirdumine võrguvabasse olekusse"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
 "klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:392
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub võrguvabasse olekusse."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution on hetkel võrguvabas olekus. Võrku ühendumiseks klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:825
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
 
 #: ../shell/e-shell.c:640
-msgid "Uknown system error."
+msgid "Unknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1275 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "Olgu"
 
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: ../shell/e-shell.c:1279
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "OAF'i pole võimalik registreerida"
 
-#: ../shell/e-shell.c:1281
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
@@ -18719,7 +19145,7 @@ msgstr ""
 "importid aväliseid faile Evolutioni keskkonda."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:228
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18756,7 +19182,7 @@ msgstr ""
 "Me loodame, et võid meie töö ja vaevaga valminud programmist\n"
 "rõõmu tunda ja me ootame programmi kohta tagasisidet!\n"
 
-#: ../shell/main.c:243
+#: ../shell/main.c:252
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18764,43 +19190,65 @@ msgstr ""
 "Täname,\n"
 "Evolutioni meeskond\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:259
 msgid "Do not tell me again"
 msgstr "Enam uuesti mitte näidata"
 
-#: ../shell/main.c:456
+#: ../shell/main.c:309
+msgid "Evolution Crash Detection"
+msgstr "Evolutioni krahhituvastus"
+
+#: ../shell/main.c:311
+#, fuzzy
+msgid "Ig_nore"
+msgstr "Eira"
+
+#: ../shell/main.c:326
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:337
+#, fuzzy
+msgid "_Do not show this message again"
+msgstr "Seda teadet enam uuesti mitte näidata."
+
+#: ../shell/main.c:569
 msgid "Start Evolution activating the specified component"
 msgstr "Evolutioni käivitamine koos määratud komponendi aktiveerimisega"
 
-#: ../shell/main.c:460
+#: ../shell/main.c:573
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:576
 msgid "Forcibly shut down all Evolution components"
 msgstr "Kõigi Evolutioni komponentide töö lõpetamisele sundimine"
 
-#: ../shell/main.c:467
+#: ../shell/main.c:580
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:583
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:585
 msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
-#: ../shell/main.c:474
+#: ../shell/main.c:587
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Sõnumite, kontaktide ja ülesannete eelvaatepaani keelamine"
 
-#: ../shell/main.c:503
+#: ../shell/main.c:617
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolutioni e-posti ja isikliku teabehalduse klient"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:630
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19547,6 +19995,10 @@ msgstr "Valitud kausta ümbernimetamine"
 msgid "S_ave Address Book As VCard"
 msgstr "_Aadressiraamatu salvestamine VKaardina"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Salvesta vKaardina..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Valitud kontaktide salvestamine VKaardina."
@@ -19555,7 +20007,7 @@ msgstr "Valitud kontaktide salvestamine VKaardina."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Valitud kaustas olevate kontaktide salvestamine VKaardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
 msgid "Select All"
 msgstr "Vali kõik"
 
@@ -19630,7 +20082,7 @@ msgstr "_Tõsta kontaktid asukohta..."
 msgid "_Move Folder Contacts To"
 msgstr "_Tõsta kausta kontaktid asukohta"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "_Uus"
 
@@ -19848,7 +20300,8 @@ msgstr "Sul_ge"
 msgid "_File"
 msgstr "_Fail"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "A_bi"
 
@@ -20014,93 +20467,99 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Uute sõnumite filtreerimisreeglite loomine või muutmine"
 
 #: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr "Sõnumite allalaadimine võrguvaba režiimi jaoks"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Download messages for offline"
-msgstr "Laadi sõnumid võrguvaba režiimi jaoks alla"
-
-#: ../ui/evolution-mail-global.xml.h:9
 msgid "Download messages of accounts/folders marked for offline"
 msgstr ""
 "Sõnumite allalaadimine võrguvaba režiimi jaoks märgitud kontodele ja "
 "kaustadele"
 
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Tühjenda _prügist"
 
-#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Ka_ust"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Valitud kausta ümbertõstmine teise kausta alla"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Otsingukaustad"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "Näita sõnumi _eelvaadet"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "Sõnumi eelvaate näitamine sõnumiloendi all"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "Sõnumi eelvaate näitamine sõnumiloendi kõrval"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Sõnumi eelvaateakna näitamine"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Kaugserveris olevate kaustade tellimine või tellimusest loobumine"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Silumiskonsoolilt logiteadete vaatamine"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Klassikaline vaade"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Kopeeri kaustad asukohta..."
 
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "Veebilo_gi:"
+
 #: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Download Messages for Offline Usage"
+msgstr "Sõnumite allalaadimine võrguvaba režiimi jaoks"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "Sõnumif_iltrid"
 
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "_Tõsta kaustad asukohta..."
 
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Uus..."
 
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_Eelvaade"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:30
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "_Tellimused"
 
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "_Vertikaalne vaade"
 
@@ -20164,80 +20623,84 @@ msgid "Mar_k All Messages as Read"
 msgstr "Märgi sõnumid _loetuks"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "Kõigi selles kaustas olevate sõnumite märkimine loetuks"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab sõnumid lõikepuhvrist"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
+msgstr "Kõigi selles kaustas olevate sõnumite lõplik eemaldamine"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "Kausta lõplik eemaldamine"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
 msgstr "_Värskenda..."
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Kausta värskendamine"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
 #, fuzzy
 msgid "Select Message S_ubthread"
 msgstr "Vali sõnumi _lõim"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "Vali sõnumi _lõim"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Vali _kõik sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Kõibi hetkel valimata sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valitud sõnumiga samas lõimes olevate sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "Select all replies to the currently selected message"
 msgstr "Valitud sõnumiga samas lõimes olevate sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Kõigi peitmata sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "_Näita peidetud sõnumeid"
 
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Ajutiselt peidetud sõnumite peidust väljatoomine"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Kõigi loetud sõnumite ajutine peitmine"
 
-#: ../ui/evolution-mail-list.xml.h:32
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Valitud sõnumite ajutine peitmine"
 
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Sõnumite esitamine jutulõngadena"
 
-#: ../ui/evolution-mail-list.xml.h:35
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "_Grupeeri lõimedena"
 
-#: ../ui/evolution-mail-list.xml.h:36 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Sõnum"
@@ -20669,23 +21132,28 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsitaadina"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "_Loetud"
+
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Save Message..."
 msgstr "_Salvesta sõnum..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete Message"
 msgstr "_Tühista kustutus"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Unread"
 msgstr "Lu_gemata"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom"
 msgstr "_Suurendus"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
@@ -21119,8 +21587,8 @@ msgid "I_mport..."
 msgstr "_Impordi..."
 
 #: ../ui/evolution.xml.h:15
-msgid "Icons _and text"
-msgstr "_Ikoonid ja tekst"
+msgid "Icons _and Text"
+msgstr "Ikoonid j_a tekst"
 
 #: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
@@ -21136,7 +21604,7 @@ msgstr "Uus _aken"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
+msgstr "Korduma Kippuvate Küsimuste veebilehe avamine"
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
@@ -21195,7 +21663,8 @@ msgid "Toggle whether we are working offline."
 msgstr "Võrguvaba oleku sisse- või väljalülitamine"
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
+#, fuzzy
+msgid "Tool_bar Style"
 msgstr "Tööriistariba _stiil"
 
 #: ../ui/evolution.xml.h:37
@@ -21218,35 +21687,39 @@ msgstr "_Sulge aken"
 msgid "_Forget Passwords"
 msgstr "Unusta _paroolid"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "_Peida nupud"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "_Korduma kippuvad küsimused"
 
 #: ../ui/evolution.xml.h:46
-msgid "_Icons only"
+msgid "_Hide Buttons"
+msgstr "_Peida nupud"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
 msgstr "Ainult _ikoonid"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "Välk_juhend"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "Ümber_lülitaja välimus"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "_Sünkroniseerimisvalikud..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
 msgstr "Ainult _tekst"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "_Aken"
 
@@ -21460,17 +21933,17 @@ msgstr "Vaate liik"
 msgid "Type of view:"
 msgstr "Vaate liik:"
 
-#: ../widgets/misc/e-attachment-bar.c:1029
+#: ../widgets/misc/e-attachment-bar.c:1028
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
+#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
+#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
@@ -21491,15 +21964,9 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovitan manust automaatselt kuvada"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "ETKNRLP"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1724
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21508,23 +21975,23 @@ msgid "Month Calendar"
 msgstr "Kuu kalender"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3635
-#: ../widgets/text/e-text.c:3636
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
 msgid "Fill color"
 msgstr "Täitevärvus"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "GDK fill color"
 msgstr "GDK täitevärvus"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
 msgid "Fill stipple"
 msgstr "Täpiline täide"
 
@@ -21551,14 +22018,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
 #: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Vähim laius"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Vähim laius"
 
@@ -21677,39 +22144,35 @@ msgstr "Muu..."
 msgid "Ch_aracter Encoding"
 msgstr "K_ooditabel"
 
-#: ../widgets/misc/e-dateedit.c:322
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "Kuupäev ja aeg"
 
-#: ../widgets/misc/e-dateedit.c:343
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "Tekstiväli kuupäeva sisestamiseks"
 
-#: ../widgets/misc/e-dateedit.c:365
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "Kalendri näitamiseks klõpsa sellel nupul"
 
-#: ../widgets/misc/e-dateedit.c:407
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "Valikukast aja valimiseks"
 
-#: ../widgets/misc/e-dateedit.c:408
-msgid "Time"
-msgstr "Aeg"
-
-#: ../widgets/misc/e-dateedit.c:482
+#: ../widgets/misc/e-dateedit.c:484
 msgid "No_w"
 msgstr "_Praegu"
 
-#: ../widgets/misc/e-dateedit.c:488
+#: ../widgets/misc/e-dateedit.c:490
 msgid "_Today"
 msgstr "_Täna"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1655
 msgid "Invalid Date Value"
 msgstr "Vigane kuupäeva väärtus"
 
-#: ../widgets/misc/e-dateedit.c:1667
+#: ../widgets/misc/e-dateedit.c:1684
 msgid "Invalid Time Value"
 msgstr "Vigane aja väärtus"
 
@@ -21749,11 +22212,11 @@ msgstr "Sildividin"
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
@@ -21766,53 +22229,53 @@ msgid "Spacing around expander arrow"
 msgstr "Ruum laiendaja noole ümber"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "_Otsingud"
 
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "Otsingud"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "_Laiendatud otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "Kõigist kontodest"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "Käesolevast kontost"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "Käesolevast kaustast"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "Käesolevast sõnumist"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "Vali pilt"
 
@@ -21852,54 +22315,53 @@ msgstr ""
 msgid "Column width"
 msgstr "Veeru laius"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
 #, fuzzy
 msgid "Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
 msgid "Click here to change the search type"
-msgstr "Faili manustamine"
+msgstr "Otsinguliigi muutmiseks klõpsa siia"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
-#: ../widgets/text/e-text.c:3558
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
 msgid "Text"
 msgstr "Tekst"
 
 #. 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:1010
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "_Kategooria: "
 
 #. 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:1027
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "Ot_sing: "
 
 #. 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:1039
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr ""
 
@@ -22058,14 +22520,14 @@ msgid "_When opened:"
 msgstr "Kui _avatakse:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:297
 #, 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:219
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
@@ -22098,35 +22560,35 @@ msgstr "hüpikakende loend"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Valitud veerg"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Fokusseeritud veerg"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Valimata veerg"
 
-#: ../widgets/table/e-cell-text.c:1804
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Läbikriipsutatud veerg"
 
-#: ../widgets/table/e-cell-text.c:1811
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Allajoonitud veerg"
 
-#: ../widgets/table/e-cell-text.c:1818
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Rasvane veerg"
 
-#: ../widgets/table/e-cell-text.c:1825
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Värviline veerg"
 
-#: ../widgets/table/e-cell-text.c:1839
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Taustavärviga veerg"
 
@@ -22151,7 +22613,7 @@ msgid "No grouping"
 msgstr "Rühmitus puudub"
 
 #: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Näidatavad väljad"
 
@@ -22173,51 +22635,72 @@ msgid "Clear All"
 msgstr "Puhasta kõik"
 
 #: ../widgets/table/e-table-config.glade.h:4
+#, fuzzy
+msgid "Clear _All"
+msgstr "Puhasta kõik"
+
+#: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Kahanevas järjestuses"
 
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Kirjete grupeerimine"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Liiguta _alla"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Liiguta ü_les"
 
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
 msgstr "Väljade näitamine vaates"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "Väljade näitamine vaates"
+
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
+msgstr "Väljade näitamine vaates"
+
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Sordi"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Kirjete sortimine"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "järgmine sortimisväli"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "_Näidatavad väljad..."
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
 msgstr "_Grupeerimine..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Väljade näitamine vaates"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "_Näita neid välju järjestuses:"
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "_Sortimine..."
 
@@ -22269,7 +22752,7 @@ msgstr[1] "%s (%d kirjet)"
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Reavärvuste asendamine"
 
@@ -22277,8 +22760,8 @@ msgstr "Reavärvuste asendamine"
 #: ../widgets/table/e-table-group-container.c:904
 #: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
 msgid "Horizontal Draw Grid"
 msgstr ""
 
@@ -22286,8 +22769,8 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
 msgid "Vertical Draw Grid"
 msgstr ""
 
@@ -22295,8 +22778,8 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:918
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
 msgid "Draw focus"
 msgstr ""
 
@@ -22304,7 +22787,7 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Kursorirežiim"
 
@@ -22312,7 +22795,7 @@ msgstr "Kursorirežiim"
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Valikumudel"
 
@@ -22320,9 +22803,9 @@ msgstr "Valikumudel"
 #: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
-#: ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
 msgid "Length Threshold"
 msgstr "Pikkuse lävi"
 
@@ -22330,9 +22813,9 @@ msgstr "Pikkuse lävi"
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
 msgid "Uniform row height"
 msgstr ""
 
@@ -22392,9 +22875,15 @@ msgid "Custo_mize Current View..."
 msgstr "Kohanda käesolevat _vaadet..."
 
 #: ../widgets/table/e-table-header-item.c:1542
-msgid "Sort By"
+#, fuzzy
+msgid "_Sort By"
 msgstr "Sortimine"
 
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "_Kohandatud"
+
 #: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Kirjatüübi kirjeldus"
@@ -22410,20 +22899,20 @@ msgstr "Sortimisandmed"
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Tabeli päis"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Tabeli mudel"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Kursori rida"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
 msgid "Always search"
 msgstr ""
 
@@ -22431,122 +22920,196 @@ msgstr ""
 msgid "Use click to add"
 msgstr "Klõpsa lisamiseks"
 
-#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3349
 msgid "Retro Look"
 msgstr "Retrovälimus"
 
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3350
 msgid "Draw lines and +/- expanders."
 msgstr ""
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2734
 msgid "Input Methods"
 msgstr "Sisestusmeetodid"
 
-#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
 msgid "Event Processor"
 msgstr "Sündmusteprotsessor"
 
-#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
 msgid "Strikeout"
 msgstr "Läbikriipsutatud"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
 msgid "Anchor"
 msgstr "Ankur"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
 msgid "Justification"
 msgstr "Joondamine"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
 msgid "Clip Width"
 msgstr "Klambri laius"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
 msgid "Clip Height"
 msgstr "Klambri kõrgus"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Clip"
 msgstr "Klamber"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "X Offset"
 msgstr "X-nihe"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Y Offset"
 msgstr "Y-nihe"
 
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Text width"
 msgstr "Teksti laius"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Text height"
 msgstr "Teksti kõrgus"
 
-#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
 msgid "Use ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
 msgid "Ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
 msgid "Line wrap"
 msgstr "Reamurdmine"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
 msgid "Break characters"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
 msgid "Max lines"
 msgstr "Suurim ridade arv"
 
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
 msgid "Draw borders"
 msgstr "Piirjoonte näitamine"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
 msgid "Allow newlines"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
 msgid "Draw background"
 msgstr "Tausta joonistamine"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
 msgid "Draw button"
 msgstr "Nupu joonistamine"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
 msgid "Cursor position"
 msgstr "Kursori asukoht"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
 msgid "IM Context"
 msgstr "Välksõnumikontekst"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "_Categories..."
+#~ msgstr "Kate_gooriad..."
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "Add an email to the List"
+#~ msgstr "Lisa sõnum loendisse"
+
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "Aadressiraamatust e-posti aadressi lisamine"
+
+#~ msgid "Members"
+#~ msgstr "Liikmed"
+
+#~ msgid "Remove an email address from the List"
+#~ msgstr "Eemaldab e-postiaadressi loendist"
+
+#~ msgid "_Select"
+#~ msgstr "_Vali"
+
+#~ msgid "SMTWTFS"
+#~ msgstr "PETKNRL"
+
+#~ msgid "_Search name:"
+#~ msgstr "Otsingu_põhi:"
+
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "Helifail uutest sõnumitest teatamiseks"
+
+#~ msgid "New Mail Notify type"
+#~ msgstr "Uuest sõnumist teatamise tüüp"
+
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr "Kasutaja poolt valitud teavitamise liik uutele sõnumitele."
+
+#~ msgid "Se_lect..."
+#~ msgstr "V_ali..."
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Mustandite kausta valimine"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Saadetud sõnumite kausta valimine"
+
+#~ msgid "Attachment Reminder Preferences"
+#~ msgstr "Manuste meeldetuletaja eelistused"
+
+#~ msgid "_Contacts..."
+#~ msgstr "_Kontaktid..."
+
+#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
+#~ msgstr "Teavitusakna avamine iga uue sõnumi saabumisel."
+
+#~ msgid "Make the status icon blink"
+#~ msgstr "Olekuikooni vilgutamine"
+
+#~ msgid "When the new-mail status icon is visible, make it blink."
+#~ msgstr ""
+#~ "Uute sõnumite olekuikooni vilgutamine iga uue sõnumi saabumisel (kui "
+#~ "ikoon on nähtaval)."
+
+#~ msgid "New Mail Notification"
+#~ msgstr "Uuest sõnumist teavitamine"
+
+#~ msgid "Con_figure"
+#~ msgstr "_Seadista"
+
+#~ msgid "Download messages for offline"
+#~ msgstr "Laadi sõnumid võrguvaba režiimi jaoks alla"
+
+#~ msgid "MTWTFSS"
+#~ msgstr "ETKNRLP"
+
 #~ msgid "Or_ganiser:"
 #~ msgstr "Ko_rraldaja:"
 
@@ -22556,18 +23119,6 @@ msgstr ""
 #~ msgid "Memo sort"
 #~ msgstr "Märkmete sortimine"
 
-#~ msgid "Posting destination"
-#~ msgstr "Postituse sihtkoht"
-
-#~ msgid "Choose folders to post the message to."
-#~ msgstr "Vali kaust, kuhu sõnum postitada."
-
-#~ msgid "Click here for the address book"
-#~ msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
-
-#~ msgid "Click here to select folders to post to"
-#~ msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
-
 #~ msgid "Post To:"
 #~ msgstr "Kuhu postitada:"
 
@@ -22587,9 +23138,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Vali PNG-pilt mõõtmetega 48x48 ja suurusega mitte rohkem kui 720 baiti"
 
-#~ msgid "Custom Header"
-#~ msgstr "Kohandatud päis"
-
 #~ msgid "System error: %s"
 #~ msgstr "Süsteemi viga: %s"
author	Priit Laes <plaes at svn dot gnome dot org>	2008-02-23 16:29:21 +0800
committer	Priit Laes <plaes@src.gnome.org>	2008-02-23 16:29:21 +0800
commit	9ee6e160a8bc34b70015dfd517176707eff1dd33 (patch)
tree	c9aba17a195637147b20f7b7849c2e3abaf4d886 /po/et.po
parent	60f931b4065355b2df86ef63200e594cb061caf6 (diff)
download	gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.tar.gz gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.tar.zst gsoc2013-evolution-9ee6e160a8bc34b70015dfd517176707eff1dd33.zip