Translation updated.

2005-01-07 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated. svn path=/trunk/; revision=28269
author: Priit Laes <plaes@cvs.gnome.org> 2005-01-07 21:04:59 +0800
committer: Priit Laes <plaes@src.gnome.org> 2005-01-07 21:04:59 +0800
commit: 3189458511655d73566b9eaf698dbbae8be02f2a (patch)
tree: 9326f9b0e32a784c942c3e4dbe66ef1176290f8e /po/et.po
parent: cf5a35e070ec5a390b46cb475dbbd147925a82f0 (diff)
download: gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.gz
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.bz2
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.lz
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.xz
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.zst
gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.zip
1 files changed, 6356 insertions, 5461 deletions
diff --git a/po/et.po b/po/et.po
index f1ecd974ce..632aa58935 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,8 +2,8 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Ilmar Kerm <ikerm@hot.ee>, 2001
 # Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005
-# Kaarel Jogi <kaarel@gg.ee>, 2002
-# Priit Laes <amd@tt.ee>, 2003, 2004
+# Kaarel Jõgi <kaarel@gg.ee>, 2002
+# Priit Laes <amd@tt.ee>, 2003, 2004, 2005
 #
 # Riigi- ja linnanimed: Marek Sepp <marek.sepp@ttu.ee>, 2001, 2002
 #
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: Evolution 2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-08-13 14:55-0400\n"
-"PO-Revision-Date: 2005-01-06 16:04+0200\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"PO-Revision-Date: 2005-01-07 14:50+0300\n"
+"Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,37 +22,268 @@ msgstr ""
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:119
+#: a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
-#: a11y/addressbook/ea-minicard-view.c:101
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Ava"
+
+#: a11y/addressbook/ea-minicard.c:138
+#, fuzzy
+msgid "Contact List: "
+msgstr "Kontaktide _nimekiri"
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "Kontakt:"
+
+#: a11y/addressbook/ea-minicard.c:165
+msgid "evolution minicard"
+msgstr "evolutioni minikaart"
+
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:97
+msgid "New Contact"
+msgstr "Uus kontakt"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:105
+msgid "New Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "aktiivne aadressiraamatu kaust"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "omab"
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "omab"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr " kaarti"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr " kaart"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontakti päis:"
+#: a11y/calendar/ea-cal-view.c:306
+msgid "New Appointment"
+msgstr "Uus sündmus"
 
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolutioni minikaart"
+#: a11y/calendar/ea-cal-view.c:307
+msgid "New All Day Event"
+msgstr "Uus kogu päeva hõlmav sündmus"
+
+#: a11y/calendar/ea-cal-view.c:308
+#: calendar/gui/e-calendar-view.c:1366
+msgid "New Meeting"
+msgstr "Uus koosolek"
+
+#: a11y/calendar/ea-cal-view.c:309
+msgid "Go to Today"
+msgstr "Mine tänasele päevale"
+
+#: a11y/calendar/ea-cal-view.c:310
+msgid "Go to Date"
+msgstr "Mine kuupäevale"
+
+#: a11y/calendar/ea-cal-view-event.c:235
+#, fuzzy
+msgid "alarm "
+msgstr "_Alarm"
+
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "recurrence "
+msgstr "kordumine"
+
+#: a11y/calendar/ea-cal-view-event.c:247
+msgid "time-zone "
+msgstr "ajavöönd"
+
+#: a11y/calendar/ea-cal-view-event.c:253
+msgid "meeting "
+msgstr "koosolek"
+
+#: a11y/calendar/ea-cal-view-event.c:258
+msgid "event. Summary is "
+msgstr ""
+
+#: a11y/calendar/ea-cal-view-event.c:269
+#, fuzzy
+msgid "empty"
+msgstr "Vasta"
+
+#: a11y/calendar/ea-cal-view-event.c:288
+#, fuzzy
+msgid "calendar view event"
+msgstr "Kalendrisündmused"
+
+#: a11y/calendar/ea-cal-view-event.c:505
+#, fuzzy
+msgid "Grab Focus"
+msgstr "Fookuse käitumine"
+
+#: a11y/calendar/ea-day-view.c:147
+#: a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d event"
+msgstr ", %d sündmus"
+
+#: a11y/calendar/ea-day-view.c:147
+#: a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d events"
+msgstr ", %d sündmust"
+
+#: a11y/calendar/ea-day-view.c:150
+#, fuzzy
+msgid "work week view :"
+msgstr "Töönädala vaade"
+
+#: a11y/calendar/ea-day-view.c:154
+#, fuzzy
+msgid "day view :"
+msgstr "Päeva vaade"
+
+#: a11y/calendar/ea-day-view.c:181
+#, fuzzy
+msgid "calendar view for a work week"
+msgstr "kalendri informatsioon"
+
+#: a11y/calendar/ea-day-view.c:183
+msgid "calendar view for one or more days"
+msgstr ""
+
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+#, fuzzy
+msgid "a table to view and select the current time range"
+msgstr "ajaga, mis on suhteline käesoleva hetkega"
+
+#: a11y/calendar/ea-gnome-calendar.c:187
+#: calendar/gui/calendar-component.c:519
+#, fuzzy
+msgid "%A %d %b %Y"
+msgstr "%a, %d. %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#: a11y/calendar/ea-gnome-calendar.c:190
+#: calendar/gui/calendar-component.c:522
+#: calendar/gui/e-day-view.c:1508
+#: calendar/gui/e-day-view-top-item.c:708
+#: calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%a, %d. %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:192
+#: a11y/calendar/ea-gnome-calendar.c:197
+#: a11y/calendar/ea-gnome-calendar.c:199
+#: calendar/gui/calendar-component.c:524
+#: calendar/gui/calendar-component.c:529
+#: calendar/gui/calendar-component.c:531
+msgid "%a %d %b %Y"
+msgstr "%a, %d. %b %Y"
+
+#: a11y/calendar/ea-gnome-calendar.c:216
+#: a11y/calendar/ea-gnome-calendar.c:222
+#: a11y/calendar/ea-gnome-calendar.c:228
+#: a11y/calendar/ea-gnome-calendar.c:230
+#: calendar/gui/calendar-component.c:543
+#: calendar/gui/calendar-component.c:550
+#: calendar/gui/calendar-component.c:556
+#: calendar/gui/calendar-component.c:558
+#, fuzzy
+msgid "%d %b %Y"
+msgstr "%d. %B %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#: a11y/calendar/ea-gnome-calendar.c:220
+#: calendar/gui/calendar-component.c:548
+#: calendar/gui/e-day-view.c:1524
+#: calendar/gui/e-day-view-top-item.c:712
+#: calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%d. %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:247
+#: a11y/calendar/ea-gnome-calendar.c:255
+#: calendar/importers/icalendar-importer.c:734
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: a11y/calendar/ea-gnome-calendar.c:290
+#, fuzzy
+msgid "search bar"
+msgstr "_Otsingu baas:"
+
+#: a11y/calendar/ea-gnome-calendar.c:291
+#, fuzzy
+msgid "evolution calendar search bar"
+msgstr "Evolutioni kalender ja ülesanded"
+
+#: a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr ""
+
+#: a11y/calendar/ea-jump-button.c:158
+#, fuzzy
+msgid "Click here, you can find more events."
+msgstr "Osavõtja lisamiseks vajuta siia"
+
+#: a11y/calendar/ea-week-view.c:153
+#, fuzzy
+msgid "month view :"
+msgstr "Kuu vaade"
+
+#: a11y/calendar/ea-week-view.c:158
+#, fuzzy
+msgid "week view :"
+msgstr "Nädala vaade"
+
+#: a11y/calendar/ea-week-view.c:185
+#, fuzzy
+msgid "calendar view for a month"
+msgstr "kalendri informatsioon"
+
+#: a11y/calendar/ea-week-view.c:187
+msgid "calendar view for one or more weeks"
+msgstr ""
+
+#: a11y/widgets/ea-calendar-item.c:293
+#: a11y/widgets/ea-calendar-item.c:299
+#, fuzzy
+msgid " %d %B %Y"
+msgstr "%d. %B %Y"
+
+#: a11y/widgets/ea-calendar-item.c:301
+#, fuzzy
+msgid "calendar (from "
+msgstr "Kalendri grupp"
+
+#: a11y/widgets/ea-calendar-item.c:303
+#: calendar/gui/dialogs/comp-editor-util.c:187
+#: calendar/gui/print.c:2261
+msgid " to "
+msgstr " kuni "
+
+#: a11y/widgets/ea-calendar-item.c:305
+msgid ")"
+msgstr ")"
+
+# !PARANDA!
+#: a11y/widgets/ea-calendar-item.c:337
+#, fuzzy
+msgid "evolution calendar item"
+msgstr "Evolution'i vKalendri importija"
 
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
@@ -61,9 +292,7 @@ msgstr "Seda aadressisaamatud pole võimalik avada."
 
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
-msgid ""
-"This addressbook server might unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr ""
 
 #. addressbook:ldap-auth primary
@@ -79,13 +308,8 @@ msgstr ""
 #. addressbook:ldap-auth secondary
 #: addressbook/addressbook-errors.xml.h:8
 #, fuzzy
-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; "
-"your caps lock might be on."
-msgstr ""
-"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
-"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+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; your caps lock might be on."
+msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #. addressbook:ldap-search-base primary
 #: addressbook/addressbook-errors.xml.h:10
@@ -94,10 +318,7 @@ msgstr ""
 
 #. addressbook:ldap-search-base secondary
 #: addressbook/addressbook-errors.xml.h:12
-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 "
-"supported search bases."
+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 supported search bases."
 msgstr ""
 
 #. addressbook:ldap-v3-schema primary
@@ -123,258 +344,273 @@ msgstr ""
 msgid "Could not remove addressbook."
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#. addressbook:remove-addressbook secondary
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
+#. addressbook:ask-delete-addressbook primary
 #: addressbook/addressbook-errors.xml.h:22
-#: addressbook/addressbook-errors.xml.h:26
-#: addressbook/addressbook-errors.xml.h:34
-#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
+#, fuzzy
+msgid "Delete address book '{0}'?"
+msgstr "Vali sihtaadressiraamat."
 
-#. addressbook:edit-categories primary
+#. addressbook:ask-delete-addressbook secondary
 #: addressbook/addressbook-errors.xml.h:24
 #, fuzzy
+msgid "This address book will be removed permanently."
+msgstr "Seda aadressisaamatud pole võimalik avada."
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
+#, fuzzy
 msgid "Category editor not available."
 msgstr "Kirjeldus puudub."
 
-#. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
+#. addressbook:generic-error primary
+#. mail:session-message-error-cancel secondary
 #: addressbook/addressbook-errors.xml.h:28
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40
+#: mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:4
+#: mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:32
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:32
+#: addressbook/addressbook-errors.xml.h:34
 #, fuzzy
 msgid "Error loading addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:38
 #, fuzzy
 msgid "Unable to perform search."
 msgstr "Puhverkausta pole võimalik töödelda"
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:42
 #, fuzzy
 msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:42
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+#: addressbook/addressbook-errors.xml.h:44
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr ""
 
-#: addressbook/addressbook-errors.xml.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Unusta"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:47
 #, fuzzy
 msgid "Cannot move contact."
 msgstr "Konto muudatusi ei saa salvestada."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:47
-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?"
+#: addressbook/addressbook-errors.xml.h:49
+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?"
 msgstr ""
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:51
 #, fuzzy
 msgid "Unable to save contact(s)."
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:53
 #, fuzzy
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Viga kontakti lisamisel"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:55
 #, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolutioni aadressiraamatu aadressikuva"
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:55
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: addressbook/addressbook-errors.xml.h:57
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:59
+#, fuzzy
+msgid "Address '{0}' already exists."
+msgstr "Kaust juba eksisteerib"
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:61
+#, fuzzy
+msgid "A contact already exists with this address.  Would you like to add a new card with the same address anyway?"
+msgstr ""
+"Selle kontakti nimi või e-posti aadress juba eksisteerib\n"
+"antud kaustas. Kas sa soovid seda ikka lisada?"
+
+#: addressbook/addressbook-errors.xml.h:62
+#: mail/em-vfolder-rule.c:494
+#: plugins/shared-folder/properties.glade.h:17
+msgid "_Add"
+msgstr "_Lisa"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F2"
-msgstr "Vahemälu-kontroll:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Automaatne lõpetamine"
-
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontaktid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikaadid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Seadista automaatlõpetamist siit"
-
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1104
-#: calendar/gui/migration.c:377
-msgid "Contacts"
-msgstr "Kontaktid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution'i aadressiraamat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolutioni aadressiraamatu aadressikuva"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolutioni aadressiraamatu kaardikuva"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Siin saad hallata oma S/MIME sertifikaate"
+#: addressbook/gui/component/addressbook.c:185
+#: camel/providers/groupwise/camel-gw-listener.c:494
+#: plugins/groupwise-account-setup/camel-gw-listener.c:494
+msgid "Failed to authenticate.\n"
+msgstr "Autentimine ebaõnnestus.\n"
 
-#: addressbook/gui/component/addressbook-component.c:93
-msgid "New Contact"
-msgstr "Uus kontakt"
+#: addressbook/gui/component/addressbook.c:192
+#: camel/providers/groupwise/camel-gw-listener.c:483
+#: plugins/groupwise-account-setup/camel-gw-listener.c:483
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook-component.c:94
+#: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:95
+#: addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Loo uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:101
-msgid "New Contact List"
-msgstr "Uus kontaktide nimekiri"
-
-#: addressbook/gui/component/addressbook-component.c:102
+#: addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:103
+#: addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Loo uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:773
+#: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1116
+#: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:110
+#: addressbook/gui/component/addressbook-component.c:114
 #, fuzzy
 msgid "Address _Book"
 msgstr "_Aadressiraamat:"
 
-#: addressbook/gui/component/addressbook-component.c:111
+#: addressbook/gui/component/addressbook-component.c:115
 #, fuzzy
 msgid "Create a new address book"
 msgstr "Lisab uue ülesande"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.c:315
+#, fuzzy
+msgid "Base"
+msgstr "Aseta"
+
+#: addressbook/gui/component/addressbook-config.c:510
+#: calendar/gui/dialogs/calendar-setup.c:191
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tüüp:"
+
+#: addressbook/gui/component/addressbook-config.c:609
+msgid "Copy book content locally for offline operation"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:904
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.c:361
+#: calendar/gui/dialogs/calendar-setup.c:372
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: mail/em-folder-properties.c:213
+#: mail/mail-config.glade.h:85
+#: smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "Üldine"
+
+#: addressbook/gui/component/addressbook-config.c:905
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/component/addressbook-config.c:909
+#, fuzzy
+msgid "Server Information"
+msgstr "<b>Serveri info</b>"
+
+#: addressbook/gui/component/addressbook-config.c:911
+#, fuzzy
+msgid "Authentication"
+msgstr "SMTP autentimine"
+
+#: addressbook/gui/component/addressbook-config.c:914
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:12
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Täpsustused"
+
+#: addressbook/gui/component/addressbook-config.c:915
+#, fuzzy
+msgid "Searching"
+msgstr "Jaotus"
+
+#: addressbook/gui/component/addressbook-config.c:917
+#, fuzzy
+msgid "Downloading"
+msgstr "<b>Allalaadimine</b>"
+
+#: addressbook/gui/component/addressbook-config.c:1114
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Address Book Properties"
+msgstr "Aadressiraamatu omadused"
+
 #: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
+#: calendar/gui/migration.c:141
+#: mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
+#: calendar/gui/migration.c:188
+#: mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -388,11 +624,13 @@ msgstr "Siirdamine `%s':"
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: calendar/gui/migration.c:451
+#: calendar/gui/migration.c:544
+#: mail/em-folder-tree-model.c:196
+#: mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:270
+#: mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -403,14 +641,14 @@ msgstr "Kohalik arvuti"
 #  Create the default Person task list
 #  orange
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:109
+#: calendar/gui/migration.c:459
+#: calendar/gui/migration.c:552
+#: filter/filter-label.c:123
+#: mail/em-migrate.c:1013
+#: mail/mail-config.c:78
+#: mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Isiklik"
 
@@ -430,13 +668,11 @@ msgstr "Automaatlõpetamise sätted"
 
 #: addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -467,63 +703,142 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:671
-#, fuzzy, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
-
-#: addressbook/gui/component/addressbook-view.c:774
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: addressbook/gui/component/addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-view.c:934
+#: calendar/gui/calendar-component.c:385
+#: calendar/gui/tasks-component.c:330
+#: mail/em-filter-i18n.h:11
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-view.c:775
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:760
+#: calendar/gui/calendar-component.c:386
+#: calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
-
-#: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
-msgid "Failed to authenticate.\n"
-msgstr "Autentimine ebaõnnestus.\n"
-
-#: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1118
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: calendar/gui/migration.c:377
+msgid "Contacts"
+msgstr "Kontaktid"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList xml for the list of completion uris"
+msgid "EFolderList XML for the list of completion URIs"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-msgid "Position of the vertical pane in main view"
-msgstr "Vertikaalpaani asukoht põhivaates"
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid ""
-"The number of characters that must be typed before evolution will attempt to "
-"autocomplete"
-msgstr ""
-"Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+msgid "Position of the vertical pane in main view"
+msgstr "Vertikaalpaani asukoht põhivaates"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#, fuzzy
+msgid "Position of the vertical pane in main view."
+msgstr "Vertikaalpaani asukoht põhivaates"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Show the \"Preview\" pane"
+msgstr "\"Eelvaatlus\" paani kuvamine"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
+msgstr "\"Eelvaatlus\" paani kuvamine."
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#, fuzzy
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete"
+msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#, fuzzy
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Automaatne lõpetamine"
+
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "K_ontaktid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Sertifikaadid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Seadista automaatlõpetamist siit"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook"
+msgstr "Evolution'i aadressiraamat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolutioni aadressiraamatu aadressikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolutioni aadressiraamatu kaardikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Siin saad hallata oma S/MIME sertifikaate"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
@@ -537,8 +852,11 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1
+#: mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6
+#: mail/message-tags.glade.h:1
+#: plugins/shared-folder/properties.glade.h:3
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -596,12 +914,8 @@ msgstr "<b>Tüüp:</b>"
 msgid "Add Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Address Book Properties"
-msgstr "Aadressiraamatu omadused"
-
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/em-account-editor.c:292
 msgid "Always"
 msgstr "Alati"
 
@@ -613,11 +927,6 @@ msgstr "Anonüümselt"
 msgid "Basic"
 msgstr "Peamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Täpsustused"
-
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
@@ -629,28 +938,20 @@ msgstr "E-posti aadress:"
 # !PARANDA! - sõnasus on kuidagi mäda
 #: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
-msgid "General"
-msgstr "Üldine"
-
 #: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Lo_gin:"
 msgstr "Kasutajanimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/em-account-editor.c:290
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -665,38 +966,25 @@ msgstr "_Otsingu baas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
 msgstr ""
-"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
-"siis\n"
+"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult siis\n"
 "kui LDAP server toetab SSL või TLS protokolli."
 
 #: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
-msgstr ""
-"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
-"ainult siis kui sa oled\n"
-"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad "
-"mõlemad tulemüüri taga,\n"
+msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
+msgstr ""
+"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled\n"
+"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüri taga,\n"
 "siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus\n"
 "on juba turvaline."
 
 #: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
 msgstr ""
-"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. "
-"Seega\n"
+"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. Seega\n"
 "on sinu ühendus ebaturvaline ja sa võid olla turvaaukude\n"
 "tõttu ohus."
 
@@ -710,54 +998,33 @@ msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:36
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
-"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
-"toetama anonüümset ligipääsu."
+#, fuzzy
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 msgstr ""
 "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. \n"
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
@@ -771,8 +1038,8 @@ msgstr "Eraldusnime (DN) kasutamine"
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:156
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
@@ -795,7 +1062,9 @@ msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.c:243
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+#: mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -826,91 +1095,15 @@ msgid "cards"
 msgstr "kaardid"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: filter/filter.glade.h:16
+#: mail/em-account-editor.c:1816
+#: plugins/calendar-http/calendar-http.c:263
 msgid "minutes"
 msgstr "minutit"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eemalda kõik"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
-msgid "Remove"
-msgstr "Eemalda"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact List"
-msgstr "Kuva Kontaktiloend"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact Info"
-msgstr "Kuva kontakti info"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:229
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-msgid "Send HTML Mail?"
-msgstr "Saata HTML sõnum?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
-msgid "Add to Contacts"
-msgstr "Lisa kontaktide hulka"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:348
-msgid "Unnamed Contact"
-msgstr "Nimetu kontakt"
-
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nimi"
-
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
-#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:228
-msgid "Source"
-msgstr "Allikas"
-
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Kontaktide valimine aadressiraamatust"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Kontaktid</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Kontaktide kuvamine</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Address _Book:"
-msgstr "_Aadressiraamat:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "C_ategory:"
-msgstr "Kate_gooria:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Find"
-msgstr "_Otsi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "_Search:"
-msgstr "_Otsing"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -955,7 +1148,7 @@ msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
@@ -989,14 +1182,14 @@ msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:533
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1091,10 +1284,12 @@ msgstr "Logi välja"
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: filter/filter-label.c:122
+#: mail/em-migrate.c:1012
+#: mail/mail-config.c:77
+#: mail/mail-config.glade.h:147
 msgid "Work"
 msgstr "Töö"
 
@@ -1111,27 +1306,43 @@ msgid "_File under:"
 msgstr "_Salvesta kui:"
 
 #: 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:13
 msgid "_Where:"
 msgstr "_Kus:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:352
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:498
-#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigeeritav"
 
@@ -1872,7 +2083,8 @@ msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Vincent And The Grena-dines"
+#, fuzzy
+msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
@@ -2103,65 +2315,43 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL kiirsuhtlusklient"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Kiirsuhtlusklient"
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Teenus"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Asukoht"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Kasutajanimi"
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "Kodu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 #: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:338
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:337
-msgid "MSN"
-msgstr "MSN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:334
-msgid "GroupWise"
-msgstr "Groupwise"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Lähteraamat"
@@ -2178,47 +2368,67 @@ msgstr "Tegemist on uue kontaktiga"
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#, fuzzy
+msgid "Required Fields"
+msgstr "_Vajalikud inimesed"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2463
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
 #  Create the selector
 #  Create the selector
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#: addressbook/gui/contact-editor/e-contact-editor.c:2556
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Kustuta valitud kontaktid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#: addressbook/gui/contact-editor/e-contact-editor.c:2557
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#: addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid ""
-"The contact cannot be saved to the selected address book. Do you want to "
-"discard changes?"
-msgstr ""
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:362
+msgid "Name"
+msgstr "Nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2822
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL kiirsuhtlusklient"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Kiirsuhtlusklient"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Teenus"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Asukoht"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Kasutajanimi"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2229,7 +2439,7 @@ msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:156
 msgid "_Full Name:"
 msgstr "_Täisnimi:"
 
@@ -2237,22 +2447,6 @@ msgstr "_Täisnimi:"
 msgid "E-_mail:"
 msgstr "E-Post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada need kontaktid?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
@@ -2380,64 +2574,59 @@ msgid "Add an email to the List"
 msgstr "Lisa kataloog nimistusse"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+msgid "Contact List Editor"
+msgstr "Kontaktiloendi redaktor"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
 msgid "Insert email adresses from Adress Book"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
 msgid "Members"
 msgstr "Liikmed"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "Remove an email address from the List"
 msgstr "Kustutab valitud proxy erandi aadressi nimekirjast."
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "Select"
 msgstr "Vali"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sellesse listi kirja saatmisel"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_List name:"
 msgstr "_Loetelu nimi:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Kirjuta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
+#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-minicard-view.c:505
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "On uus nimekiri"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Vajalikud osalejad"
-
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
-msgid "Contact List Editor"
-msgstr "Kontaktiloendi redaktor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+#, fuzzy
+msgid "Contact List Members"
+msgstr "Nimekirja liikmed"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2477,408 +2666,11 @@ msgstr ""
 "antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: addressbook/gui/search/e-addressbook-search-dialog.c:160
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Kontakte pole"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Kontakte pole"
-msgstr[1] "Kontakte pole"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:491
-msgid "Query"
-msgstr "Päring"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-#, fuzzy
-msgid "Error getting book view"
-msgstr "Viga aadressiraamatu lugemisel"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Mudel"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Viga kaardi muutmisel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-msgid "Name begins with"
-msgstr "Nimi algab stringiga"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "E-post algab stringiga"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategooria on"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Suvaline väli sisaldab"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "Edasijõudnutele..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Tüüp"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Aadressiraamat"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Salvesta vKaardina..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "New Contact..."
-msgstr "Uus kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "New Contact List..."
-msgstr "Uus kontaktide nimekiri..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "Mine kausta..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "Impordi..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "Otsi kontakte..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "Aadressiraamatu allikad..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "Pilot pihuarvuti sätted..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Edasta kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
-msgid "Send Message to Contact"
-msgstr "Saada kontaktile sõnum"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Trüki"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "Trüki ümbrik"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-msgid "Copy to Address Book..."
-msgstr "Kopeeri aadressiraamatusse..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
-msgid "Move to Address Book..."
-msgstr "Liiguta aadressiraamatusse..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Lõika"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopeeri"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Aseta"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "Käesolev vaade"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Suvaline kategooria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistendi telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Fax tööl"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Telefon tööl"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Telefon tööl 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Tagasihelistamise telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Autotelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Categories"
-msgstr "Kategooriad"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Firma telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Perekonnanimi"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Kataloogi kui"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Antud nimi"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Kodune faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Kodune telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Kodune telefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Päevik"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Juht"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:366
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Hüüdnimi"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:377
-msgid "Note"
-msgstr "Märkus"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Organization"
-msgstr "Organisatsioon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Muu faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Muu telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Piipar"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Raadio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Roll"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Abikaasa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Tiitel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Ühik"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Koduleht"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Laius"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Kõrgus"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-#, fuzzy
-msgid "Has Focus"
-msgstr "Fookuse käitumine"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Väli"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Välja nimi"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-#, fuzzy
-msgid "Text Model"
-msgstr "CPU mudel"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-#, fuzzy
-msgid "Max field name length"
-msgstr "Maks. erinevus lausepikkustes:"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Veeru laius"
-
-#: addressbook/gui/widgets/e-minicard-view.c:164
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Selles vaates kirjed puuduvad\n"
-"\n"
-"Uue kontakti lisamiseks tee siin topeltklõps."
-
-#: addressbook/gui/widgets/e-minicard-view.c:167
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Selles vaates kirjed puuduvad."
-
-#: addressbook/gui/widgets/e-minicard-view.c:477
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valitud"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Vilkuv kursor"
-
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
@@ -2889,55 +2681,76 @@ msgstr "(kaart)"
 msgid "map"
 msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
-#: addressbook/gui/widgets/eab-contact-display.c:528
+#: addressbook/gui/widgets/eab-contact-display.c:274
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: addressbook/gui/widgets/eab-contact-display.c:324
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisatsioon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Ametikoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:582
+#: addressbook/gui/widgets/eab-contact-display.c:376
+#: addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:379
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "isiklik"
 
-#: addressbook/gui/widgets/eab-contact-display.c:543
+#: addressbook/gui/widgets/eab-contact-display.c:390
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Märkus"
+
+#: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:574
+#: addressbook/gui/widgets/eab-contact-display.c:560
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Kodulehekülg"
 
@@ -2953,7 +2766,6 @@ msgstr "Õnnestus"
 #  E_BOOK_ERROR_INVALID_ARG
 #  E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
 #: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Backend busy"
@@ -2978,8 +2790,6 @@ msgid "No Self Contact defined"
 msgstr "Ühtegi valikut pole määratud"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
 #: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
@@ -3002,13 +2812,16 @@ msgstr "Mitte toetatud protokoll"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:456
-#: camel/providers/pop3/camel-pop3-store.c:537
+#: calendar/gui/e-cal-component-preview.c:232
+#: calendar/gui/e-calendar-table.c:457
+#: calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:660
+#: calendar/gui/print.c:2352
+#: camel/camel-net-utils.c:446
+#: camel/camel-net-utils.c:608
+#: camel/camel-net-utils.c:739
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -3022,6 +2835,7 @@ msgstr "Kuulamist ei õnnestunud peatada"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
@@ -3038,7 +2852,6 @@ msgstr "TLS ei ole kättesaadav"
 #  E_BOOK_ERROR_CORBA_EXCEPTION
 #  E_BOOK_ERROR_NO_SUCH_SOURCE
 #. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Sellist allikat ei ole olemas"
@@ -3048,42 +2861,28 @@ msgstr "Sellist allikat ei ole olemas"
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:91
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
+#: addressbook/gui/widgets/eab-gui-util.c:90
+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 load the addressbook once in online mode to download its contents"
 msgstr ""
-"Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja "
-"kas sul on sellele vajalikud ligipääsuõigused."
 
 #: addressbook/gui/widgets/eab-gui-util.c:98
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase "
-"URI või kasutatav LDAP serverei ole kättesaadav."
+msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
+msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
-#, fuzzy
-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 "
-"Evolution package."
-msgstr ""
-"Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid "
-"Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku "
-"kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+#: addressbook/gui/widgets/eab-gui-util.c:105
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
 
 #: addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid "
-"vale URI või kasutatav serverei ole kättesaadav."
+#, fuzzy
+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 Evolution package."
+msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+
+#: 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 server is unreachable."
+msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
 
-#: addressbook/gui/widgets/eab-gui-util.c:130
+#: addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3091,7 +2890,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:136
+#: addressbook/gui/widgets/eab-gui-util.c:143
 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"
@@ -3099,54 +2898,60 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:142
+#: addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:145
+#: addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:148
+#: addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:640
+#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:598
+#: addressbook/gui/widgets/eab-gui-util.c:200
+#: addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:275
-#, c-format
+#: addressbook/gui/widgets/eab-gui-util.c:282
+#, fuzzy, c-format
 msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgstr[0] ""
+"%d kontakti avamisega kaasneb %d uue akna avamine.\n"
+"Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
+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:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3155,84 +2960,94 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:305
+#: addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:383
+#: addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:545
+#: addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:694
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
+#: addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:701
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Vali sihtaadressiraamat."
 
-#: addressbook/gui/widgets/eab-gui-util.c:927
+#: addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
+#: addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
 
-#.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(puudub)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Vali tegevus"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Loo uus kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Muuda kontakti andmeid"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:982
+msgid "Add to Contacts"
+msgstr "Lisa kontaktide hulka"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
@@ -3256,28 +3071,386 @@ msgstr "Kompaktse VKaardi näitamine"
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
-msgid "Card View"
-msgstr "Kaardi vaade"
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Kontakte pole"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
-msgid "GTK Tree View"
-msgstr "GTK Puuvaade"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakte pole"
+msgstr[1] "Kontakte pole"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-minicard-view.c:512
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Päring"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 #, fuzzy
-msgid "Reflow Test"
-msgstr "Html test"
+msgid "Error getting book view"
+msgstr "Viga aadressiraamatu lugemisel"
 
-#: addressbook/gui/widgets/test-reflow.c:120
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Autoriõigus (C) 2000, Ximian, Inc."
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+msgid "Model"
+msgstr "Mudel"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Viga kaardi muutmisel"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Name begins with"
+msgstr "Nimi algab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Email begins with"
+msgstr "E-post algab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategooria on"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "Suvaline väli sisaldab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Advanced..."
+msgstr "Edasijõudnutele..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+msgid "Source"
+msgstr "Allikas"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:243
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tüüp"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:540
+#: plugins/shared-folder/properties.glade.h:6
+msgid "Address Book"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Salvesta vKaardina..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:917
+msgid "New Contact..."
+msgstr "Uus kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact List..."
+msgstr "Uus kontaktide nimekiri..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Edasta kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+msgid "Send Message to Contact"
+msgstr "Saada kontaktile sõnum"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: calendar/gui/print.c:2483
+#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Trüki"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:927
+msgid "Copy to Address Book..."
+msgstr "Kopeeri aadressiraamatusse..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:928
+msgid "Move to Address Book..."
+msgstr "Liiguta aadressiraamatusse..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Lõika"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:384
+#: calendar/gui/tasks-component.c:329
+#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopeeri"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Aseta"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "Suvaline kategooria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistendi telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Fax tööl"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Telefon tööl"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Telefon tööl 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Tagasihelistamise telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Autotelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "Categories"
+msgstr "Kategooriad"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Firma telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Perekonnanimi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Kataloogi kui"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Antud nimi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Kodune faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Kodune telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Kodune telefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Päevik"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Juht"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Hüüdnimi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Muu faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Muu telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Piipar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Raadio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:251
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Roll"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Abikaasa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Tiitel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Ühik"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Koduleht"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Laius"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Kõrgus"
+
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#, fuzzy
+msgid "Has Focus"
+msgstr "Fookuse käitumine"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valitud"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Vilkuv kursor"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Väli"
 
-#: addressbook/gui/widgets/test-reflow.c:122
-msgid "This should test the reflow canvas item"
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Välja nimi"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "CPU mudel"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+#, fuzzy
+msgid "Max field name length"
+msgstr "Maks. erinevus lausepikkustes:"
+
+#: addressbook/gui/widgets/e-minicard-view.c:171
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
 msgstr ""
+"\n"
+"\n"
+"Selles vaates kirjed puuduvad\n"
+"\n"
+"Uue kontakti lisamiseks tee siin topeltklõps."
+
+#: addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Selles vaates kirjed puuduvad\n"
+"\n"
+"Uue kontakti lisamiseks tee siin topeltklõps."
+
+#: addressbook/gui/widgets/e-minicard-view.c:179
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr "Otsi kontakte..."
+
+#: addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Selles vaates kirjed puuduvad."
+
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Veeru laius"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "Kaardi vaade"
+
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+msgid "GTK Tree View"
+msgstr "GTK Puuvaade"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
@@ -3292,18 +3465,9 @@ msgid "Evolution VCard Importer"
 msgstr "Evolutioni VKaardi importija"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolutioni VKaardi importija"
-
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Trüki ümbrik"
-
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Prindi kontaktid"
@@ -3313,6 +3477,11 @@ msgstr "Prindi kontaktid"
 msgid "Print contact"
 msgstr "Prindi kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Trüki ümbrik"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
@@ -3402,10 +3571,17 @@ msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "Häälestus"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Suund"
 
@@ -3470,6 +3646,7 @@ msgid "Top:"
 msgstr "Ülevalt:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Tüüp:"
 
@@ -3486,6 +3663,11 @@ msgstr "_Kirjatüüp..."
 msgid "Contact Print Style Editor Test"
 msgstr "Kontaktiloendi redaktor"
 
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Autoriõigus (C) 2000, Ximian, Inc."
+
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr ""
@@ -3499,22 +3681,6 @@ msgstr "Testlehekülje trükkimine"
 msgid "This should test the contact print code"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Faili ei saa avada"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "ei õnnestu lugeda alglaadimise aega"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Faili '%s' avamine ebaõnnestus: %s"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Specify the output file instead of standard output"
@@ -3537,12 +3703,11 @@ msgid "[vcard|csv]"
 msgstr "[vkaard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
+msgid "Export in asynchronous mode"
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3550,8 +3715,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3563,12 +3727,29 @@ msgid "In async mode, output must be file."
 msgstr "Asünkroonrežiimis peab väljund olema fail."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
+msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "Võimatu sisemine viga."
+#, fuzzy
+msgid "Unhandled error"
+msgstr "Tundmatu viga"
+
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Faili ei saa avada"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "ei õnnestu lugeda alglaadimise aega"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Faili '%s' avamine ebaõnnestus: %s"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3582,32 +3763,30 @@ msgstr "Sisendfail"
 msgid "No filename provided."
 msgstr "Failinime ei esitatud."
 
-#: addressbook/util/e-destination.c:577
-msgid "Unnamed List"
-msgstr "Nimetu nimekiri"
-
 #. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: calendar/calendar-errors.xml.h:2
+#: calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr ""
 
 #. calendar:prompt-cancel-meeting secondary
 #: calendar/calendar-errors.xml.h:4
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
 msgstr ""
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
+#: calendar/calendar-errors.xml.h:5
+#: calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25
+#: calendar/calendar-errors.xml.h:87
+#: calendar/calendar-errors.xml.h:93
+#: calendar/calendar-errors.xml.h:99
 #: calendar/calendar-errors.xml.h:105
 #, fuzzy
 msgid "Don't Send"
 msgstr "Ära kustuta"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:6
+#: calendar/calendar-errors.xml.h:16
 #: calendar/calendar-errors.xml.h:26
 #, fuzzy
 msgid "Send Notice"
@@ -3621,19 +3800,17 @@ msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #. calendar:prompt-delete-meeting secondary
 #: calendar/calendar-errors.xml.h:10
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-cancel-task secondary
 #: calendar/calendar-errors.xml.h:14
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
 msgstr ""
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: calendar/calendar-errors.xml.h:18
+#: calendar/calendar-errors.xml.h:44
 #, fuzzy
 msgid "Are you sure you want to delete this task?"
 msgstr ""
@@ -3641,9 +3818,8 @@ msgstr ""
 "kustutada seda kontakti?"
 
 #. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:20
+#: calendar/calendar-errors.xml.h:42
 #: calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
@@ -3655,22 +3831,19 @@ msgstr ""
 
 #. calendar:prompt-cancel-journal secondary
 #: calendar/calendar-errors.xml.h:24
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
 msgstr ""
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: calendar/calendar-errors.xml.h:28
+#: calendar/calendar-errors.xml.h:52
 #, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:30
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on this journal entry will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-delete-titled-appointment primary
@@ -3680,10 +3853,9 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+#: calendar/calendar-errors.xml.h:34
+#: calendar/calendar-errors.xml.h:38
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-delete-appointment primary
@@ -3707,10 +3879,9 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+#: calendar/calendar-errors.xml.h:50
+#: calendar/calendar-errors.xml.h:54
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-delete-appointments primary
@@ -3723,9 +3894,7 @@ msgstr ""
 
 #. calendar:prompt-delete-appointments secondary
 #: calendar/calendar-errors.xml.h:58
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-delete-tasks primary
@@ -3751,9 +3920,7 @@ msgstr ""
 
 #. calendar:prompt-delete-journals secondary
 #: calendar/calendar-errors.xml.h:66
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+msgid "All information in these journal entries will be deleted and can not be restored."
 msgstr ""
 
 #. calendar:prompt-save-appointment title
@@ -3772,12 +3939,13 @@ msgstr "Kas soovid tehtud muudatused salvestada?"
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Sa oled muutnud seda sündmust, kuid muudatused ei ole salvestatud."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
-#: composer/mail-composer-errors.xml.h:33
+#: calendar/calendar-errors.xml.h:73
+#: calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Loobu muudatustest"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: calendar/calendar-errors.xml.h:74
+#: calendar/calendar-errors.xml.h:82
 #, fuzzy
 msgid "Save Changes"
 msgstr "Salvesta sõnum"
@@ -3798,9 +3966,7 @@ msgstr "Kas soovid tehtud muudatused salvestada?"
 #: calendar/calendar-errors.xml.h:80
 #, fuzzy
 msgid "You have made changes to this task, but not yet saved them."
-msgstr ""
-"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
-"redaktorit?"
+msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
 
 #. calendar:prompt-meeting-invite primary
 #: calendar/calendar-errors.xml.h:84
@@ -3809,12 +3975,13 @@ msgstr ""
 
 #. calendar:prompt-meeting-invite secondary
 #: calendar/calendar-errors.xml.h:86
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
+#: calendar/calendar-errors.xml.h:88
+#: calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:100
+#: calendar/calendar-errors.xml.h:106
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Saada"
@@ -3826,9 +3993,7 @@ msgstr ""
 
 #. calendar:prompt-send-updated-meeting-info secondary
 #: calendar/calendar-errors.xml.h:92
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr ""
 
 #. calendar:prompt-send-task primary
@@ -3838,9 +4003,7 @@ msgstr ""
 
 #. calendar:prompt-send-task secondary
 #: calendar/calendar-errors.xml.h:98
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr ""
 
 #. calendar:prompt-send-updated-task-info primary
@@ -3850,9 +4013,7 @@ msgstr ""
 
 #. calendar:prompt-send-updated-task-info secondary
 #: calendar/calendar-errors.xml.h:104
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr ""
 
 #. calendar:tasks-crashed primary
@@ -3877,7 +4038,64 @@ msgstr "Evolution'i vKalendri importija"
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+#, fuzzy
+msgid "Delete calendar '{0}'?"
+msgstr "Kustuta \"{0}\"?"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr ""
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+#, fuzzy
+msgid "Delete task list '{0}'?"
+msgstr "Kustuta see loetelu"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr ""
+
+#  mail:ask-send-no-subject primary
+#. calendar:prompt-send-no-subject-calendar primary
+#: calendar/calendar-errors.xml.h:124
+#, fuzzy
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
+
+#. calendar:prompt-send-no-subject-calendar secondary
+#: calendar/calendar-errors.xml.h:126
+msgid "Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:127
+#: calendar/calendar-errors.xml.h:132
+#: mail/mail-errors.xml.h:15
+#: mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27
+#: mail/mail-errors.xml.h:32
+#, fuzzy
+msgid "_Send"
+msgstr "Saada"
+
+#  mail:ask-send-no-subject primary
+#. calendar:prompt-send-no-subject-task primary
+#: calendar/calendar-errors.xml.h:129
+#, fuzzy
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
+
+#. calendar:prompt-send-no-subject-task secondary
+#: calendar/calendar-errors.xml.h:131
+msgid "Adding a meaningful Summary to your task will give your recipients an idea of what your appointment is about."
+msgstr ""
+
+#: calendar/common/authentication.c:49
+#: calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3886,16 +4104,16 @@ msgstr "Sisesta parool"
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/calendar/calendar-conduit.c:1359
+#: calendar/conduits/calendar/calendar-conduit.c:1360
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 #, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr "Ei saa käivitada wombat serverit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
 #: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1471
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
@@ -3910,129 +4128,109 @@ msgstr "Vaikimisi tähtsus:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F3"
-msgstr "Vahemälu-kontroll:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 #, fuzzy
-msgid "*Control*F4"
-msgstr "Vahemälu-kontroll:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#: calendar/gui/calendar-component.c:1079
-msgid "Calendars"
-msgstr "Kalendrid"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutioni kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutit"
+msgstr[1] "minutit"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i intelligentne kalendriimportija"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutioni aadressiraamatu komponent"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/dialogs/event-editor.c:138
+#: calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Sündmus"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-msgid "Tasks"
-msgstr "Ülesanded"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Appointment Title"
+msgstr "Sündmuse pealkiri"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendrid"
+#. End time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: plugins/itip-formatter/itip-view.c:685
+msgid "End time:"
+msgstr "Lõpp:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Ülesanded"
+#. Location
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/e-itip-control.c:1118
+#: plugins/itip-formatter/itip-view.c:668
+msgid "Location:"
+msgstr "Asukoht:"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
 #, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarmi teenus"
+msgid "Snooze _time:"
+msgstr "_Edasilükkamise aeg (minutites):"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
-msgid "Starting:"
+#. Start time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: plugins/itip-formatter/itip-view.c:676
+msgid "Start time:"
 msgstr "Algus:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-msgid "Ending:"
-msgstr "Lõpp:"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
-msgid "Evolution Alarm"
-msgstr "Evolution'i alarm "
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: filter/filter.glade.h:11
+#: mail/mail-config.glade.h:153
+#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12
+#: ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+#: ui/evolution.xml.h:38
+msgid "_Edit"
+msgstr "_Redaktor"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
-#, c-format
-msgid "Alarm on %s"
-msgstr "Alarm %s"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+msgid "_Snooze"
+msgstr "_Lükka edasi"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-msgid "Snooze _time (minutes):"
-msgstr "_Edasilükkamise aeg (minutites):"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+msgid "description of appointment"
+msgstr "sündmuse kirjeldus"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "_Edit appointment"
-msgstr "_Muuda sündmust"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+msgid "end-time"
+msgstr "lõppaeg"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "_Snooze"
-msgstr "_Lükka edasi"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+msgid "location"
+msgstr "asukoht"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ava"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+msgid "start-time"
+msgstr "algusaeg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "Tühista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:954
+#: calendar/gui/alarm-notify/alarm-queue.c:947
+#, fuzzy
+msgid "No summary available."
+msgstr "Kirjeldus puudub."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:956
+#: calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:974
+#: calendar/gui/alarm-notify/alarm-queue.c:966
+#, fuzzy
+msgid "No location information available."
+msgstr "Kirjeldus puudub."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4041,12 +4239,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1098
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
+#: calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4058,11 +4256,10 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4075,10 +4272,15 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1118
+#: calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarmi teenus"
+
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
@@ -4177,274 +4379,224 @@ msgid "Show where events end in week and month views"
 msgstr "Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Time last alarm ran"
+msgid "The url template to use as a free/busy data fallback"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-msgid "Units for determining when to hide tasks"
+msgid "Time last alarm ran"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "Units of default reminder"
+msgid "Units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "Nädalapäev, millal nädal algab"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Kas küsida nõusolekut kausta puhastamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "Kas peita lõpetatud ülesanded"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Kokkuvõte sisaldab"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Kirjeldus sisaldab"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentaar sisaldab"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Asukoht sisaldab"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Puudub"
-
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1860
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/calendar-commands.c:120
+#: calendar/gui/calendar-component.c:567
+#: calendar/gui/dialogs/calendar-setup.c:362
+#: calendar/gui/gnome-cal.c:1925
+#: camel/providers/groupwise/camel-gw-listener.c:405
+#: camel/providers/groupwise/camel-gw-listener.c:435
+#: plugins/groupwise-account-setup/camel-gw-listener.c:405
+#: plugins/groupwise-account-setup/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:352
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"See tegevus eemaldab lõplikult kõik sündmused, mis on vanemad kui valitud "
-"päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
+#: calendar/gui/calendar-commands.c:355
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "See tegevus eemaldab lõplikult kõik sündmused, mis on vanemad kui valitud päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Puhasta sündmustest, mis on vanemad kui"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
+#: filter/filter.glade.h:14
+#: plugins/calendar-http/calendar-http.c:265
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:432
-msgid "%A %d %B %Y"
-msgstr "%A, %d. %B %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:329
-msgid "%a %d %b"
-msgstr "%a, %d. %b"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
-msgid "%a %d %b %Y"
-msgstr "%a, %d. %b %Y"
-
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-msgid "%d %B %Y"
-msgstr "%d. %B %Y"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
-msgid "%d %B"
-msgstr "%d. %B"
-
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
-
-#: calendar/gui/calendar-component.c:426
+#: calendar/gui/calendar-component.c:383
+#: calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:516
-#, fuzzy
-msgid "%A %d %b %Y"
-msgstr "%a, %d. %b %Y"
-
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
-#, fuzzy
-msgid "%d %b %Y"
-msgstr "%d. %B %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:545
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-week-view-main-item.c:343
-msgid "%d %b"
-msgstr "%d. %b"
-
-#: calendar/gui/calendar-component.c:635
+#: calendar/gui/calendar-component.c:638
 #, fuzzy
 msgid "Failed upgrading calendars."
 msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:934
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:950
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1245
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendar Source Selector"
+msgstr "Kalendri asukoht"
+
+#: calendar/gui/calendar-component.c:1085
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/calendar-component.c:1251
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1252
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1253
 msgid "Create a new appointment"
 msgstr "Lisab uue sündmuse"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1259
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1260
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1261
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1267
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1268
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1269
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava sündmuse"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1275
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1270
+#: calendar/gui/calendar-component.c:1276
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:1271
+#: calendar/gui/calendar-component.c:1277
 msgid "Create a new calendar"
 msgstr "Loo uus kalender"
 
-#: calendar/gui/calendar-offline-handler.c:192
-#, c-format
-msgid "backend_go_offline(): %s"
-msgstr "backend_go_offline(): %s"
-
-#: calendar/gui/calendar-offline-handler.c:215
-#, c-format
-msgid "backend_go_online(): %s"
-msgstr "backend_go_online(): %s"
-
-#: calendar/gui/calendar-view-factory.c:118
+#: calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Päeva vaade"
 
-#: calendar/gui/calendar-view-factory.c:121
+#: calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Töönädala vaade"
 
-#: calendar/gui/calendar-view-factory.c:124
+#: calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Nädala vaade"
 
-#: calendar/gui/calendar-view-factory.c:127
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "Kokkuvõte sisaldab"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "Asukoht sisaldab"
+
+#: calendar/gui/cal-search-bar.c:350
+#: camel/camel-vee-store.c:343
+msgid "Unmatched"
+msgstr "Puudub"
+
+#: calendar/gui/comp-editor-factory.c:413
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Viga xbase faili avamisel."
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:425
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr " Sul ei ole õigusi avada Piloti seadet."
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
-msgstr "open_client(): %s"
+#: calendar/gui/comp-editor-factory.c:437
+#: camel/providers/imap4/camel-imap4-store.c:288
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:539
+#: shell/e-shell.c:1252
+msgid "Unknown error"
+msgstr "Tundmatu viga"
 
 #  and now for the action area
 #  and now for the action area
 #: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "<b>Alarm</b>\t"
+msgid "<b>Alarm</b>"
 msgstr "<b>Alarmid</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:3
@@ -4479,7 +4631,8 @@ msgstr ""
 msgid "Mes_sage:"
 msgstr "_Sõnumid"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Mängi heli"
 
@@ -4544,7 +4697,9 @@ msgid "hour(s)"
 msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: filter/filter.glade.h:15
+#: plugins/calendar-http/calendar-http.c:264
 msgid "hours"
 msgstr "tundi"
 
@@ -4553,10 +4708,28 @@ msgid "minute(s)"
 msgstr "minut(it)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+#, fuzzy
+msgid "option menu to choose alarm relative"
+msgstr "Kuupäeva valimine on kohustuslik."
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+#, fuzzy
+msgid "option menu to choose alarm time"
+msgstr "Kuupäeva valimine on kohustuslik."
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:192
+#: calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -4568,40 +4741,115 @@ msgstr "_Lisa"
 msgid "Alarms"
 msgstr "Alarmid"
 
+#: calendar/gui/dialogs/calendar-setup.c:284
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:336
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Värv:"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+#, fuzzy
+msgid "Tasks List"
+msgstr "Ülesannete nimekiri"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Kausta omadused"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+#, fuzzy
+msgid "Task List Properties"
+msgstr "Ülesandeloetelu grupp"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Task List"
+msgstr "Lisa uus ülesandeloetelu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#: mail/mail-config.glade.h:103
+msgid "Pick a color"
+msgstr "Vali värvus"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Task List"
+msgstr "Lisa uus ülesandeloetelu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+msgid "_Refresh:"
+msgstr "_Värskenda:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+msgid "weeks"
+msgstr "nädalat"
+
 #  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #  has "activatable" set.
 #  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #  has "activatable" set.
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: mail/em-account-prefs.c:470
+#: mail/em-composer-prefs.c:678
+#: mail/em-composer-prefs.c:945
+#: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+msgid "Remove"
+msgstr "Eemalda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ära eemalda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345
+#: mail/em-account-prefs.c:376
+#: mail/em-composer-prefs.c:597
+#: mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "Keela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345
+#: mail/em-account-prefs.c:378
+#: mail/em-composer-prefs.c:597
+#: mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Enable"
 msgstr "Luba"
 
@@ -4631,289 +4879,239 @@ msgstr "60 minutit"
 msgid "<b>Alerts</b>"
 msgstr "<b>Alarmid</b>"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>Default Free/Busy Server</b>"
+msgstr "<b>Kalendri seaded</b>"
+
 #  and now for the action area
 #  and now for the action area
 #  and now for the action area
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>General</b>"
 msgstr "<b>Üldine</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Publishing</b>"
+msgstr "Avaliku vaba/hõivatud info asukoht"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Task List</b>"
 msgstr "<b>Ülesannete nimekiri</b>"
 
 #  and now for the action area
 #  and now for the action area
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Time</b>"
 msgstr "<b>Aeg</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Work Week</b>"
 msgstr "<b>Töönädal</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, no-c-format
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendri ja ülesannete sätted"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Color for overdue tasks"
 msgstr "Hilinenud ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for tasks due today"
 msgstr "Täna lõppevate ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Päev _lõpeb:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Days"
 msgstr "Päev(a)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Display"
 msgstr "Kuva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:76
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Free/Busy Publishing"
-msgstr "Vaba/Hõivatud info avalikustamine"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#, fuzzy
+msgid "Free/Busy"
+msgstr "Vaba/hõivatud:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Reede"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Hours"
 msgstr "Tund(i)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Minutes"
 msgstr "Minut(it)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:577
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "S_un"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Sh_ow a reminder"
 msgstr "Näita _meeldetuletust"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:576
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "T_asks due today:"
 msgstr "Tänase tähtajaga ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_hu"
 msgstr "_N"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
+msgid "Template:"
+msgstr "Osakond:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Time _zone:"
 msgstr "Ajav_öönd:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time format:"
 msgstr "Aja vorming:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:578
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "W_eek starts:"
 msgstr "_Nädala algus:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:579
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Add URL"
 msgstr "_URL'i lisamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Küsi nõusolekut kirjete kustutamisel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Day begins:"
 msgstr "_Päev algab:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Redaktor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Fri"
 msgstr "_R"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Hide completed tasks after"
 msgstr "_Peida lõpetatud ülesanded pärast"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Mon"
 msgstr "_E"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Overdue tasks:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Sat"
 msgstr "_L"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Show appointment end times in week and month views"
 msgstr "_Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Time divisions:"
 msgstr "_Aja jaotised:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Tue"
 msgstr "_T"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Wed"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Stiili nimi:"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-msgid "The source location '%s' is not a webcal source."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "option menu to choose reminder units"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "option menu to choose time units"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Task List"
-msgstr "Lisa uus ülesandeloetelu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Värv:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Vali värvus"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Task List"
-msgstr "Lisa uus ülesandeloetelu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Värskenda:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tüüp:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "nädalat"
-
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
@@ -4929,8 +5127,7 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
 #: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
@@ -4952,82 +5149,92 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
-"redaktorit?"
+msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
 
 #: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideerimisviga: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " kuni "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Lõpetatud "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Tähtaeg "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Tähtaeg "
-
-#: calendar/gui/dialogs/comp-editor.c:264
+#: calendar/gui/dialogs/comp-editor.c:257
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:899
+#: calendar/gui/dialogs/comp-editor.c:942
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:905
+#: calendar/gui/dialogs/comp-editor.c:948
+#, fuzzy, c-format
+msgid "Meeting - %s"
+msgstr "Koosolek"
+
+#: calendar/gui/dialogs/comp-editor.c:907
+#: calendar/gui/dialogs/comp-editor.c:950
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:954
+#, fuzzy, c-format
+msgid "Assigned Task - %s"
+msgstr "_Omista ülesanne"
+
+#: calendar/gui/dialogs/comp-editor.c:913
+#: calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:916
+#: calendar/gui/dialogs/comp-editor.c:959
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:927
+#: calendar/gui/dialogs/comp-editor.c:969
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
 #: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1368
+#: calendar/gui/dialogs/comp-editor.c:1392
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1416
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni ei saa kasutada!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideerimisviga: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191
+#: calendar/gui/print.c:2265
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193
+#: calendar/gui/print.c:2267
+msgid "Completed "
+msgstr "Lõpetatud "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198
+#: calendar/gui/print.c:2272
+msgid " (Due "
+msgstr " (Tähtaeg "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200
+#: calendar/gui/print.c:2274
+msgid "Due "
+msgstr "Tähtaeg "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Lähteallika avamine ebaõnnestus"
@@ -5109,70 +5316,67 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
-msgid "Appointment"
-msgstr "Sündmus"
-
-#: calendar/gui/dialogs/event-editor.c:162
+#: calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:239
-#: calendar/gui/dialogs/event-editor.c:381
+#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:372
 msgid "Scheduling"
 msgstr "Plaanimine"
 
-#: calendar/gui/dialogs/event-editor.c:176
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384
+#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:231
+#: calendar/gui/dialogs/event-editor.c:375
 msgid "Invitations"
 msgstr "Kutsed"
 
-#: calendar/gui/dialogs/event-page.c:692
+#: calendar/gui/dialogs/event-page.c:718
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:721
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:887
+#: calendar/gui/dialogs/task-page.c:553
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: calendar/gui/dialogs/event-page.c:865
+#: calendar/gui/dialogs/event-page.c:897
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:888
+#: calendar/gui/dialogs/event-page.c:920
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: calendar/gui/dialogs/event-page.c:927
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1605
+#: calendar/gui/dialogs/event-page.c:1668
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' ei saa avada."
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1874
 #, 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:1812
+#: calendar/gui/dialogs/event-page.c:1882
 #, 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:1820
+#: calendar/gui/dialogs/event-page.c:1890
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5201,124 +5405,147 @@ msgid "<b>Date and Time</b>"
 msgstr "<b>Kuupäev ja kellaaeg</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<b>Send Options</b>"
+msgstr "<b>Ülesandeloetelu seaded</b>"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Kestab kogu _päeva"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
+msgid "Ad_vanced  send options"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "Kohanda..."
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Classi_fication:"
 msgstr "_Liigitamine"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:361
+#: calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:15
+#, fuzzy
+msgid "Event Description"
+msgstr "Kirjeldus:"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Asukoht:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-cal-list-view.c:253
+#: calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Näita aega kui hõivatut"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Su_mmary:"
 msgstr "K_okkuvõte:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:23
 #, fuzzy
 msgid "_Description:"
 msgstr "Kirjeldus:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:24
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:25
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:103
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-cal-model-tasks.c:652
+#: calendar/gui/e-itip-control.c:1104
+#: composer/e-msg-composer.c:2122
+#: filter/filter-rule.c:878
+#: mail/em-account-editor.c:675
+#: mail/em-account-editor.c:1267
+#: mail/em-account-prefs.c:431
+#: mail/em-folder-view.c:961
+#: plugins/itip-formatter/itip-formatter.c:1077
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: widgets/misc/e-cell-date-edit.c:248
+#: widgets/misc/e-dateedit.c:458
+#: widgets/misc/e-dateedit.c:1497
+#: widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:793
+#: calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
-#: calendar/gui/dialogs/meeting-page.c:797
-#: composer/e-msg-composer-attachment-bar.c:453
+#: calendar/gui/dialogs/meeting-page.c:781
+#: composer/e-msg-composer-attachment-bar.c:440
+#: plugins/shared-folder/properties.glade.h:19
 msgid "_Remove"
 msgstr "_Eemalda"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osavõtja"
@@ -5354,16 +5581,17 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:258
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/dialogs/task-editor.c:145
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:265
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: mail/em-filter-i18n.h:63
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -5388,7 +5616,7 @@ msgstr "_Muuda korraldajat:"
 #  name = e_book_get_name (book);
 #  Create the contacts group
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:428
 #, fuzzy
 msgid "Con_tacts..."
 msgstr "Kontaktid"
@@ -5398,6 +5626,10 @@ msgid "Or_ganizer:"
 msgstr "_Korraldaja:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "Organizer"
+msgstr "Korraldaja"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Korraldaja:"
@@ -5447,75 +5679,74 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:59
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:85
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Ainult see juhtum"
 
-#: calendar/gui/dialogs/recur-comp.c:89
+#: calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "See ja eelnevad juhtumid"
 
-#: calendar/gui/dialogs/recur-comp.c:95
+#: calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "See ja tulevad juhtumid"
 
-#: calendar/gui/dialogs/recur-comp.c:100
+#: calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Kõik juhtumid"
 
-#: calendar/gui/dialogs/recurrence-page.c:511
+#: calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:799
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:910
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "first"
 msgstr "esimene"
 
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:972
 msgid "second"
 msgstr "teine"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:973
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "fourth"
 msgstr "neljas"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "last"
 msgstr "viimane"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:998
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1026
 msgid "day"
 msgstr "päev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1163
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1349
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -5523,7 +5754,8 @@ msgstr "Kuupäev/kellaaeg"
 msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
@@ -5563,25 +5795,14 @@ msgstr "nädal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
-msgid "Select destination"
-msgstr "Vali sihtkoht"
-
-#: calendar/gui/dialogs/select-source-dialog.c:110
-msgid "_Destination"
-msgstr "_Sihtkoht"
-
-#: calendar/gui/dialogs/select-source-dialog.c:112
-msgid "Task List"
-msgstr "Ülesannete nimekiri"
-
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:410
+#: calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
-msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -5590,46 +5811,56 @@ msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Alarmid</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-component-preview.c:229
+#: calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-tasks.c:345
+#: calendar/gui/e-cal-model-tasks.c:658
+#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-meeting-store.c:196
+#: calendar/gui/e-meeting-store.c:219
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-cal-component-preview.c:248
+#: calendar/gui/e-calendar-table.c:381
+#: mail/message-list.c:1011
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:226
+#: calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-tasks.c:343
+#: calendar/gui/e-cal-model-tasks.c:656
+#: calendar/gui/e-cal-model-tasks.c:731
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:252
+#: calendar/gui/e-calendar-table.c:383
+#: mail/message-list.c:1009
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:250
+#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-model.c:899
+#: mail/message-list.c:1010
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:236
+#: calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-cal-model-tasks.c:341
+#: calendar/gui/e-cal-model-tasks.c:654
+#: calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -5639,7 +5870,7 @@ msgid "P_ercent complete:"
 msgstr "Valmis (%%): %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -5659,52 +5890,60 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "_Kodulehekülg:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:136
+#: calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/dialogs/task-editor.c:165
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:156
+#: calendar/gui/dialogs/task-editor.c:218
+#: calendar/gui/dialogs/task-editor.c:356
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:496
+#: calendar/gui/dialogs/task-page.c:526
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: calendar/gui/dialogs/task-page.c:831
+#: calendar/gui/dialogs/task-page.c:870
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ei saa avada mooduli faili \"%s\"."
 
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">Häälestus</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "D_escription:"
-msgstr "Kirjeldus:"
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ad_vanced send options"
+msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:10
+msgid "D_escription:"
+msgstr "_Kirjeldus:"
+
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Sta_rt date:"
 msgstr "_Alguskuupäev:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:15
+#, fuzzy
+msgid "Task Description"
+msgstr "Kirjeldus:"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
-#, fuzzy
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "_Group:"
-msgstr "Grupp"
+msgstr "_Grupp:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
 #, fuzzy
@@ -5828,276 +6067,220 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:70
+#: mail/em-folder-view.c:2467
 #, c-format
 msgid "Click to open %s"
 msgstr "Avamiseks kliki %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:155
+#: filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:186
+#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
-#: calendar/gui/e-cal-component-preview.c:194
-#: calendar/gui/e-cal-component-preview.c:205
+#: calendar/gui/e-cal-component-preview.c:193
+#: calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Alguskuupäev:"
 
-#: calendar/gui/e-cal-component-preview.c:216
+#: calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #. write status
-#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-cal-component-preview.c:222
+#: calendar/gui/e-itip-control.c:1132
 msgid "Status:"
 msgstr "Olek:"
 
-#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-cal-component-preview.c:267
+#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: calendar/gui/e-cal-component-preview.c:300
+#: calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Lõppemise kuupäev"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Alguskuupäev"
-
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "Kokkuvõte"
-
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
-msgid "Free"
-msgstr "Vaba"
-
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Hõivatud"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Põ"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Lõ"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ida"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Lä"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geograafiline asukoht peab olema sisestatud vormingus: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Jah"
-
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ei"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1402
-#: camel/providers/imap4/camel-imap4-engine.c:1432
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1223
-#: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tundmatu"
-
-#: calendar/gui/e-cal-model.c:945
-msgid "Recurring"
-msgstr "Korduv"
-
-#: calendar/gui/e-cal-model.c:947
-msgid "Assigned"
-msgstr "Määratud"
-
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-cal-model-calendar.c:179
+msgid "Free"
+msgstr "Vaba"
+
+#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-cal-model-calendar.c:182
+#: calendar/gui/e-meeting-time-sel.c:412
+msgid "Busy"
+msgstr "Hõivatud"
+
+#: calendar/gui/e-calendar-table.c:689
+#: calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-view.c:1064
+#: composer/e-msg-composer.c:1201
+msgid "Save as..."
+msgstr "Salvesta kui..."
+
+#: calendar/gui/e-calendar-table.c:1151
+#: calendar/gui/e-calendar-view.c:1389
+#: mail/em-folder-view.c:927
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1152
 msgid "Open _Web Page"
 msgstr "_Ava veebilehekülg"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1153
+#: calendar/gui/e-calendar-view.c:1390
+#: mail/em-folder-view.c:929
+#: mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1154
+#: calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1391
+#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1158
+#: calendar/gui/e-calendar-view.c:1395
+#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:965 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: calendar/gui/e-calendar-table.c:1159
+#: calendar/gui/e-calendar-view.c:1396
+#: composer/e-msg-composer.c:2903
+#: mail/em-folder-tree.c:1028
+#: mail/message-list.c:1712
+#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-table.c:1160
+#: calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1397
+#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1164
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1165
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1166
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1167
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
 #  FIXME: need to disable for undeletable folders
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:1171
+#: calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:2746
+#: mail/em-folder-view.c:952
+#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1178
-msgid "Save as..."
-msgstr "Salvesta kui..."
-
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1323
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -6107,8 +6290,10 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5
+#: camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270
+#: mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -6128,107 +6313,188 @@ msgstr "Tähtsus"
 msgid "Start date"
 msgstr "Alguskuupäev"
 
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: mail/mail-dialogs.glade.h:21
+msgid "Summary"
+msgstr "Kokkuvõte"
+
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
-msgid "New Meeting"
-msgstr "Uus koosolek"
-
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1377
+msgid "Current View"
+msgstr "Käesolev vaade"
+
+#: calendar/gui/e-calendar-view.c:1379
+#: ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1385
+#: ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "_Liiguta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "Mine tänasele _päevale"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Lõppemise kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "_Mine kuupäevale..."
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Alguskuupäev"
 
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "_Sätted..."
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:307
+#: calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:139
+#: calendar/gui/e-meeting-list-view.c:153
+#: calendar/gui/e-meeting-store.c:124
+#: calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:224
+#: camel/camel-gpg-context.c:1767
+#: camel/camel-gpg-context.c:1818
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1465
+#: camel/providers/imap4/camel-imap4-engine.c:1504
+#: camel/providers/imap4/camel-imap4-engine.c:1549
+#: camel/providers/imap4/camel-imap4-engine.c:1605
+#: camel/providers/imap4/camel-imap4-store.c:1241
+#: camel/providers/imap4/camel-imap4-utils.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:218
+#: mail/em-utils.c:1157
+#: plugins/itip-formatter/itip-formatter.c:248
+#: plugins/plugin-manager/plugin-manager.c:72
+#: shell/e-component-registry.c:202
+#: shell/e-component-registry.c:206
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: calendar/gui/e-cal-model.c:901
+msgid "Recurring"
+msgstr "Korduv"
+
+#: calendar/gui/e-cal-model.c:903
+msgid "Assigned"
+msgstr "Määratud"
+
+#: calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:163
+#: calendar/gui/e-meeting-store.c:168
+#: calendar/gui/e-meeting-store.c:178
+#: calendar/gui/e-meeting-store.c:808
+msgid "Yes"
+msgstr "Jah"
+
+#: calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:164
+#: calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "Ei"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "N"
+msgstr "Põ"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "S"
+msgstr "Lõ"
+
+#: calendar/gui/e-cal-model-tasks.c:299
+#: smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ida"
+
+#: calendar/gui/e-cal-model-tasks.c:299
+msgid "W"
+msgstr "Lä"
+
+#: calendar/gui/e-cal-model-tasks.c:606
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geograafiline asukoht peab olema sisestatud vormingus: \n"
+"\n"
+"45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:115
+#: e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:118
+#: e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:125
+#: calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6239,429 +6505,426 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
-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:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
+#: calendar/gui/e-day-view.c:748
+#: calendar/gui/e-week-view.c:513
+#: calendar/gui/print.c:841
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
+#: calendar/gui/e-day-view.c:751
+#: calendar/gui/e-week-view.c:516
+#: calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-itip-control.c:610
+#. strftime format %A = full weekday name, %d = day of month,
+#: calendar/gui/e-day-view.c:1491
+#: calendar/gui/e-day-view-top-item.c:704
+#: calendar/gui/e-week-view-main-item.c:312
+#: calendar/gui/print.c:1517
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
+
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: calendar/gui/e-itip-control.c:621
+#: calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Iga päev"
 msgstr[1] "Iga %d päeva järel"
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Iga nädal"
 msgstr[1] "Iga %d nädala järel"
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:636
+#: calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Algab"
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
+#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1082
+#: plugins/itip-formatter/itip-view.c:274
+#: plugins/itip-formatter/itip-view.c:275
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:938
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
-"tegevus."
-
-#: calendar/gui/e-itip-control.c:967
-msgid "Location:"
-msgstr "Asukoht:"
-
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1089
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik tegevus."
+
+#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-meeting-list-view.c:175
+#: calendar/gui/e-meeting-store.c:188
+#: calendar/gui/e-meeting-store.c:211
+#: calendar/gui/itip-utils.c:421
 msgid "Accepted"
 msgstr "Vastu võetud"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/itip-utils.c:424
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-meeting-list-view.c:176
+#: calendar/gui/e-meeting-store.c:190
+#: calendar/gui/e-meeting-store.c:213
+#: calendar/gui/itip-utils.c:427
+#: calendar/gui/itip-utils.c:453
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
-#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
-#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
-msgid "Choose an action:"
-msgstr "Vali tegevus"
-
-#: calendar/gui/e-itip-control.c:1054
-msgid "Update"
-msgstr "Uuenda"
-
-#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "Olgu"
-
-#: calendar/gui/e-itip-control.c:1082
-msgid "Accept"
-msgstr "Nõustu"
-
-#: calendar/gui/e-itip-control.c:1083
-msgid "Tentatively accept"
-msgstr "Proovinõusolek"
-
-#: calendar/gui/e-itip-control.c:1084
-msgid "Decline"
-msgstr "Lükka tagasi"
-
-#: calendar/gui/e-itip-control.c:1108
-msgid "Send Free/Busy Information"
-msgstr "Vaba/hõivatud info saatmine"
-
-#: calendar/gui/e-itip-control.c:1121
-#, fuzzy
-msgid "Update respondent status"
-msgstr "GGV juhtimise staatus"
-
-#: calendar/gui/e-itip-control.c:1134
-msgid "Send Latest Information"
-msgstr "Saadab värskeima informatsiooni"
-
-#: calendar/gui/e-itip-control.c:1144
-msgid ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
+#: calendar/gui/e-itip-control.c:1229
+msgid "The meeting has been cancelled, however it could not be found in your calendars"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+#: calendar/gui/e-itip-control.c:1231
+msgid "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Tühista"
-
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
-#: calendar/gui/e-itip-control.c:1265
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas koosoleku soovile."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1358
+#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1333
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1403
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud info."
 
-#: calendar/gui/e-itip-control.c:1383
+#: calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud infot."
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1532
+#: calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1563
+#: calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1595
+#: calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1829
+#: calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1857
+#: calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
 
-#: calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1979
+#: plugins/itip-formatter/itip-formatter.c:744
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
+msgstr "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1926
+#: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
+#: calendar/gui/e-itip-control.c:2029
+#: calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2031
+#: calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
+#: calendar/gui/e-itip-control.c:2161
+msgid "Choose an action:"
+msgstr "Vali tegevus"
+
+#: calendar/gui/e-itip-control.c:2232
+msgid "Update"
+msgstr "Uuenda"
+
+#: calendar/gui/e-itip-control.c:2260
+msgid "Accept"
+msgstr "Nõustu"
+
+#: calendar/gui/e-itip-control.c:2261
+msgid "Tentatively accept"
+msgstr "Proovinõusolek"
+
+#: calendar/gui/e-itip-control.c:2262
+msgid "Decline"
+msgstr "Lükka tagasi"
+
+#: calendar/gui/e-itip-control.c:2291
+msgid "Send Free/Busy Information"
+msgstr "Vaba/hõivatud info saatmine"
+
+#: calendar/gui/e-itip-control.c:2319
+#, fuzzy
+msgid "Update respondent status"
+msgstr "GGV juhtimise staatus"
+
+#: calendar/gui/e-itip-control.c:2347
+msgid "Send Latest Information"
+msgstr "Saadab värskeima informatsiooni"
+
+#: calendar/gui/e-itip-control.c:2375
+#: calendar/gui/itip-utils.c:441
+#: mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:460
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Tühista"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -6703,6 +6966,11 @@ msgstr "alguskuup."
 msgid "Chair Persons"
 msgstr "Juhid"
 
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:124
+msgid "Required Participants"
+msgstr "Vajalikud osalejad"
+
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Võimalikud osalejad"
@@ -6711,161 +6979,169 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:135
+#: calendar/gui/e-meeting-store.c:99
+#: calendar/gui/e-meeting-store.c:116
+#: calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
-#: calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:136
+#: calendar/gui/e-meeting-store.c:101
+#: calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
-#: calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:137
+#: calendar/gui/e-meeting-store.c:103
+#: calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
-#: calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:138
+#: calendar/gui/e-meeting-store.c:105
+#: calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
-#: calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:149
+#: calendar/gui/e-meeting-store.c:134
+#: calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:150
+#: calendar/gui/e-meeting-store.c:136
+#: calendar/gui/e-meeting-store.c:153
+#: calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
-#: calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:151
+#: calendar/gui/e-meeting-store.c:138
+#: calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
-#: calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:152
+#: calendar/gui/e-meeting-store.c:140
+#: calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:174
+#: calendar/gui/e-meeting-store.c:186
+#: calendar/gui/e-meeting-store.c:209
+#: calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:177
+#: calendar/gui/e-meeting-store.c:192
+#: calendar/gui/e-meeting-store.c:215
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
-#: calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:178
+#: calendar/gui/e-meeting-store.c:194
+#: calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:198
+#: calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2069
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:413
+#: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:445
 #, fuzzy
 msgid "O_ptions"
 msgstr "Häälestus"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:462
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööpäeva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:472
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Näita _suures plaanis"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:487
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
-#, fuzzy
+#: calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:548
-#, fuzzy
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:557
-#, fuzzy
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:579
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
+#. This is a strftime() format string %A = full weekday name,
+#: calendar/gui/e-meeting-time-sel.c:2104
+#: calendar/gui/e-meeting-time-sel-item.c:444
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#: calendar/gui/e-meeting-time-sel.c:2137
+#: calendar/gui/e-meeting-time-sel-item.c:448
+#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296
+#: e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299
+#: widgets/misc/e-dateedit.c:1660
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
+#: calendar/gui/e-tasks.c:734
+#: calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6874,50 +7150,138 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: calendar/gui/e-tasks.c:873
+#: calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:1070
+#: calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:1093
+#: calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:1120
+#: calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/e-tasks.c:1189
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1822
+#: calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:881
+#: calendar/gui/tasks-control.c:410
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
+#: camel/providers/groupwise/camel-gw-listener.c:406
+#: plugins/groupwise-account-setup/camel-gw-listener.c:406
+msgid "Tasks"
+msgstr "Ülesanded"
+
+#: calendar/gui/e-timezone-entry.c:133
+#, fuzzy
+msgid "Timezone Button"
+msgstr "Ajavöönd"
+
+#. strftime format %d = day of month, %B = full
+#: calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/print.c:1501
+msgid "%d %B"
+msgstr "%d. %B"
+
+#: calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
+#  bonobo displays this string so it must be in locale
+#. bonobo displays this string so it must be in locale
 #: calendar/gui/gnome-cal.c:2040
+#: widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "Kohandatud vaade"
+
+#: calendar/gui/gnome-cal.c:2041
+msgid "Save Custom View"
+msgstr "Salvesta kohandatud vaade"
+
+#: calendar/gui/gnome-cal.c:2046
+#: widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "Kirjelda vaateid..."
+
+#: calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2059
+#: calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2152
+#: calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:3122
+#: calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "Puhastamine"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutioni kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i intelligentne kalendriimportija"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Ülesanded"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -6974,83 +7338,84 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:270
+#: calendar/gui/itip-utils.c:318
+#: calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: calendar/gui/itip-utils.c:306
+#: calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:395
+#: calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:397
+#: calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Päevaraamatu informatsioon"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:402
+#: calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:438
+#: calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: calendar/gui/itip-utils.c:450
+#: calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud teave (%s -> %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: calendar/gui/itip-utils.c:673
+#: calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
 #: calendar/gui/migration.c:150
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #: calendar/gui/migration.c:154
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -7060,351 +7425,356 @@ msgstr "Sünnipäevad ja tähtpäevad"
 
 #  Create the Webcal source group
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:478
+#: calendar/gui/migration.c:571
 msgid "On The Web"
 msgstr "Veebis"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:735
+#: calendar/gui/migration.c:887
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:741
+#: calendar/gui/migration.c:764
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit '%s' ei saa avada."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:893
+#: calendar/gui/migration.c:916
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "P"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "E"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "T"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "K"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "N"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "R"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942
+#: calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562
+#: calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740
+#: mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:372
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:415
+#: calendar/gui/tasks-component.c:404
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Uus ülesanne"
 msgstr[1] "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:406
+#: mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:758
+#: calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:773
+#: calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:856
+#, fuzzy
+msgid "Task Source Selector"
+msgstr "Ühtegi allikat pole valitud."
+
+#: calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:1055
+#: calendar/gui/tasks-component.c:1047
 #, fuzzy
 msgid "New assigned task"
 msgstr "Omista ülesanne"
 
-#: calendar/gui/tasks-component.c:1056
+#: calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "_Omista ülesanne"
 
-#: calendar/gui/tasks-component.c:1057
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:1063
+#: calendar/gui/tasks-component.c:1055
 #, fuzzy
 msgid "New task list"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:1064
+#: calendar/gui/tasks-component.c:1056
 #, fuzzy
 msgid "Task l_ist"
 msgstr "Ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:1065
+#: calendar/gui/tasks-component.c:1057
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui "
-"lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
+"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui 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:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
-#: calendar/gui/weekday-picker.c:326
+#: calendar/gui/weekday-picker.c:318
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
@@ -7451,15 +7821,7 @@ msgstr ""
 "Evolution leidis Gnome Calendar kalendrifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: calendar/importers/icalendar-importer.c:734
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
-#.
 #. * These are the timezone names from the Olson timezone data.
-#. * We only place them here so gettext picks them up for translation.
-#. * Don't include in any C files.
-#.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Aafrika/Abidjan"
@@ -7985,6 +8347,7 @@ msgid "America/Nassau"
 msgstr "Ameerika/Nassau"
 
 #: calendar/zones.h:138
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Ameerika/New_York"
 
@@ -8984,60 +9347,60 @@ msgstr "Vaikne_ookean/Wallis"
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
-#: camel/camel-cipher-context.c:102
+#: camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "See šiffer ei toeta allkirjastamist"
 
-#: camel/camel-cipher-context.c:128
+#: camel/camel-cipher-context.c:129
 #, fuzzy
 msgid "Signing message"
 msgstr "Sõnumi saatmine"
 
-#: camel/camel-cipher-context.c:145
+#: camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "See šiffer ei toeta kontrolli"
 
-#: camel/camel-cipher-context.c:171
+#: camel/camel-cipher-context.c:172
 #, fuzzy
 msgid "Verifying message"
 msgstr "Sõnumi saatmine"
 
-#: camel/camel-cipher-context.c:189
+#: camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "See šiffer ei toeta krüpteerimist"
 
-#: camel/camel-cipher-context.c:215
+#: camel/camel-cipher-context.c:216
 #, fuzzy
 msgid "Encrypting message"
 msgstr "Sõnumi saatmine"
 
-#: camel/camel-cipher-context.c:232
+#: camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:255
 #, fuzzy
 msgid "Decrypting message"
 msgstr "Sõnumi saatmine"
 
-#: camel/camel-cipher-context.c:271
+#: camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "Sa ei tohi importida selle šifriga võtmeid"
 
-#: camel/camel-cipher-context.c:301
+#: camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "Sa ei tohi eksportida selle šifriga võtmeid"
 
-#: camel/camel-data-cache.c:133
+#: camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:194
+#: camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -9048,7 +9411,7 @@ msgstr ""
 "Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
 "taastad ühenduse võrguga."
 
-#: camel/camel-disco-diary.c:257
+#: camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -9059,34 +9422,37 @@ msgstr ""
 "%s\n"
 "Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
 
-#: camel/camel-disco-diary.c:293
+#: camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "Taassünkroniseeritakse serveriga"
 
-#: camel/camel-disco-folder.c:41
+#: camel/camel-disco-folder.c:42
+#: camel/providers/imap4/camel-imap4-folder.c:61
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 
-#: camel/camel-disco-folder.c:103
+#: camel/camel-disco-folder.c:104
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:466
+#: camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:404
+#: camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-search.c:512
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
+#: camel/camel-filter-driver.c:713
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
@@ -9096,16 +9462,19 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Vastu võetud vigane sõnum %s'lt: %s"
 
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
+#: camel/camel-filter-driver.c:945
+#: camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
+#: camel/camel-filter-driver.c:1043
+#: camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052
+#: camel/camel-filter-driver.c:1429
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -9127,12 +9496,14 @@ msgstr "Võetakse vastu teadet %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
+#: camel/camel-filter-driver.c:1148
+#: camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
+#: camel/camel-filter-driver.c:1174
+#: camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
@@ -9146,32 +9517,70 @@ msgstr "Tõmban %d. sõnumit %dst"
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: camel/camel-filter-search.c:386
+#: camel/camel-filter-search.c:385
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:401
+#: camel/camel-filter-search.c:400
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
-msgstr ""
-"<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
+msgstr "<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
 
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-search.c:548
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
+#: camel/camel-filter-search.c:670
+#: camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filterotsingu täitmisel: %s: %s"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder.c:610
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toetamata operatsioon: lisa sõnum: %s"
+
+#: camel/camel-folder.c:1200
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
+
+#: camel/camel-folder.c:1240
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toetamata operatsioon: otsing UID järgi: %s"
+
+#: camel/camel-folder.c:1352
+msgid "Moving messages"
+msgstr "Sõnumite liigutamine"
+
+#: camel/camel-folder.c:1352
+msgid "Copying messages"
+msgstr "Sõnumite kopeerimine"
+
+#: camel/camel-folder.c:1601
+#, fuzzy
+msgid "Learning junk"
+msgstr "Rämpsukontroll"
+
+#: camel/camel-folder.c:1618
+#, fuzzy
+msgid "Learning non-junk"
+msgstr "Sõnum on rämps"
+
+#: camel/camel-folder.c:1637
+msgid "Filtering new message(s)"
+msgstr "Uute sõnumite filtreerimine"
+
+#: camel/camel-folder-search.c:357
+#: camel/camel-folder-search.c:478
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -9180,78 +9589,44 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:367
+#: camel/camel-folder-search.c:488
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:674
+#: camel/camel-folder-search.c:707
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:755
+#: camel/camel-folder-search.c:757
 msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:760
+#: camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:784
+#: camel/camel-folder-search.c:786
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:790
+#: camel/camel-folder-search.c:792
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:879
+#: camel/camel-folder-search.c:881
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toetamata operatsioon: lisa sõnum: %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Toetamata operatsioon: otsing UID järgi: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Sõnumite liigutamine"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Sõnumite kopeerimine"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Rämpsukontroll"
-
-#: camel/camel-folder.c:1682
-#, fuzzy
-msgid "Learning non-junk"
-msgstr "Sõnum on rämps"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Uute sõnumite filtreerimine"
-
 #: camel/camel-gpg-context.c:735
 #, c-format
 msgid ""
@@ -9278,11 +9653,14 @@ msgid ""
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
-#: mail/mail-send-recv.c:611
+#: camel/camel-gpg-context.c:804
+#: camel/camel-gpg-context.c:1314
+#: camel/camel-gpg-context.c:1498
+#: camel/camel-gpg-context.c:1589
+#: camel/camel-gpg-context.c:1701
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#: mail/mail-ops.c:720
+#: mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "Loobutud."
 
@@ -9313,21 +9691,27 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1275
+#: camel/camel-smime-context.c:389
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
-#: camel/camel-gpg-context.c:1813
+#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1766
+#: camel/camel-gpg-context.c:1817
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
+#: camel/camel-gpg-context.c:1331
+#: camel/camel-gpg-context.c:1491
+#: camel/camel-gpg-context.c:1582
+#: camel/camel-gpg-context.c:1605
+#: camel/camel-gpg-context.c:1694
+#: camel/camel-gpg-context.c:1718
+#: camel/camel-gpg-context.c:1788
+#: camel/camel-gpg-context.c:1839
 msgid "Failed to execute gpg."
 msgstr "gpg käivitamine ebaõnnestus."
 
@@ -9335,9 +9719,12 @@ msgstr "gpg käivitamine ebaõnnestus."
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1437
+#: camel/camel-gpg-context.c:1443
+#: camel/camel-smime-context.c:692
+#: camel/camel-smime-context.c:703
+#: camel/camel-smime-context.c:710
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
@@ -9357,36 +9744,22 @@ msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
+#: camel/camel-gpg-context.c:1674
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
+
+#: camel/camel-gpg-context.c:1725
+#: camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
-#: camel/camel-gpg-context.c:1740
+#: camel/camel-gpg-context.c:1744
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
-#: camel/camel-lock-client.c:100
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ei suuda luua lukustamisabilise toru: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr ""
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, fuzzy, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ei saa lukustada '%s'"
-
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock.c:92
+#: camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ei suuda luua lukufaili %s jaoks: %s"
@@ -9406,72 +9779,119 @@ msgstr "fcntl(2) abil lukustamine nurjus: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) abil lukustamine nurjus: %s"
 
-#: camel/camel-movemail.c:107
+#: camel/camel-lock-client.c:100
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ei suuda luua lukustamisabilise toru: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:191
+#: camel/camel-lock-client.c:214
+#, fuzzy, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ei saa lukustada '%s'"
+
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:120
+#: camel/camel-movemail.c:117
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s: Ei saa avada küpsise faili %s"
 
-#: camel/camel-movemail.c:128
+#: camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ei saa avada ajutist sõnumifaili %s: %s"
 
-#: camel/camel-movemail.c:157
+#: camel/camel-movemail.c:154
 #, fuzzy, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/camel-movemail.c:187
+#: camel/camel-movemail.c:184
 #, fuzzy, c-format
 msgid "Could not create pipe: %s"
 msgstr "%s: Ei suuda luua soklit!"
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ei saa forkida: %s"
 
-#: camel/camel-movemail.c:237
+#: camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programm ebaõnnestus: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(tundmatu viga)"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Viga sõnumifaili lugemisel: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Viga ajutise sõnumifaili kirjutamisel: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:462
+#: camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Viga ajutise sõnumifaili kopeerimisel: %s"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
-
-#: camel/camel-multipart-encrypted.c:257
-msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "MIME osa dekrüpteerimine ebaõnnestus: vigane struktuur"
-
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:559
 msgid "parse error"
 msgstr "analüüsimisviga"
 
+#: camel/camel-net-utils.c:465
+#, fuzzy
+msgid "cannot create thread"
+msgstr "CMS sõnumit ei saa luua"
+
+#: camel/camel-net-utils.c:612
+#, c-format
+msgid "Resolving: %s"
+msgstr "Lahendan: %s"
+
+#: camel/camel-net-utils.c:634
+#, fuzzy
+msgid "Host lookup failed"
+msgstr "Hostinime lahendamine ebaõnnestus: põhjus teadmata"
+
+#: camel/camel-net-utils.c:636
+#, fuzzy, c-format
+msgid "Host lookup failed: %s: %s"
+msgstr "Hostinime lahendamine ebaõnnestus: %s: ei leia hosti"
+
+#: camel/camel-net-utils.c:743
+msgid "Resolving address"
+msgstr "Aadressi lahendamine"
+
+#: camel/camel-net-utils.c:763
+msgid "Name lookup failed"
+msgstr ""
+
+#: camel/camel-net-utils.c:766
+#, fuzzy, c-format
+msgid "Name lookup failed: %s"
+msgstr "NNTP käsk ebaõnnestus: %s"
+
 #: camel/camel-provider.c:59
 #, fuzzy
 msgid "Virtual folder email provider"
@@ -9481,22 +9901,23 @@ msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-provider.c:172
+#: camel/camel-provider.c:185
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ei saa laadida %s: süsteem ei toeta moodulite laadimist."
 
-#: camel/camel-provider.c:181
+#: camel/camel-provider.c:194
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ei saa laadida '%s': %s"
 
-#: camel/camel-provider.c:189
+#: camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:374
+#: camel/camel-session.c:161
 #, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
@@ -9509,7 +9930,8 @@ msgstr "Anonüümne"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112
+#: camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus."
 
@@ -9540,139 +9962,118 @@ msgstr ""
 "Vigane jälitusinfo:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:35
+#: camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:37
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
-"kasutades turvalist CRAM-MD5 parooli."
+#: camel/camel-sasl-cram-md5.c:38
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist CRAM-MD5 parooli."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
-"kasutades turvalist DIGEST-MD5 parooli."
+#: camel/camel-sasl-digest-md5.c:51
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist DIGEST-MD5 parooli."
 
-#: camel/camel-sasl-digest-md5.c:813
+#: camel/camel-sasl-digest-md5.c:814
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
 
-#: camel/camel-sasl-digest-md5.c:822
+#: camel/camel-sasl-digest-md5.c:823
 msgid "Server challenge invalid\n"
 msgstr "Vigane serveri kutsung\n"
 
-#: camel/camel-sasl-digest-md5.c:828
+#: camel/camel-sasl-digest-md5.c:829
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Serveri kutsung sisaldas vigast \"Quality of Protection\" lipikut\n"
 
-#: camel/camel-sasl-digest-md5.c:850
+#: camel/camel-sasl-digest-md5.c:859
 msgid "Server response did not contain authorization data\n"
 msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
 
-#: camel/camel-sasl-digest-md5.c:868
+#: camel/camel-sasl-digest-md5.c:877
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serveri vastus sisaldas puudulikku autoriseerimisinfot\n"
 
-#: camel/camel-sasl-digest-md5.c:878
+#: camel/camel-sasl-digest-md5.c:887
 msgid "Server response does not match\n"
 msgstr "Serveri vastus oli vigane\n"
 
-#: camel/camel-sasl-gssapi.c:52
+#: camel/camel-sasl-gssapi.c:53
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:54
+#: camel/camel-sasl-gssapi.c:55
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
-#: camel/camel-sasl-gssapi.c:152
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
+#: camel/camel-sasl-gssapi.c:153
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:157
+#: camel/camel-sasl-gssapi.c:158
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+#: camel/camel-sasl-gssapi.c:161
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:164
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+#: camel/camel-sasl-gssapi.c:165
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+#: camel/camel-sasl-gssapi.c:170
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:173
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:178
+#: camel/camel-sasl-gssapi.c:179
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:181
+#: camel/camel-sasl-gssapi.c:182
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:184
+#: camel/camel-sasl-gssapi.c:185
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-sasl-gssapi.c:187
+#: camel/camel-sasl-gssapi.c:188
 #, fuzzy
 msgid "The referenced credentials have expired."
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
-#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/camel-sasl-gssapi.c:194
+#: camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:278
+#: camel/camel-sasl-gssapi.c:293
+#: camel/camel-sasl-kerberos4.c:226
+#: camel/providers/imap/camel-imap-store.c:1213
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "Hosti `%s' lahendamine nurjus: %s"
-
 #: camel/camel-sasl-gssapi.c:303
 msgid "Unsupported security layer."
 msgstr "Toetamata turvakiht."
 
-#: camel/camel-sasl-kerberos4.c:41
+#: camel/camel-sasl-kerberos4.c:42
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:43
+#: camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
-#: camel/camel-sasl-kerberos4.c:162
+#: camel/camel-sasl-kerberos4.c:169
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -9681,112 +10082,74 @@ msgstr ""
 "Kerberose pileti saamine ebaõnnestus:\n"
 "%s"
 
-#: camel/camel-sasl-login.c:32
+#: camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "Kasutajanimi"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:35
+#: camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
-#: camel/camel-sasl-login.c:127
+#: camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "Teadmata autentimisseisund"
 
-#: camel/camel-sasl-ntlm.c:31
+#: camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: camel/camel-sasl-ntlm.c:33
+#: camel/camel-sasl-ntlm.c:34
 #, fuzzy
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
-#: camel/camel-sasl-plain.c:32
+#: camel/camel-sasl-plain.c:33
 #, fuzzy
 msgid "PLAIN"
 msgstr "Lihtne"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP enne SMTPd"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "See valik lubab POP ühenduse enne SMTP ühenduse üritamist"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "POP allika URI"
 
-#: camel/camel-sasl-popb4smtp.c:106
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#: camel/camel-search-private.c:114
+#: camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
 
-#: camel/camel-service.c:271
+#: camel/camel-service.c:272
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vajab kasutajanime osa"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:276
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vajab hosti osa"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:280
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:729
-#, c-format
-msgid "Resolving: %s"
-msgstr "Lahendan: %s"
-
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "Viga nime lahendamisel: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Hosti lahendamine ebaõnnestus: lõimu ei saa luua: %s"
-
-#: camel/camel-service.c:794
-#, c-format
-msgid "Host lookup failed: %s: host not found"
-msgstr "Hostinime lahendamine ebaõnnestus: %s: ei leia hosti"
-
-#: camel/camel-service.c:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
-
-#: camel/camel-service.c:851
-msgid "Resolving address"
-msgstr "Aadressi lahendamine"
-
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "Hostinime lahendamine ebaõnnestus: hosti ei leitud"
-
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "Hostinime lahendamine ebaõnnestus: põhjus teadmata"
-
-#: camel/camel-session.c:282
+#: camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9795,275 +10158,279 @@ msgstr ""
 "Ei suuda luua kataloogi %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:104
-#, c-format
-msgid "Enter security pass-phrase for `%s'"
-msgstr "Palun sisesta parool `%s' jaoks"
-
-#: camel/camel-smime-context.c:261
+#: camel/camel-smime-context.c:231
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ei leia sertifikaato '%s' jaoks"
 
-#: camel/camel-smime-context.c:267
+#: camel/camel-smime-context.c:237
 msgid "Cannot create CMS message"
 msgstr "Ei suuda luua CMS sõnumit"
 
-#: camel/camel-smime-context.c:272
+#: camel/camel-smime-context.c:242
 #, fuzzy
-msgid "Cannot create CMS signedData"
+msgid "Cannot create CMS signed data"
 msgstr "CMS sõnumit ei saa luua"
 
-#: camel/camel-smime-context.c:278
+#: camel/camel-smime-context.c:248
 #, fuzzy
-msgid "Cannot attach CMS signedData"
+msgid "Cannot attach CMS signed data"
 msgstr "CMS andmeid ei saa manustada"
 
-#: camel/camel-smime-context.c:285
+#: camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "CMS andmeid ei saa manustada"
 
-#: camel/camel-smime-context.c:291
+#: camel/camel-smime-context.c:261
 #, fuzzy
-msgid "Cannot create CMS SignerInfo"
+msgid "Cannot create CMS Signer information"
 msgstr "CMS sõnumit ei saa luua"
 
-#: camel/camel-smime-context.c:297
+#: camel/camel-smime-context.c:267
 #, fuzzy
-msgid "Cannot find cert chain"
+msgid "Cannot find certificate chain"
 msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 
-#: camel/camel-smime-context.c:303
+#: camel/camel-smime-context.c:273
 #, fuzzy
-msgid "Cannot add CMS SigningTime"
+msgid "Cannot add CMS Signing time"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:295
+#: camel/camel-smime-context.c:307
 #, fuzzy, c-format
-msgid "Encryption cert for '%s' does not exist"
+msgid "Encryption certificate for '%s' does not exist"
 msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
 
-#: camel/camel-smime-context.c:344
+#: camel/camel-smime-context.c:314
 #, fuzzy
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Sama gruppi pole võimalik kaks korda lisada."
 
-#: camel/camel-smime-context.c:349
+#: camel/camel-smime-context.c:319
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: camel/camel-smime-context.c:354
+#: camel/camel-smime-context.c:324
 #, fuzzy
 msgid "Cannot add encryption certificate"
 msgstr "Vali sertifikaat [%1] krüptimise jaoks"
 
-#: camel/camel-smime-context.c:360
+#: camel/camel-smime-context.c:330
 #, fuzzy
-msgid "Cannot add CMS SignerInfo"
+msgid "Cannot add CMS Signer information"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#: camel/camel-smime-context.c:400
+#: camel/camel-smime-context.c:848
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Ei saa luua andmebaasikataloogi!"
 
-#: camel/camel-smime-context.c:436
+#: camel/camel-smime-context.c:406
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:411
+#: camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "Andmete kodeerimine nurjus."
 
-#: camel/camel-smime-context.c:514
+#: camel/camel-smime-context.c:484
 msgid "Unverified"
 msgstr "Määramata"
 
-#: camel/camel-smime-context.c:516
+#: camel/camel-smime-context.c:486
 msgid "Good signature"
 msgstr "Hea allkiri"
 
-#: camel/camel-smime-context.c:518
+#: camel/camel-smime-context.c:488
 msgid "Bad signature"
 msgstr "Halb allkiri"
 
-#: camel/camel-smime-context.c:520
+#: camel/camel-smime-context.c:490
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:522
+#: camel/camel-smime-context.c:492
 msgid "Signing certificate not found"
 msgstr "Allkirjastamissertifikaati ei leitud"
 
-#: camel/camel-smime-context.c:524
+#: camel/camel-smime-context.c:494
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Ära saada sertifikaati"
 
-#: camel/camel-smime-context.c:526
+#: camel/camel-smime-context.c:496
 #, fuzzy
 msgid "Signature algorithm unknown"
 msgstr "tundmatu šifri algoritm"
 
-#: camel/camel-smime-context.c:528
+#: camel/camel-smime-context.c:498
 #, fuzzy
 msgid "Signature algorithm unsupported"
 msgstr "Toetamata allkirjavorming"
 
-#: camel/camel-smime-context.c:530
+#: camel/camel-smime-context.c:500
 msgid "Malformed signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:532
+#: camel/camel-smime-context.c:502
 msgid "Processing error"
 msgstr "Vea töötlemine"
 
-#: camel/camel-smime-context.c:569
-msgid "No signedData in signature"
+#: camel/camel-smime-context.c:539
+msgid "No signed data in signature"
 msgstr ""
 
-#: camel/camel-smime-context.c:576
+#: camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:559
+#: camel/camel-smime-context.c:569
 #, fuzzy
 msgid "Cannot calculate digests"
 msgstr "faili ei õnnestu sulgeda"
 
-#: camel/camel-smime-context.c:604
+#: camel/camel-smime-context.c:574
 #, fuzzy
 msgid "Cannot set message digests"
 msgstr "Sõnumi tähtsuseks määratakse:"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:584
+#: camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "Sertifikaadi importimine ebaõnnestus"
 
-#: camel/camel-smime-context.c:628
-msgid "Certificate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:599
+msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
-msgid "Certificate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:602
+msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:635
+#: camel/camel-smime-context.c:606
 #, fuzzy
 msgid "Cannot find signature digests"
 msgstr "Ei leia tühja kohta"
 
-#: camel/camel-smime-context.c:651
+#: camel/camel-smime-context.c:622
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allkirjastaja: %s <%s>: %s\n"
 
 #  we should have gotten instructions on how to use the DATA command:
 #  * 354 Enter mail, end with "." on a line by itself
-#: camel/camel-smime-context.c:752
+#: camel/camel-smime-context.c:723
 msgid "Decoder failed"
 msgstr "Dekooder ebaõnnestus"
 
-#: camel/camel-smime-context.c:804
+#: camel/camel-smime-context.c:775
 #, fuzzy, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "Ei leia \"%s\" programmifaili"
 
-#: camel/camel-smime-context.c:811
+#: camel/camel-smime-context.c:782
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:820
+#: camel/camel-smime-context.c:791
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:831
+#: camel/camel-smime-context.c:802
 #, fuzzy
 msgid "Cannot create CMS Message"
 msgstr "CMS sõnumit ei saa luua"
 
-#: camel/camel-smime-context.c:837
+#: camel/camel-smime-context.c:808
 #, fuzzy
-msgid "Cannot create CMS EnvelopedData"
+msgid "Cannot create CMS Enveloped data"
 msgstr "CMS EnvelopedData-t ei saa luua"
 
-#: camel/camel-smime-context.c:843
+#: camel/camel-smime-context.c:814
 #, fuzzy
-msgid "Cannot attach CMS EnvelopedData"
+msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS EnvelopedData-t ei saa manustada"
 
-#: camel/camel-smime-context.c:849
+#: camel/camel-smime-context.c:820
 #, fuzzy
 msgid "Cannot attach CMS data object"
 msgstr "CMS andmeobjekti ei saa manustada"
 
-#: camel/camel-smime-context.c:858
+#: camel/camel-smime-context.c:829
 #, fuzzy
-msgid "Cannot create CMS RecipientInfo"
+msgid "Cannot create CMS Recipient information"
 msgstr "CMS RecipientInfo-t ei saa luua"
 
-#: camel/camel-smime-context.c:863
+#: camel/camel-smime-context.c:834
 #, fuzzy
-msgid "Cannot add CMS RecipientInfo"
+msgid "Cannot add CMS Recipient information"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:888
+#: camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:975
+#: camel/camel-smime-context.c:946
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Tõrge dekodeerimisel, viga %d"
 
-#: camel/camel-smime-context.c:982
+#: camel/camel-smime-context.c:953
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekrüpteerimine: Krüpteeritud sisu ei leitud"
 
-#: camel/camel-smime-context.c:1009
+#: camel/camel-smime-context.c:980
 msgid "import keys: unimplemented"
 msgstr "võtmete importimine: pole veel teostatud"
 
-#: camel/camel-smime-context.c:1017
+#: camel/camel-smime-context.c:988
 msgid "export keys: unimplemented"
 msgstr "võtmete eksportimine: pole veel teostatud"
 
-#: camel/camel-store.c:213
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:243
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:298
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:325
+#: camel/camel-store.c:326
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:390
+#: camel/camel-vee-store.c:367
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
-#: camel/providers/local/camel-maildir-store.c:232
+#: camel/camel-store.c:440
+#: camel/camel-vee-store.c:404
+#: camel/providers/local/camel-maildir-store.c:233
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:777
+#: camel/camel-store.c:778
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:780
+#: mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:93
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
@@ -10193,7 +10560,8 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "&Funktsioon sooritatakse rakendusel:"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696
+#: camel/camel-tcp-stream-ssl.c:827
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10206,11 +10574,13 @@ msgstr ""
 "Sõrmejälg:       %s\n"
 "Allkiri:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
 msgstr "HEA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
 msgstr "HALB"
 
@@ -10236,7 +10606,7 @@ msgstr ""
 #  construct our user prompt
 #  construct our user prompt
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:836
+#: camel/camel-tcp-stream-ssl.c:837
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10251,7 +10621,7 @@ msgstr ""
 "\n"
 "Kas soovida vastu võtta?"
 
-#: camel/camel-tcp-stream-ssl.c:880
+#: camel/camel-tcp-stream-ssl.c:881
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10260,14 +10630,14 @@ msgstr ""
 "Probleem sertifikaadiga: %s\n"
 "Väljastaja: %s"
 
-#: camel/camel-tcp-stream-ssl.c:932
+#: camel/camel-tcp-stream-ssl.c:933
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:950
+#: camel/camel-tcp-stream-ssl.c:951
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10276,152 +10646,537 @@ msgstr ""
 "Sertifikaat on aegunud: %s\n"
 "Väljastaja: %s"
 
-#: camel/camel-tcp-stream-ssl.c:967
+#: camel/camel-tcp-stream-ssl.c:968
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
-msgstr "Sertifikaatide tühistusnimekiri on aegunud: %s\n"
+msgstr ""
+"Sertifikaatide tühistusnimekiri on aegunud: %s\n"
 "Väljaandja: %s"
 
-#: camel/camel-url.c:292
+#: camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL'i `%s' ei saa töödelda"
 
-#: camel/camel-vee-folder.c:633
+#: camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Viga `%s' salvestamisel: %s"
 
-#: camel/camel-vee-folder.c:675
+#: camel/camel-vee-folder.c:518
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:643
+#: camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 
-#: camel/camel-vee-store.c:374
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:396
+#: camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
-#: camel/camel-vtrash-folder.c:44
+#: camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Sõnumeid ei saa kopeerida Prügi kausta"
 
-#: camel/camel-vtrash-folder.c:46
+#: camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Sõnumeid ei saa kopeerida Rämpsu kausta"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:35
+#: camel/providers/groupwise/camel-groupwise-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "Kontrollin uusi sõnumeid"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap4/camel-imap4-provider.c:37
+#: camel/providers/groupwise/camel-groupwise-provider.c:56
+#: camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
-"sõnumitele "
+msgstr "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele sõnumitele "
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap4/camel-imap4-provider.c:53
 #, fuzzy
 msgid "Check new messages for Junk contents"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Rämpssõnumeid kontrollitakse ainult sisendkaustas"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Automatically synchronize remote mail locally"
+#: camel/providers/groupwise/camel-groupwise-provider.c:67
+#, fuzzy
+msgid "Automatically synchronize account locally"
 msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
 #, fuzzy
 msgid "Address Book and Calendar"
 msgstr "Aadressiraamat ja kalender"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
+#: camel/providers/groupwise/camel-groupwise-provider.c:81
 #, fuzzy
 msgid "Use Secure Connection (SSL)"
 msgstr "_Turvalise ühenduse kasutamine (SSL):"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:92
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
+#: camel/providers/groupwise/camel-groupwise-provider.c:96
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:109
-#: camel/providers/imap/camel-imap-provider.c:93
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
+#: camel/providers/imap4/camel-imap4-provider.c:81
+#: camel/providers/imap/camel-imap-provider.c:96
+#: camel/providers/imapp/camel-imapp-provider.c:66
+#: camel/providers/nntp/camel-nntp-provider.c:72
+#: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "Parool"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/groupwise/camel-groupwise-provider.c:113
+#: camel/providers/imap/camel-imap-provider.c:98
+#: camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:332
-#: camel/providers/groupwise/camel-gw-listener.c:362
+#: camel/providers/groupwise/camel-gw-listener.c:436
+#: plugins/groupwise-account-setup/camel-gw-listener.c:436
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
+#: camel/providers/imap4/camel-imap4-command.c:551
+#: camel/providers/imap4/camel-imap4-command.c:558
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Tõrge käsu saatmisel IMAP serverisse %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:661
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ootamatu vastus IMAP serverilt %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:216
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:410
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1464
+#: camel/providers/imap4/camel-imap4-engine.c:1503
+#: camel/providers/imap4/camel-imap4-engine.c:1548
+#: camel/providers/imap4/camel-imap4-engine.c:1604
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Ühendus IMAP4 serverisse %s suleti ootamatult: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot access folder `%s': %s"
+msgstr "Kausta `%s' ei saadud: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:418
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:424
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:565
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:570
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:749
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/nntp/camel-nntp-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:431
+#: camel/providers/pop3/camel-pop3-folder.c:492
+#: camel/providers/pop3/camel-pop3-folder.c:510
+msgid "User cancelled"
+msgstr "Kasutaja tühistas"
+
+#: camel/providers/imap4/camel-imap4-folder.c:754
+#: camel/providers/nntp/camel-nntp-folder.c:148
+#: camel/providers/nntp/camel-nntp-folder.c:150
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:434
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:513
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"Sõnumit %s ei saadud: \n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:772
+#, fuzzy
+msgid "This message is not available in offline mode."
+msgstr "See sõnum ei ole hetkel kättesaadav"
+
+#: camel/providers/imap4/camel-imap4-folder.c:826
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Ei saa võtta sõnumit %s kaustast `%s': sellist sõnumit ei ole"
+
+#: camel/providers/imap4/camel-imap4-folder.c:831
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Ei saa võtta sõnumit %s kaustast `%s': Vigane käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:873
+#, fuzzy
+msgid "Cannot append messages to IMAP folders in offline mode."
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:966
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:995
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1038
+#, fuzzy
+msgid "Cannot move messages to or from IMAP folders in offline mode."
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1041
+#, fuzzy
+msgid "Cannot copy messages to or from IMAP folders in offline mode."
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1086
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1090
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1098
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:1102
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:56
+#: camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Kaustad"
+
+#: camel/providers/imap4/camel-imap4-provider.c:43
+msgid "Show only subscribed folders"
+msgstr "Näita ainult tellitud kaustu"
+
+#: camel/providers/imap4/camel-imap4-provider.c:45
+msgid "Override server-supplied folder namespace"
+msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
+
+#: camel/providers/imap4/camel-imap4-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:62
+msgid "Namespace"
+msgstr "Nimeruum"
+
+#: camel/providers/imap4/camel-imap4-provider.c:51
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
+
+#: camel/providers/imap4/camel-imap4-provider.c:57
+msgid "Automatically synchronize remote mail locally"
+msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
+
+#: camel/providers/imap4/camel-imap4-provider.c:64
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:66
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "E-posti loetakse ja hoitakse IMAP serveris."
+
+#: camel/providers/imap4/camel-imap4-provider.c:83
+#, fuzzy
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
+
+#: camel/providers/imap4/camel-imap4-store.c:203
+#: camel/providers/imap/camel-imap-store.c:421
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:205
+#: camel/providers/imap/camel-imap-store.c:423
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:250
+#: camel/providers/imap/camel-imap-store.c:533
+#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/nntp/camel-nntp-store.c:198
+#: camel/providers/nntp/camel-nntp-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:167
+#: camel/providers/pop3/camel-pop3-store.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:270
+#, fuzzy, c-format
+msgid "Could not connect to %s: %s"
+msgstr "Ei saa ühenduda %s (port: %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:236
+#: camel/providers/imap/camel-imap-store.c:534
+#: camel/providers/nntp/camel-nntp-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:256
+msgid "SSL unavailable"
+msgstr "SSL ei ole saadaval"
+
+#: camel/providers/imap4/camel-imap4-store.c:247
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:808
+#: camel/providers/imapp/camel-imapp-store.c:248
+#: camel/providers/nntp/camel-nntp-store.c:210
+#: camel/providers/nntp/camel-nntp-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:267
+msgid "Connection cancelled"
+msgstr "Ühendus katkestatud"
+
+#: camel/providers/imap4/camel-imap4-store.c:274
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-store.c:652
+#: camel/providers/imap/camel-imap-store.c:674
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Viga turvatud ühendumisel IMAP serveriga %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:275
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/pop3/camel-pop3-store.c:243
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "abiprogramm `%s' ebaõnnestus"
+
+#: camel/providers/imap4/camel-imap4-store.c:378
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:423
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:493
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:656
+#: camel/providers/imap4/camel-imap4-store.c:769
+#, fuzzy
+msgid "Cannot create IMAP folders in offline mode."
+msgstr "Sellise nimega kausta ei saa luua."
+
+#: camel/providers/imap4/camel-imap4-store.c:695
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-store.c:759
+#: camel/providers/imap/camel-imap-store.c:1861
+#: camel/providers/imap/camel-imap-store.c:2239
+#, fuzzy, c-format
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
+
+#: camel/providers/imap4/camel-imap4-store.c:817
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:823
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:855
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
+
+#: camel/providers/imap4/camel-imap4-store.c:862
+#, fuzzy
+msgid "Cannot delete IMAP folders in offline mode."
+msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
+
+#: camel/providers/imap4/camel-imap4-store.c:921
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:926
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:947
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: kaust on eritähenduslik"
+
+#: camel/providers/imap4/camel-imap4-store.c:954
+#, fuzzy
+msgid "Cannot rename IMAP folders in offline mode."
+msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:985
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:990
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1239
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1241
+msgid "Bad command"
+msgstr "Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1280
+#, fuzzy
+msgid "Cannot subscribe to IMAP folders in offline mode."
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1325
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1330
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1353
+#, fuzzy
+msgid "Cannot unsubscribe from IMAP folders in offline mode."
+msgstr "Ei saa loobuda kaustast `%s': Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1398
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' tellimisest ei saa loobuda: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:1403
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ei saa loobuda kaustast `%s': Puudulik käsk"
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap4/camel-imap4-summary.c:1266
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
+msgstr "Kontrollin muudetud sõnumite olemasolu"
+
+#: camel/providers/imap4/camel-imap4-summary.c:1290
+#, fuzzy
+msgid "Fetching envelopes for new messages"
+msgstr "Uute sõnumite kontroll"
+
+#: camel/providers/imap4/camel-imap4-utils.c:368
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:391
+msgid "No data"
+msgstr "Andmeid pole"
+
+#: camel/providers/imap4/camel-imap4-utils.c:574
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s katkestas ootamatult ühenduse: %s"
+
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3191
+#: camel/providers/imap/camel-imap-store.c:3200
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3203
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
-msgid "Unknown error"
-msgstr "Tundmatu viga"
-
 #  for imap ALERT codes, account user@host
 #  for imap ALERT codes, account user@host
 #. for imap ALERT codes, account user@host
@@ -10472,17 +11227,12 @@ msgstr "%s kokkuvõtet ei saa laadida"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust hävitati ja taasloodi serveris."
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
-msgstr "Kontrollin muudetud sõnumite olemasolu"
-
-#: camel/providers/imap/camel-imap-folder.c:1938
+#: camel/providers/imap/camel-imap-folder.c:1939
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumite ei saa vastu võtta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1975
+#: camel/providers/imap/camel-imap-folder.c:1979
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10491,199 +11241,156 @@ msgstr ""
 "Sõnumit %s ei saadud: \n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/local/camel-maildir-folder.c:245
+#: camel/providers/local/camel-mbox-folder.c:403
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:2017
-#: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:2021
+#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2283
-#: camel/providers/imap/camel-imap-folder.c:2353
+#: camel/providers/imap/camel-imap-folder.c:2287
+#: camel/providers/imap/camel-imap-folder.c:2357
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2464
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2469
+#: camel/providers/imap/camel-imap-folder.c:2472
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2482
+#: camel/providers/imap/camel-imap-folder.c:2485
 #, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2658
+#: camel/providers/imap/camel-imap-folder.c:2661
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:156
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Puhvermälu kausta ei saa avada: %s "
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap/camel-imap-message-cache.c:253
+#: camel/providers/imap/camel-imap-message-cache.c:310
+#: camel/providers/imap/camel-imap-message-cache.c:341
+#: camel/providers/imap/camel-imap-message-cache.c:373
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap/camel-imap-message-cache.c:418
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "%s puhverdamine ebaõnnestus: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43
+#: camel/providers/imap/camel-imap-provider.c:44
+#: mail/em-account-editor.c:2078
+#: mail/em-account-editor.c:2156
 msgid "Checking for New Mail"
 msgstr "Uute kirjade kontroll"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:46
+#, fuzzy
+msgid "C_heck for new messages in all folders"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:49
 msgid "Connection to Server"
 msgstr "Ühendus serveriga"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:51
 #, fuzzy
-msgid "Use custom command to connect to server"
+msgid "_Use custom command to connect to server"
 msgstr "Parool proxyserveriga ühendumiseks."
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:53
 msgid "Command:"
 msgstr "Käsk:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kaustad"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap4/camel-imap4-provider.c:42
-msgid "Show only subscribed folders"
+#: camel/providers/imap/camel-imap-provider.c:58
+#, fuzzy
+msgid "_Show only subscribed folders"
 msgstr "Näita ainult tellitud kaustu"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#: camel/providers/imap4/camel-imap4-provider.c:44
-msgid "Override server-supplied folder namespace"
+#: camel/providers/imap/camel-imap-provider.c:60
+#, fuzzy
+msgid "O_verride server-supplied folder namespace"
 msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-#: camel/providers/imap4/camel-imap4-provider.c:46
-msgid "Namespace"
-msgstr "Nimeruum"
-
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
-#: camel/providers/imap/camel-imap-provider.c:76
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Check new messages for _Junk contents"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:70
+#, fuzzy
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "Rämpssõnumeid kontrollitakse ainult sisendkaustas"
+
+#: camel/providers/imap/camel-imap-provider.c:72
+#, fuzzy
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
+
+#: camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:78
+#: camel/providers/imap/camel-imap-provider.c:81
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:177
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:179
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ei saa ühenduda %s (port: %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL ei ole saadaval"
-
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:227
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Ühendus katkestatud"
-
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:282
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Viga turvatud ühendumisel IMAP serveriga %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:233
-msgid "SSL/TLS extension not supported."
-msgstr "SSL/TLS laiend ei ole toetatud."
-
-#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:274
+#: camel/providers/imap/camel-imap-store.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:323
 #, fuzzy
-msgid "SSL negotiations failed"
-msgstr "abiprogramm `%s' ebaõnnestus"
+msgid "STARTTLS not supported"
+msgstr "SSL/TLS laiend ei ole toetatud."
 
-#: camel/providers/imap/camel-imap-store.c:844
+#: camel/providers/imap/camel-imap-store.c:811
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1268
+#: camel/providers/imap/camel-imap-store.c:1245
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1255
+#: camel/providers/smtp/camel-smtp-transport.c:489
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1301
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/imapp/camel-imapp-store.c:364
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1315
+#: camel/providers/imap/camel-imap-store.c:1292
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1344
+#: camel/providers/imap/camel-imap-store.c:1321
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10694,271 +11401,40 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1863
-#: camel/providers/imap/camel-imap-store.c:2053
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2033
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:764
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
-
-#: camel/providers/imap/camel-imap-store.c:1939
-#: camel/providers/imap/camel-imap-store.c:2320
+#: camel/providers/imap/camel-imap-store.c:1919
+#: camel/providers/imap/camel-imap-store.c:2300
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:139
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
+#: camel/providers/imap/camel-imap-store.c:1974
+#: camel/providers/local/camel-maildir-store.c:140
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mh-store.c:237
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/providers/imap/camel-imap-store.c:2270
+#: camel/providers/imap/camel-imap-store.c:2250
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu ülemkaust: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Tõrge käsu saatmisel IMAP serverisse %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:656
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ootamatu vastus IMAP serverilt %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:230
-#, fuzzy, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ootamatu vastus IMAP serverilt: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:414
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-engine.c:420
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1401
-#: camel/providers/imap4/camel-imap4-engine.c:1431
-#: camel/providers/imap4/camel-imap4-engine.c:1463
-#: camel/providers/imap4/camel-imap4-engine.c:1505
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Ühendus IMAP4 serverisse %s suleti ootamatult: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:359
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
-
-#: camel/providers/imap4/camel-imap4-folder.c:365
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:502
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr ""
-"Kirjeldatud kausta loomine nurjus:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:697
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Ei saa võtta sõnumit %s kaustast `%s': sellist sõnumit ei ole"
-
-#: camel/providers/imap4/camel-imap4-folder.c:702
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Ei saa võtta sõnumit %s kaustast `%s': Vigane käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:827
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
-
-#: camel/providers/imap4/camel-imap4-folder.c:856
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:935
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-folder.c:939
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:951
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "E-posti loetakse ja hoitakse IMAP serveris."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
-
-#: camel/providers/imap4/camel-imap4-store.c:257
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Turvaline ühendumine IMAP serveriss %s nurjus: Server ei toeta STARTTLS'i"
-
-#: camel/providers/imap4/camel-imap4-store.c:363
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:408
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:478
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:701
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-store.c:815
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:852
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
-
-#: camel/providers/imap4/camel-imap4-store.c:911
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:916
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:936
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: kaust on eritähenduslik"
-
-#: camel/providers/imap4/camel-imap4-store.c:968
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:973
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1221
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1223
-msgid "Bad command"
-msgstr "Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1299
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1304
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1364
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' tellimisest ei saa loobuda: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:1369
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Ei saa loobuda kaustast `%s': Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-utils.c:250
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ootamatu vastus IMAP serverilt: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:273
-msgid "No data"
-msgstr "Andmeid pole"
-
-#: camel/providers/imap4/camel-imap4-utils.c:456
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s katkestas ootamatult ühenduse: %s"
-
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/imapp/camel-imapp-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Sõnumite säilitamine"
 
-#: camel/providers/imapp/camel-imapp-provider.c:47
+#: camel/providers/imapp/camel-imapp-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:49
+#: camel/providers/imapp/camel-imapp-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -10966,12 +11442,16 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Eksperimentaalne IMAP 4(.1) klient\n"
-"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist "
-"imap'i.\n"
+"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist imap'i.\n"
 "\n"
 " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:328
+#: camel/providers/imapp/camel-imapp-store.c:251
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "Ei saa ühenduda %s (port: %d): %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ei saa luua ühendust POP serveriga %s"
@@ -10982,139 +11462,135 @@ msgstr ""
 
 #  $HOME relative path + protocol string
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:391
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #  /var/spool/mail relative path + protocol
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
 #: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:398
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postkast:%s (%s)"
 
 #  a full path + protocol
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:402
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "Kasuta `.folders' kaustakokkuvõttefaili (exmh)"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "MH-vormingus postikataloogid"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
 # !PARANDA! - no kuidas siis tõlkida?
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Kohalik postijagaja"
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
+msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
 msgstr "Kohalikku e-posti võetakse standardsest \"mbox\" vorminguga puhvrist"
 
-#: camel/providers/local/camel-local-provider.c:77
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "Rakenda filtreid Sisendkasti uutele sõnumitele"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "\"Maildir\" vormingus postikataloog"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
 
-#: camel/providers/local/camel-local-provider.c:95
+#: camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Salvesta olekupäised Elm/Pine/Mutt vormingus"
 
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:108
 #, fuzzy
 msgid "Standard Unix mbox spool or directory"
 msgstr "Standardne Unix'i \"mbox\" puhver"
 
-#: camel/providers/local/camel-local-provider.c:102
+#: camel/providers/local/camel-local-provider.c:109
 #, fuzzy
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr ""
-"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
-"puhverfailides"
+msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga puhverfailides"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:355
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:254
+#: camel/providers/local/camel-mbox-store.c:353
+#: camel/providers/local/camel-spool-store.c:117
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Hoidla juurikas %s ei ole absoluutne tee"
 
-#: camel/providers/local/camel-local-store.c:149
+#: camel/providers/local/camel-local-store.c:150
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Fail '%s' ei ole tavaline fail ega kataloog."
 
-#: camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:264
+#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:167
+#: camel/providers/local/camel-local-store.c:265
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kausta `%s' ei saadud: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:179
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:224
+#: camel/providers/local/camel-local-store.c:225
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:333
+#: camel/providers/local/camel-local-store.c:334
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:399
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ei saa ümber nimetada '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:423
-#: camel/providers/local/camel-mbox-store.c:284
+#: camel/providers/local/camel-local-store.c:424
+#: camel/providers/local/camel-mbox-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kausta kokkuvõttefaili `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-local-store.c:433
-#: camel/providers/local/camel-mbox-store.c:296
+#: camel/providers/local/camel-local-store.c:434
+#: camel/providers/local/camel-mbox-store.c:294
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kausta indeksfaili `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-local-store.c:456
-#: camel/providers/local/camel-mbox-store.c:320
+#: camel/providers/local/camel-local-store.c:457
+#: camel/providers/local/camel-mbox-store.c:318
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Kausta üldistusfaili `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-local-summary.c:405
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
@@ -11125,33 +11601,36 @@ msgstr "Sõnumite ei saa lisada kokkuvõttesse: tundmatu põhjus"
 
 #  Inbox is always first
 #. Inbox is always first
-#: camel/providers/local/camel-maildir-folder.c:74
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:248
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: camel/providers/local/camel-maildir-folder.c:75
+#: camel/providers/local/camel-maildir-store.c:233
+#: camel/providers/local/camel-maildir-store.c:249
+#: camel/providers/local/camel-spool-store.c:452
+#: mail/em-folder-tree-model.c:212
+#: mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:138
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: camel/providers/local/camel-maildir-folder.c:214
+#: camel/providers/local/camel-maildir-folder.c:215
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:243
-#: camel/providers/local/camel-maildir-folder.c:257
-#: camel/providers/local/camel-maildir-folder.c:266
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mbox-folder.c:436
-#: camel/providers/local/camel-mbox-folder.c:467
-#: camel/providers/local/camel-mbox-folder.c:475
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-maildir-folder.c:258
+#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-mbox-folder.c:402
+#: camel/providers/local/camel-mbox-folder.c:421
+#: camel/providers/local/camel-mbox-folder.c:452
+#: camel/providers/local/camel-mbox-folder.c:460
+#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -11160,283 +11639,283 @@ msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "Vigane sõnumi sisu"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:204
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kausta `%s' ei saadud: %s"
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:211
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-maildir-store.c:121
-#: camel/providers/local/camel-mbox-store.c:184
-#: camel/providers/local/camel-mbox-store.c:196
+#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:194
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Kausta `%s' ei saa luua: %s"
 
-#: camel/providers/local/camel-maildir-store.c:136
+#: camel/providers/local/camel-maildir-store.c:137
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-maildir-store.c:175
-#: camel/providers/local/camel-maildir-store.c:213
-#: camel/providers/local/camel-mh-store.c:260
+#: camel/providers/local/camel-maildir-store.c:176
+#: camel/providers/local/camel-maildir-store.c:214
+#: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kausta `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-maildir-store.c:177
+#: camel/providers/local/camel-maildir-store.c:178
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:355
-#: camel/providers/local/camel-spool-store.c:284
-#: camel/providers/local/camel-spool-store.c:314
+#: camel/providers/local/camel-maildir-store.c:356
+#: camel/providers/local/camel-spool-store.c:319
+#: camel/providers/local/camel-spool-store.c:333
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kausta `%s' ei saa läbi vaadata: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:419
-#: camel/providers/local/camel-maildir-summary.c:550
+#: camel/providers/local/camel-maildir-summary.c:425
+#: camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ei saa avada Maildir kataloogi %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:543
+#: camel/providers/local/camel-maildir-summary.c:549
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "%1: kausta sobivuse kontroll"
 
-#: camel/providers/local/camel-maildir-summary.c:646
+#: camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "Uute sõnumite kontroll"
 
-#: camel/providers/local/camel-maildir-summary.c:735
-#: camel/providers/local/camel-mbox-summary.c:369
-#: camel/providers/local/camel-mbox-summary.c:542
-#: camel/providers/local/camel-mbox-summary.c:633
-#: camel/providers/local/camel-spool-summary.c:137
+#: camel/providers/local/camel-maildir-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:416
+#: camel/providers/local/camel-mbox-summary.c:589
+#: camel/providers/local/camel-mbox-summary.c:680
+#: camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
 msgstr "Kausta salvestamine"
 
-#: camel/providers/local/camel-mbox-folder.c:225
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:210
+#: camel/providers/local/camel-spool-folder.c:176
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:284
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ei saa avada kirjakasti: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:344
+#: camel/providers/local/camel-mbox-folder.c:329
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Postitamine katkestati!!!"
 
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:332
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:468
+#: camel/providers/local/camel-mbox-folder.c:453
 #, fuzzy
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: camel/providers/local/camel-mbox-folder.c:476
-#: camel/providers/local/camel-mh-folder.c:222
+#: camel/providers/local/camel-mbox-folder.c:461
+#: camel/providers/local/camel-mh-folder.c:223
 #, fuzzy
 msgid "Message construction failed."
 msgstr "Sõnumi kokkupanek ebaõnnestus: Rikutud kirjakast?"
 
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:174
+#: camel/providers/local/camel-mbox-store.c:359
 msgid "Cannot create a folder by this name."
 msgstr "Sellise nimega kausta ei saa luua."
 
-#: camel/providers/local/camel-mbox-store.c:206
+#: camel/providers/local/camel-mbox-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-mbox-store.c:236
-#: camel/providers/local/camel-mbox-store.c:247
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-mbox-store.c:234
+#: camel/providers/local/camel-mbox-store.c:245
+#: camel/providers/local/camel-mbox-store.c:268
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr "Kataloogi %s ei saa kustutada: %s"
 
-#: camel/providers/local/camel-mbox-store.c:255
+#: camel/providers/local/camel-mbox-store.c:253
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavaline fail."
 
-#: camel/providers/local/camel-mbox-store.c:262
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:372
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kataloogi %s ei saa luua: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:386
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kausta %s ei saa luua: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:388
 msgid "Folder already exists"
 msgstr "Kaust juba eksisteerib"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:470
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Uus failinimi on tühi!"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:483
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ei saa ümber nimetada '%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:558
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:375
+#: camel/providers/local/camel-mbox-summary.c:422
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kausta %s ei saa avada: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:423
+#: camel/providers/local/camel-mbox-summary.c:470
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:479
+#: camel/providers/local/camel-mbox-summary.c:526
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:547
-#: camel/providers/local/camel-mbox-summary.c:638
-#: camel/providers/local/camel-spool-summary.c:142
+#: camel/providers/local/camel-mbox-summary.c:594
+#: camel/providers/local/camel-mbox-summary.c:685
+#: camel/providers/local/camel-spool-summary.c:145
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Faili %s ei saa avada: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:559
-#: camel/providers/local/camel-spool-summary.c:162
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:165
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:572
-#: camel/providers/local/camel-mbox-summary.c:736
+#: camel/providers/local/camel-mbox-summary.c:619
+#: camel/providers/local/camel-mbox-summary.c:783
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ei saa sulgeda ajutist kausta %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:581
+#: camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ajutist kausta ei saa sulgeda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kataloogi ei saa ümber nimetada : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:676
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-mbox-summary.c:877
-#: camel/providers/local/camel-mbox-summary.c:885
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:731
+#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:933
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Kokkuvõtte ja kausta ebavõrdlus, isegi peale sünkroniseerimist"
 
-#: camel/providers/local/camel-mbox-summary.c:811
-#: camel/providers/local/camel-spool-summary.c:334
+#: camel/providers/local/camel-mbox-summary.c:859
+#: camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:846
+#: camel/providers/local/camel-mbox-summary.c:894
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kausta ei saa salvestada: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:940
-#: camel/providers/local/camel-mbox-summary.c:966
+#: camel/providers/local/camel-mbox-summary.c:988
+#: camel/providers/local/camel-mbox-summary.c:1014
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:957
+#: camel/providers/local/camel-mbox-summary.c:1005
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine ebaõnnestus: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:219
+#: camel/providers/local/camel-mh-store.c:220
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
 msgstr ""
 "Ei suuda luua kataloogi %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mh-store.c:231
+#: camel/providers/local/camel-mh-store.c:232
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-mh-summary.c:244
+#: camel/providers/local/camel-mh-summary.c:247
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ei saa avada MH kataloogi: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:122
+#: camel/providers/local/camel-spool-store.c:123
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:134
+#: camel/providers/local/camel-spool-store.c:135
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Faili '%s' ei ole olemas või see pole tavaline fail."
 
-#: camel/providers/local/camel-spool-store.c:153
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kausta '%s/%s' ei eksisteeri."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11445,12 +11924,12 @@ msgstr ""
 "Kausta %s ei saa avada:\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:167
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kataloogi '%s' ei eksisteeri."
 
-#: camel/providers/local/camel-spool-store.c:172
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11459,50 +11938,50 @@ msgstr ""
 "Kausta %s ei saa luua:\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:180
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' ei ole kirjakasti fail."
 
-#: camel/providers/local/camel-spool-store.c:197
+#: camel/providers/local/camel-spool-store.c:198
 #, fuzzy
 msgid "Store does not support an INBOX"
 msgstr "Terminal ei toeta värve"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:225
+#: camel/providers/local/camel-spool-store.c:226
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Soovisid kustutada faili '%1', aga seda ei leitud."
 
-#: camel/providers/local/camel-spool-summary.c:175
-#: camel/providers/local/camel-spool-summary.c:185
-#: camel/providers/local/camel-spool-summary.c:195
+#: camel/providers/local/camel-spool-summary.c:178
+#: camel/providers/local/camel-spool-summary.c:188
+#: camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:211
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:242
-#: camel/providers/local/camel-spool-summary.c:261
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:245
+#: camel/providers/local/camel-spool-summary.c:264
+#: camel/providers/local/camel-spool-summary.c:277
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -11510,7 +11989,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:1144
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Palun sisesta NNTP parool %s@%s jaoks"
@@ -11527,49 +12006,25 @@ msgstr "Kasutajanime saatmine serverisse ebaõnnestus"
 msgid "Server rejected username/password"
 msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
 
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"Sõnumit %s ei saadud: \n"
-"  %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Kasutaja tühistas"
-
-#: camel/providers/nntp/camel-nntp-folder.c:176
-#: camel/providers/nntp/camel-nntp-folder.c:208
+#: camel/providers/nntp/camel-nntp-folder.c:177
+#: camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Sisemine viga: uid on vigases vormingus: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:328
-#: camel/providers/nntp/camel-nntp-folder.c:331
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#: camel/providers/nntp/camel-nntp-folder.c:375
+#: camel/providers/nntp/camel-nntp-folder.c:329
+#: camel/providers/nntp/camel-nntp-folder.c:332
+#: camel/providers/nntp/camel-nntp-folder.c:374
+#: camel/providers/nntp/camel-nntp-folder.c:376
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Postitamine nurjus: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:393
+#: camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Sõnumeid ei saa NNTP kaustast kopeerida!"
 
@@ -11588,148 +12043,144 @@ msgstr ""
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#: camel/providers/nntp/camel-nntp-provider.c:44
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näita kaustasid lühendatult (comp.os.linux asemel c.o.linux)"
 
-#: camel/providers/nntp/camel-nntp-provider.c:45
+#: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:52
+#: camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENETi uudised"
 
-#: camel/providers/nntp/camel-nntp-provider.c:54
+#: camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:73
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+#: camel/providers/nntp/camel-nntp-provider.c:74
+msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP käsk ebaõnnestus: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:232
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:244
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s tagastas veakoodi %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:420
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENETi uudised üle %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
+#: camel/providers/nntp/camel-nntp-store.c:799
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
-msgstr "Viga uudistegrupi vastuvõtmisel:\n"
+msgstr ""
+"Viga uudistegrupi vastuvõtmisel:\n"
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
+#: camel/providers/nntp/camel-nntp-store.c:893
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: camel/providers/nntp/camel-nntp-store.c:925
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:929
+#: camel/providers/nntp/camel-nntp-store.c:950
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:937
+#: camel/providers/nntp/camel-nntp-store.c:958
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:945
+#: camel/providers/nntp/camel-nntp-store.c:966
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1118
+#: camel/providers/nntp/camel-nntp-store.c:1136
 #, fuzzy
-msgid "Authentication requested but not username provided"
+msgid "Authentication requested but no username provided"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/nntp/camel-nntp-store.c:1146
+#: camel/providers/nntp/camel-nntp-store.c:1148
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Ei saa autentida serverisse: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1262
+#: camel/providers/nntp/camel-nntp-store.c:1264
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP käsk ebaõnnestus: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:1320
 #, fuzzy
 msgid "Not connected."
 msgstr "Ühendus puudub."
 
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:1373
 #, c-format
 msgid "No such folder: %s"
 msgstr "Kausta ei leitud: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
+#: camel/providers/nntp/camel-nntp-summary.c:221
+#: camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: uute kirjade skannimine"
 
-#: camel/providers/nntp/camel-nntp-summary.c:225
+#: camel/providers/nntp/camel-nntp-summary.c:228
 #, fuzzy, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:328
+#: camel/providers/nntp/camel-nntp-summary.c:331
 #, fuzzy, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:368
+#: camel/providers/nntp/camel-nntp-summary.c:371
 #, fuzzy
 msgid "Use cancel"
 msgstr "Katkestada avamine?"
 
-#: camel/providers/nntp/camel-nntp-summary.c:370
+#: camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operatsioon ebaõnnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:246
+#: camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Võtan vastu POP kokkuvõtet"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ei saa võtta POP kokkuvõtet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "Hävitan kustutatud sõnumid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:405
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "[Elemendid ]omaniku UID-ga \"%s\""
@@ -11739,105 +12190,96 @@ msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 #  Sigh, most of the crap in this function is so that the cancel button
 #  returns the proper exception code.  Sigh.
 #. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP sõnumi %d vastuvõtt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
-#: composer/e-msg-composer.c:1231
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1254
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "Jäta sõnumid serverisse"
 
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Kustuta %s päeva möödumisel"
 
-#: camel/providers/pop3/camel-pop3-provider.c:46
+#: camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "Keela kõigi POP3 laienduste toetus"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:56
+#: camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "E-posti laetakse alla POP serverist"
 
-#: camel/providers/pop3/camel-pop3-provider.c:73
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus "
-"valik, mida toetavad paljud POP serverid."
+#: camel/providers/pop3/camel-pop3-provider.c:74
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus valik, mida toetavad paljud POP serverid."
 
-#: camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+#: camel/providers/pop3/camel-pop3-provider.c:84
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:195
+#: camel/providers/pop3/camel-pop3-store.c:202
 #, fuzzy, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Ei saa ühenduda %s (port: %d): %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
-msgstr ""
+msgid "Failed to read a valid greeting from POP server %s"
+msgstr "Ootamatu vastus IMAP serverilt: %s"
 
+#: camel/providers/pop3/camel-pop3-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:261
-#: camel/providers/pop3/camel-pop3-store.c:273
+#: camel/providers/pop3/camel-pop3-store.c:242
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:216
+#, fuzzy
+msgid "STLS not supported"
+msgstr "SSL/TLS laiend ei ole toetatud."
+
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ei saa luua ühendust POP serveriga %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:428
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s'  Sisselogimine POP serverisse %s ebaõnnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP serverisse %s ei saa sisse logida: SASL protokolli viga"
 
-#: camel/providers/pop3/camel-pop3-store.c:459
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentimine POP serverisse %s nurjus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:485
+#: camel/providers/pop3/camel-pop3-store.c:468
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:536
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11846,7 +12288,7 @@ msgstr ""
 "Ei saa luua ühendust POP serveriga %s.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:530
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11855,210 +12297,202 @@ msgstr ""
 "Ei saa luua ühendust POP serveriga %s.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:652
+#: camel/providers/pop3/camel-pop3-store.c:635
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:132
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:113
+#: camel/providers/sendmail/camel-sendmail-transport.c:114
 #, fuzzy
 msgid "Could not parse recipient list"
 msgstr "%s: Ei õnnestu lugeda autoriseerimisnimekirja"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:144
+#: camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:205
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Sõnumit ei saa saata: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:233
+#: camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail lõpetas töö signaaliga %s: sõnumit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:240
+#: camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ei saa käivitada %s: sõnumit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail lõpetas töö staatusega %d: sõnumit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:39
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Viga süntaksis, tundmatu käsk"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Süntaksi viga parameetrites või argumentides"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Käsku ei ole veel teostatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Käsu parameeter ei ole veel teostatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Abiteade"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Teenus on valmis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Teenus sulgeb ülekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Teenus ei ole saadaval, sulgen ülekandekanali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Nõutud kirjategevus korras, lõpetatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Nõutud kirjategevust ei tehtud: kirjakast ei ole saadaval"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Nõutud tegevust ei tehtud: kirjakast ei ole saadaval"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Nõutud tegevus nurjatud: viga töötlemisel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:199
 #, fuzzy
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Nõutud kirjategevust ei tehtud: kirjakast ei ole saadaval"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Tehing ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Vana parool pole õige"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Autentimismehhanism on liiga nõrk"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Ajutine autentimise tõrge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid "Welcome response error"
 msgstr "Tervitusvastuse viga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ei saa luua turvalist ühendust SMTP serveriga %s: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "server does not appear to support SSL"
-msgstr "tundub, et  server ei toeta SSL'i"
-
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:331
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:346
 msgid "STARTTLS command failed"
 msgstr "STARTTLS käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:479
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -12069,34 +12503,34 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:657
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:659
+#: camel/providers/smtp/camel-smtp-transport.c:662
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:680
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:683
+#: camel/providers/smtp/camel-smtp-transport.c:686
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:690
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:716
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Sõnumit ei saa saata: saajate aadressid on määramata."
@@ -12105,59 +12539,59 @@ msgstr "Sõnumit ei saa saata: saajate aadressid on määramata."
 msgid "SMTP Greeting"
 msgstr "SMTP Tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:911
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:928
 msgid "HELO command failed"
 msgstr "HELO käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:994
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1028
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1034
 msgid "AUTH command failed"
 msgstr "AUTH käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM käsk ebaõnnestus: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1138
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1185
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO käsk ebaõnnestus: %s: meil jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1204
+#: camel/providers/smtp/camel-smtp-transport.c:1181
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1220
+#: camel/providers/smtp/camel-smtp-transport.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
@@ -12165,69 +12599,68 @@ msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
 #  we should have gotten instructions on how to use the DATA command:
 #  * 354 Enter mail, end with "." on a line by itself
 #. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1313
 msgid "DATA command failed"
 msgstr "DATA käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1375
+#: camel/providers/smtp/camel-smtp-transport.c:1352
 msgid "RSET command failed"
 msgstr "RSET käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1412
+#: camel/providers/smtp/camel-smtp-transport.c:1389
 msgid "QUIT command failed"
 msgstr "QUIT käsk ebaõnnestus"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
+#: composer/e-msg-composer-attachment-bar.c:293
+#: mail/em-utils.c:436
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:454
-msgid "Remove selected items from the attachment list"
-msgstr "Eemalda valitud kirjed manuste nimekirjast"
+#  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: composer/e-msg-composer-attachment-bar.c:441
+#: mail/em-folder-tree.c:2750
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Omadused"
 
-#: composer/e-msg-composer-attachment-bar.c:494
-msgid "Add attachment..."
+#: composer/e-msg-composer-attachment-bar.c:443
+#, fuzzy
+msgid "_Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:495
-msgid "Attach a file to the message"
-msgstr "Faili manustamine sõnumile"
-
-#: composer/e-msg-composer-attachment.c:173
-#: composer/e-msg-composer-attachment.c:189
+#: composer/e-msg-composer-attachment.c:174
+#: composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ei saa lisada faili manusesse: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
@@ -12245,11 +12678,106 @@ msgid "MIME type:"
 msgstr "MIME tüüp:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:92
-#: composer/e-msg-composer-select-file.c:111
+#: composer/e-msg-composer-select-file.c:93
+#: composer/e-msg-composer-select-file.c:112
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
+#: composer/e-msg-composer.c:727
+#, fuzzy
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
+
+#: composer/e-msg-composer.c:734
+#, fuzzy
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Could not open file"
+msgstr "Faili avamine ebaõnnestus"
+
+#: composer/e-msg-composer.c:1299
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Sõnumi vastuvõtmine nurjus"
+
+#: composer/e-msg-composer.c:1569
+msgid "Untitled Message"
+msgstr "Pealkirjata sõnum"
+
+#: composer/e-msg-composer.c:1599
+msgid "Open file"
+msgstr "Ava fail"
+
+#: composer/e-msg-composer.c:2006
+#: mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623
+#: mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "Automaatselt genereeritud"
+
+#: composer/e-msg-composer.c:2105
+#, fuzzy
+msgid "Si_gnature:"
+msgstr "Allkiri:"
+
+#: composer/e-msg-composer.c:2315
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2344
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba peitmine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2347
+#: composer/e-msg-composer.c:3468
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba kuvamine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2364
+#: composer/e-msg-composer.c:3357
+#: composer/e-msg-composer.c:3358
+msgid "Compose a message"
+msgstr "Sõnumi koostamine"
+
+#: composer/e-msg-composer.c:2673
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Edastatud sõnum - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2678
+#: composer/e-msg-composer.c:2841
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Originaalsõnumi manustamine"
+msgstr[1] "Originaalsõnumi manustamine"
+
+#: composer/e-msg-composer.c:2904
+#: mail/em-folder-tree.c:1029
+#: mail/em-folder-tree.c:2247
+#: mail/em-folder-view.c:823
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Liiguta"
+
+#: composer/e-msg-composer.c:2906
+#: mail/em-folder-tree.c:1031
+#: mail/message-list.c:1715
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Lohistamise pide"
+
+#: composer/e-msg-composer.c:4538
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgstr ""
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
@@ -12263,55 +12791,49 @@ msgstr "Sõnumi postitamine avalikku kausta"
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
-#.
 #. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
 #: composer/e-msg-composer-hdrs.c:577
-msgid "Reply-To:"
+#, fuzzy
+msgid "_Reply-To:"
 msgstr "Vastus:"
 
-#.
 #. * From
-#.
-#: composer/e-msg-composer-hdrs.c:583
-msgid "From:"
+#: composer/e-msg-composer-hdrs.c:584
+#, fuzzy
+msgid "Fr_om:"
 msgstr "Saatja:"
 
-#.
 #. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:589
-msgid "Subject:"
+#: composer/e-msg-composer-hdrs.c:591
+#, fuzzy
+msgid "S_ubject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:598
-msgid "To:"
+#: composer/e-msg-composer-hdrs.c:601
+#, fuzzy
+msgid "_To:"
 msgstr "Kellele:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:602
-msgid "Cc:"
+#: composer/e-msg-composer-hdrs.c:605
+#, fuzzy
+msgid "_Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: composer/e-msg-composer-hdrs.c:606
 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:606
-msgid "Bcc:"
+#: composer/e-msg-composer-hdrs.c:609
+#, fuzzy
+msgid "_Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:607
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+#: composer/e-msg-composer-hdrs.c:610
+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 pimekoopiad."
 
 #  * Post-To
@@ -12321,99 +12843,31 @@ msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 #  * Post-To
 #  * Post-To
 #  * Post-To
-#.
 #. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:617
 #, fuzzy
-msgid "Post To:"
+msgid "_Post To:"
 msgstr "Postita gruppi "
 
-#: composer/e-msg-composer-hdrs.c:619
+#: composer/e-msg-composer-hdrs.c:622
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: composer/e-msg-composer-select-file.c:186
-msgid "Attach file(s)"
-msgstr "Faili(de) manustamine"
-
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
-
-#: composer/e-msg-composer.c:1268
-#, fuzzy
-msgid "Could not open file"
-msgstr "Faili avamine ebaõnnestus"
-
-#: composer/e-msg-composer.c:1276
+#  * Post-To
+#  * Post-To
+#  * Post-To
+#  * Post-To
+#  * Post-To
+#  * Post-To
+#  * Post-To
+#: composer/e-msg-composer-hdrs.c:628
 #, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "Sõnumi vastuvõtmine nurjus"
-
-#: composer/e-msg-composer.c:1546
-msgid "Untitled Message"
-msgstr "Pealkirjata sõnum"
-
-#: composer/e-msg-composer.c:1576
-msgid "Open file"
-msgstr "Ava fail"
-
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automaatselt genereeritud"
-
-#: composer/e-msg-composer.c:2082
-msgid "Signature:"
-msgstr "Allkiri:"
-
-#: composer/e-msg-composer.c:2283
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2312
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "_Manuseriba peitmine (tõsta manused siia)"
-
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "_Manuseriba kuvamine (tõsta manused siia)"
-
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
-#: composer/e-msg-composer.c:3164
-msgid "Compose a message"
-msgstr "Sõnumi koostamine"
-
-#: composer/e-msg-composer.c:2634
-#, fuzzy, c-format
-msgid "Attached message - %s"
-msgstr "Edastatud sõnum - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
-#, fuzzy, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Originaalsõnumi manustamine"
-msgstr[1] "Originaalsõnumi manustamine"
+msgid "Post To:"
+msgstr "Postita gruppi "
 
-#: composer/e-msg-composer.c:4341
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
+#: composer/e-msg-composer-select-file.c:187
+msgid "Attach file(s)"
+msgstr "Faili(de) manustamine"
 
 #  mail-composer:no-attach primary
 #. mail-composer:no-attach primary
@@ -12435,9 +12889,7 @@ msgstr "Katalooge ei saa sõnumeile manustada."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
 #  mail-composer:no-build-message primary
@@ -12448,14 +12900,11 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr "Sõnumit ei saa luua."
 
 #. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: composer/mail-composer-errors.xml.h:42
+#: mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Kuna \"{1}\"."
@@ -12478,9 +12927,7 @@ msgstr ""
 
 #. mail-composer:recover-autosave secondary
 #: composer/mail-composer-errors.xml.h:20
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.h:21
@@ -12503,9 +12950,7 @@ msgstr "Ajutisse faili kirjutamine ei õnnestunud."
 #: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-"Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" "
-"üldse teha."
+msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
 
 #. mail-composer:exit-unsaved title
 #: composer/mail-composer-errors.xml.h:28
@@ -12516,22 +12961,23 @@ msgstr "Hoiatus: salvestamata sõnum"
 #  mail-composer:exit-unsaved primary
 #. mail-composer:exit-unsaved primary
 #: composer/mail-composer-errors.xml.h:30
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr ""
 
 #  mail-composer:exit-unsaved secondary
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:32
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
 msgstr ""
 
+#: composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "Loobu muudatustest"
+
 #: composer/mail-composer-errors.xml.h:34
-msgid "Save Message"
+#, fuzzy
+msgid "_Save Message"
 msgstr "Salvesta sõnum"
 
 #  mail-composer:no-build-message primary
@@ -12566,7 +13012,6 @@ msgstr ""
 
 #  mail-composer:no-build-message primary
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
@@ -12582,11 +13027,11 @@ msgstr ""
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1
+#: shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -12620,8 +13065,7 @@ msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
@@ -12661,10 +13105,8 @@ msgstr "<b>E-posti saatmine:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -12692,12 +13134,10 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:265
+#: e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12706,15 +13146,21 @@ msgstr ""
 "Kirjutada üle?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:269
+#: widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: e-util/e-passwords.c:460
+#: e-util/eggtrayicon.c:119
+#, fuzzy
+msgid "The orientation of the tray."
+msgstr "Manuse kirjeldus."
+
+#: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: e-util/e-passwords.c:461
+#: e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 
@@ -12731,10 +13177,8 @@ msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 #  strftime format of a weekday, a date and a
 #  time, in 12-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:185
+#: e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -12743,17 +13187,14 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  strftime format of a weekday, a date and a
 #  time, in 24-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #  strptime format of a weekday, a date and a time,
 #  in 12-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -12761,7 +13202,6 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  strptime format of a weekday, a date and a time,
 #  in 24-hour format, without minutes or seconds.
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y"
@@ -12785,7 +13225,6 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 #  strptime format of a date and a time, in 12-hour format,
 #  without seconds.
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
 #: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -12795,7 +13234,6 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  strptime format of a date and a time, in 24-hour format,
 #  without seconds.
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
 #: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
@@ -12805,7 +13243,6 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 #  strptime format of a date and a time, in 12-hour format,
 #  without minutes or seconds.
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
 #: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -12815,7 +13252,6 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  strptime format of a date and a time, in 24-hour format,
 #  without minutes or seconds.
 #. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
 #: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y"
@@ -12825,33 +13261,30 @@ msgstr "%d.%m.%Y"
 #  strptime format for a time of day, in 12-hour format.
 #  strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:339
+#: e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:348
+#: e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1431
+#: widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1428
+#: widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12861,59 +13294,60 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "teine"
-msgstr[1] "teine"
+msgstr[0] "1 sekund tagasi"
+msgstr[1] "%d sekundit tagasi"
 
 #: filter/filter-datespec.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "10 minutit"
-msgstr[1] "10 minutit"
+msgstr[0] "1 minut tagasi"
+msgstr[1] "%d minutit tagasi"
 
 #: filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 tund tagasi"
+msgstr[1] "%d tundi tagasi"
 
 #: filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 päev tagasi"
+msgstr[1] "%d päeva tagasi"
 
 #: filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 nädal tagasi"
+msgstr[1] "%d päeva tagasi"
 
 #: filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 kuu tagasi"
+msgstr[1] "%d kuud tagasi"
 
 #: filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 aasta tagasi"
+msgstr[1] "%d aastat tagasi"
 
 #: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid "now"
 msgstr "praegu"
 
@@ -12944,8 +13378,8 @@ msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: filter/filter-errors.xml.h:8
+#: filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
@@ -12966,8 +13400,8 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#: filter/filter-errors.xml.h:18
+#: mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -12990,77 +13424,6 @@ msgstr "Palun vali mõni teine nimi."
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
-msgid "Important"
-msgstr "Tähtis"
-
-#  forest green
-#  forest green
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
-msgstr "Ülesanne"
-
-#  blue
-#  blue
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Hiljem"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Reegli nimi:"
-
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>kui</b>"
-
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "kui kõik tingimused on täidetud"
-
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "kui üks tingimustest on täidetud"
-
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Tegevused viiakse täide"
-
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Kõik seonduvad"
-
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Vastused"
-
-#: filter/filter-rule.c:877
-#, fuzzy
-msgid "Replies and parents"
-msgstr "_Tekst ja ikoon"
-
-#: filter/filter-rule.c:879
-#, fuzzy
-msgid "Include threads"
-msgstr "_Loetud teemalõngad:"
-
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "sissetulev"
-
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "väljaminev"
-
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filtri reeglid</b>"
@@ -13070,10 +13433,15 @@ msgid "Compare against"
 msgstr "Võrdle"
 
 #: filter/filter.glade.h:3
+#: filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "Sissetulev"
 
 #: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr ""
+
+#: filter/filter.glade.h:5
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -13082,7 +13450,7 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -13092,7 +13460,7 @@ msgstr ""
 "mis on suhteline filtri käivitamise hetkega.\n"
 "Näiteks: 2 nädalat tagasi"
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:9
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -13101,34 +13469,112 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:13
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:17
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:18
+#: mail/mail-config.glade.h:173
 msgid "seconds"
 msgstr "sekundit"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "praegune aeg"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "sinu poolt määratud aeg"
 
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:22
 msgid "years"
 msgstr "aastat"
 
+#: filter/filter-label.c:121
+#: mail/em-filter-i18n.h:26
+#: mail/em-migrate.c:1011
+#: mail/mail-config.c:76
+#: mail/mail-config.glade.h:91
+msgid "Important"
+msgstr "Tähtis"
+
+#  forest green
+#  forest green
+#. forest green
+#: filter/filter-label.c:124
+#: mail/em-migrate.c:1014
+#: mail/mail-config.c:79
+#: mail/mail-config.glade.h:139
+msgid "To Do"
+msgstr "Ülesanne"
+
+#  blue
+#  blue
+#. blue
+#: filter/filter-label.c:125
+#: mail/em-migrate.c:1015
+#: mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Hiljem"
+
+#: filter/filter-part.c:532
+#: shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "_Rule name:"
+msgstr "Reegli nimi:"
+
+#: filter/filter-rule.c:818
+msgid "<b>If</b>"
+msgstr "<b>Kui</b>"
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "kui kõik tingimused on täidetud"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "kui üks tingimustest on täidetud"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "Tegevused viiakse täide"
+
+#: filter/filter-rule.c:878
+msgid "All related"
+msgstr "Kõik seonduvad"
+
+#: filter/filter-rule.c:878
+msgid "Replies"
+msgstr "Vastused"
+
+#: filter/filter-rule.c:878
+#, fuzzy
+msgid "Replies and parents"
+msgstr "_Tekst ja ikoon"
+
+#: filter/filter-rule.c:880
+#, fuzzy
+msgid "Include threads"
+msgstr "_Loetud teemalõngad:"
+
+#: filter/filter-rule.c:975
+#, fuzzy
+msgid "Outgoing"
+msgstr "väljaminev"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Reegli lisamine"
@@ -13141,134 +13587,96 @@ msgstr "Muuda reeglit"
 msgid "Rule name"
 msgstr "Reegli nimi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F1"
-msgstr "Vahemälu-kontroll:"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Kella häälestus"
+#: mail/em-account-editor.c:377
+#, c-format
+msgid "%s License Agreement"
+msgstr "Litsents %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/em-account-editor.c:384
+#, c-format
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sisesta siia oma meiliaadress"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolutioni meiliklient"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolutioni kirjakoostaja"
+#: mail/em-account-editor.c:454
+#: mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
+msgid "Select Folder"
+msgstr "Kausta valimine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/em-account-editor.c:1808
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolutioni Netscape Mail'i importija"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:557
-msgid "Mail"
-msgstr "E-Post"
+msgid "Automatically check for _new mail every"
+msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Meilikontod"
+#. Most sections for this is auto-generated fromt the camel config
+#: mail/em-account-editor.c:2077
+#: mail/em-account-editor.c:2155
+msgid "Receiving Options"
+msgstr "Vastuvõtmise häälestus"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Meili häälestus"
+#: mail/em-account-editor.c:2500
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Kontoredaktor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Post"
+#: mail/em-account-editor.c:2500
+#: mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr "Evolution'i kontoassistent"
 
 #  translators: default account indicator
 #. translators: default account indicator
-#: mail/em-account-prefs.c:418
+#: mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:472
+#: mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:474
+#: mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
+#: mail/em-composer-prefs.c:306
+#: mail/em-composer-prefs.c:425
+#: mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: mail/em-composer-prefs.c:909
+#: mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:955
+#: mail/em-composer-prefs.c:995
 msgid "Add signature script"
 msgstr "Lisa allkirjaskript"
 
-#: mail/em-composer-prefs.c:975
+#: mail/em-composer-prefs.c:1015
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:889
+#: mail/em-composer-utils.c:897
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1502
+#: mail/em-composer-utils.c:1513
 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:1549
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+#: mail/em-composer-utils.c:1560
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
 #: mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filtri reeglid"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Kausta valimine"
-
 #. Automatically generated. Do not edit.
 #: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
@@ -13344,7 +13752,7 @@ msgstr "EI saa käivitada wombatit"
 
 #: mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
-msgstr ""
+msgstr "Ei eksisteeri"
 
 #: mail/em-filter-i18n.h:20
 #, fuzzy
@@ -13377,49 +13785,44 @@ msgid "Follow Up"
 msgstr "Vastukaja"
 
 #: mail/em-filter-i18n.h:27
-#, fuzzy
 msgid "is"
-msgstr "Loend"
+msgstr "on"
 
 #: mail/em-filter-i18n.h:28
-#, fuzzy
 msgid "is after"
-msgstr "pärast"
+msgstr "on pärast"
 
 #: mail/em-filter-i18n.h:29
-#, fuzzy
 msgid "is before"
-msgstr "enne"
+msgstr "on enne"
 
 #: mail/em-filter-i18n.h:30
-#, fuzzy
 msgid "is Flagged"
-msgstr "Tähistatud"
+msgstr "on tähistatud"
 
 #: mail/em-filter-i18n.h:31
 msgid "is greater than"
-msgstr ""
+msgstr "on suurem kui"
 
 #: mail/em-filter-i18n.h:32
 msgid "is less than"
-msgstr ""
+msgstr "on väiksem kui"
 
 #: mail/em-filter-i18n.h:33
-#, fuzzy
 msgid "is not"
-msgstr "Loend"
+msgstr "ei ole"
 
 #: mail/em-filter-i18n.h:34
-#, fuzzy
 msgid "is not Flagged"
-msgstr "Tähistatud"
+msgstr "ei ole tähistatud"
 
 #: mail/em-filter-i18n.h:36
 #, fuzzy
 msgid "Junk Test"
 msgstr "Juuni"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37
+#: mail/em-folder-view.c:960
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -13431,123 +13834,132 @@ msgstr "%s meililist"
 
 #: mail/em-filter-i18n.h:39
 #, fuzzy
+msgid "Match All"
+msgstr "Kogu päev"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
 msgid "Message Body"
 msgstr "Saadetav sõnum"
 
-#: mail/em-filter-i18n.h:40
+#: mail/em-filter-i18n.h:41
 #, fuzzy
 msgid "Message Header"
 msgstr "Saadetav sõnum"
 
-#: mail/em-filter-i18n.h:41
+#: mail/em-filter-i18n.h:42
 #, fuzzy
 msgid "Message is Junk"
 msgstr "_Sõnumid"
 
-#: mail/em-filter-i18n.h:42
+#: mail/em-filter-i18n.h:43
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "Märgista kui _mitte rämps"
 
-#: mail/em-filter-i18n.h:43
+#: mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-filter-i18n.h:44
+#: mail/em-filter-i18n.h:45
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Välju programmist"
 
-#: mail/em-filter-i18n.h:45
+#: mail/em-filter-i18n.h:46
 #, fuzzy
 msgid "Play Sound"
 msgstr "Mängi heli:"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:47
+#: mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Loetud"
 
-#: mail/em-filter-i18n.h:47
+#: mail/em-filter-i18n.h:48
 #, fuzzy
 msgid "Recipients"
 msgstr "ei sisalda"
 
-#: mail/em-filter-i18n.h:48
+#: mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr ""
 
-#: mail/em-filter-i18n.h:49
+#: mail/em-filter-i18n.h:50
 #, fuzzy
 msgid "Replied to"
 msgstr "Vastused"
 
-#: mail/em-filter-i18n.h:50
+#: mail/em-filter-i18n.h:51
 msgid "returns"
-msgstr ""
+msgstr "tagastab"
 
-#: mail/em-filter-i18n.h:51
+#: mail/em-filter-i18n.h:52
 msgid "returns greater than"
-msgstr ""
+msgstr "tagastab suurema kui"
 
-#: mail/em-filter-i18n.h:52
+#: mail/em-filter-i18n.h:53
 msgid "returns less than"
-msgstr ""
+msgstr "tagastab väiksema kui"
 
-#: mail/em-filter-i18n.h:53
+#: mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:55
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
 
-#: mail/em-filter-i18n.h:55
-#, fuzzy
+#: mail/em-filter-i18n.h:56
 msgid "Sender"
-msgstr "Saada"
+msgstr "Saatja"
 
-#: mail/em-filter-i18n.h:56
+#: mail/em-filter-i18n.h:57
 #, fuzzy
 msgid "Set Status"
 msgstr "Olek"
 
-#: mail/em-filter-i18n.h:57
-#, fuzzy
+#: mail/em-filter-i18n.h:58
 msgid "Size (kB)"
-msgstr "Suurus"
+msgstr "Suurus (kB)"
 
-#: mail/em-filter-i18n.h:58
+#: mail/em-filter-i18n.h:59
 msgid "sounds like"
-msgstr ""
+msgstr "kõlab kui"
 
-#: mail/em-filter-i18n.h:59
-#, fuzzy
+#: mail/em-filter-i18n.h:60
 msgid "Source Account"
-msgstr "Lähteraamat"
+msgstr "Lähtekonto"
 
-#: mail/em-filter-i18n.h:60
+#: mail/em-filter-i18n.h:61
 #, fuzzy
 msgid "Specific header"
 msgstr "ainult kirjeldatud kaustad"
 
-#: mail/em-filter-i18n.h:61
+#: mail/em-filter-i18n.h:62
 msgid "starts with"
-msgstr ""
+msgstr "algab"
 
-#: mail/em-filter-i18n.h:63
+#: mail/em-filter-i18n.h:64
 #, fuzzy
 msgid "Stop Processing"
 msgstr "Peata laadimine"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: mail/em-filter-i18n.h:65
+#: mail/em-format.c:853
+#: mail/em-format-html.c:1534
+#: mail/em-format-quote.c:306
+#: mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:330
+#: plugins/shared-folder/properties.glade.h:14
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Teema"
 
-#: mail/em-filter-i18n.h:65
+#: mail/em-filter-i18n.h:66
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ühendriigid"
@@ -13560,31 +13972,32 @@ msgstr "Ühendriigid"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: mail/em-folder-browser.c:129
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
-#: mail/em-folder-properties.c:122
-#, fuzzy
-msgid "Folder Properties"
-msgstr "Kausta omadused"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:161
+#: mail/em-folder-properties.c:143
 #, fuzzy
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Abiteade"
 msgstr[1] "Abiteade"
 
-#: mail/em-folder-properties.c:173
+#: mail/em-folder-properties.c:155
 #, fuzzy
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Järgmine _lugemata sõnum"
 msgstr[1] "Järgmine _lugemata sõnum"
 
-#: mail/em-folder-selection-button.c:120
+#: mail/em-folder-properties.c:269
+#: plugins/shared-folder/properties.glade.h:9
+#, fuzzy
+msgid "Folder Properties"
+msgstr "Kausta omadused"
+
+#: mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
@@ -13592,490 +14005,488 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:707
+#: mail/em-folder-selector.c:166
+#: mail/em-folder-tree.c:2463
+#: mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:311
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: mail/em-folder-selector.c:300
+#: mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Loo"
 
-#: mail/em-folder-selector.c:304
+#: mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "VKaustad"
-
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#: mail/em-folder-tree.c:670
 #, fuzzy
-msgid "UNMATCHED"
-msgstr "Puudub \\{"
-
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
-msgid "Loading..."
-msgstr "Laadimine..."
+msgid "Mail Folder Tree"
+msgstr "_Kirjakaust"
 
-#: mail/em-folder-tree.c:846
+#: mail/em-folder-tree.c:903
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:848
+#: mail/em-folder-tree.c:905
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:855 mail/message-list.c:1613
+#: mail/em-folder-tree.c:912
+#: mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:857 mail/message-list.c:1615
+#: mail/em-folder-tree.c:914
+#: mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:873
+#: mail/em-folder-tree.c:930
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1026
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1027
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
-msgid "_Move"
-msgstr "_Liiguta"
-
-#: mail/em-folder-tree.c:968 mail/message-list.c:1705
-#, fuzzy
-msgid "Cancel _Drag"
-msgstr "Lohistamise pide"
+#: mail/em-folder-tree.c:1726
+#: mail/mail-ops.c:1017
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "\"%s\" kaustade läbivaatamine"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/em-folder-tree.c:2233
+#: mail/em-folder-tree.c:2247
+#: mail/em-folder-view.c:823
+#: mail/em-folder-view.c:838
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2233
+#: mail/em-folder-view.c:838
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2274
+#: plugins/shared-folder/share-folder-common.c:115
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
+#: mail/em-folder-tree.c:2463
+#: mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:311
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2656
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2658
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: mail/em-folder-tree.c:2734
+#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2604
+#: mail/em-folder-tree.c:2735
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2739
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2740
 msgid "_Move..."
 msgstr "_Liiguta..."
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2613
+#: mail/em-folder-tree.c:2744
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2616
+#: mail/em-folder-tree.c:2747
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
-msgid "_Properties"
-msgstr "_Omadused"
+#: mail/em-folder-tree-model.c:200
+#: mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:880
+msgid "VFolders"
+msgstr "VKaustad"
+
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206
+#: mail/em-folder-tree-model.c:208
+#, fuzzy
+msgid "UNMATCHED"
+msgstr "Puudub \\{"
+
+#: mail/em-folder-tree-model.c:491
+#: mail/em-folder-tree-model.c:795
+msgid "Loading..."
+msgstr "Laadimine..."
+
+#: mail/em-folder-view.c:426
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418
+#: mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474
+#: mail/mail-component.c:531
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "E-Post"
 
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
+#: mail/em-folder-view.c:928
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:902
+#: mail/em-folder-view.c:930
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:933
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:934
+#: mail/em-popup.c:502
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:935
+#: mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:936
+#: mail/em-popup.c:505
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:939
 msgid "Follo_w Up..."
 msgstr "Vastu_kaja..."
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:940
 msgid "Fla_g Completed"
 msgstr "Märgista kui lõpetatud"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:941
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:944
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:945
 msgid "Mark as _Unread"
 msgstr "Märgi _mitteloetuks"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:946
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:947
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:948
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:949
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista kui _mitte rämps"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:953
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:928
+#: mail/em-folder-view.c:956
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:957
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:965
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:968
 msgid "Appl_y Filters"
 msgstr "Rakenda _filtrid"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:969
 msgid "F_ilter Junk"
 msgstr "_Rämpsu filtreerimine"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:972
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:973
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:974
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:975
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:976
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _meililoendi järgi"
 
-#: mail/em-folder-view.c:952
+#: mail/em-folder-view.c:980
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:981
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:954
+#: mail/em-folder-view.c:982
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:955
+#: mail/em-folder-view.c:983
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
-#: mail/mail-config.glade.h:68
+#: mail/em-folder-view.c:1760
+#: mail/em-folder-view.c:1803
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1848
+#: mail/em-folder-view.c:1900
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2115
+#: mail/em-folder-view.c:2179
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2380
+#: mail/em-folder-view.c:2462
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#  message-search popup match count string
-#  message-search popup match count string
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:848
+#: mail/em-format-html.c:1425
+#: mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:83
+#: mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
+msgid "From"
+msgstr "Saatja"
+
+#: mail/em-format.c:849
+#: mail/em-format-html.c:1425
+#: mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "Vastus-Kuhu"
+
+#: mail/em-format.c:850
+#: mail/em-format-html.c:1425
+#: mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:85
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kellele"
+
+#: mail/em-format.c:851
+#: mail/em-format-html.c:1425
+#: mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "Koopia"
+
+#: mail/em-format.c:852
+#: mail/em-format-html.c:1425
+#: mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "Pimekoopia"
+
+#: mail/em-format.c:854
+#: mail/em-format-html.c:1578
+#: mail/em-format-quote.c:322
+#: mail/em-mailer-prefs.c:89
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Kuupäev"
+
+#: mail/em-format.c:855
+#: mail/em-format-html.c:1601
+#: mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "Uudisegrupid"
+
+#: mail/em-format.c:1104
 #, c-format
-msgid "Matches: %d"
-msgstr "Sobivaid: %d"
+msgid "%s attachment"
+msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:582
-msgid "Unsigned"
-msgstr "Allkirjastamata"
+#: mail/em-format.c:1143
+#: mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
 
-#: mail/em-format-html-display.c:641
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
-"See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:583
+#: mail/em-format.c:1414
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
+
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "Toetamata allkirjavorming"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "Viga allkirja tõestamisel"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "Tundmatu viga allkirja tõestamisel"
+
+#: mail/em-format-html.c:473
+#: mail/em-format-html.c:475
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' tõmbamine"
+
+#: mail/em-format-html.c:580
+#: mail/em-format-html-display.c:638
+msgid "Unsigned"
+msgstr "Allkirjastamata"
+
+#: mail/em-format-html.c:581
+#: mail/em-format-html-display.c:639
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html-display.c:642
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-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:643 mail/em-format-html.c:584
+#: mail/em-format-html.c:582
+#: mail/em-format-html-display.c:640
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html-display.c:643
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:644
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:583
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:591
+#: mail/em-format-html.c:589
+#: mail/em-format-html-display.c:647
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html-display.c:650
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
+#: mail/em-format-html.c:590
+#: mail/em-format-html-display.c:648
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html-display.c:651
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:593
+#: mail/em-format-html.c:591
+#: mail/em-format-html-display.c:649
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html-display.c:652
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:594
+#: mail/em-format-html.c:592
+#: mail/em-format-html-display.c:650
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "_Sertifikaadi kuvamine"
-
-#: mail/em-format-html-display.c:769
-msgid "This certificate is not viewable"
-msgstr "See sertifikaat ei ole kuvatav"
-
-#: mail/em-format-html-display.c:1004
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1012
-msgid "Overdue:"
-msgstr "Tähtaja ületanud:"
-
-#: mail/em-format-html-display.c:1015
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1054
-msgid "_View Inline"
-msgstr "_Sisekuva"
-
-#: mail/em-format-html-display.c:1055
-msgid "_Hide"
-msgstr "_Peida"
-
-#: mail/em-format-html-print.c:130
-#, c-format
-msgid "Page %d of %d"
-msgstr "Lehekülg %d %d-st"
-
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' tõmbamine"
-
-#: mail/em-format-html.c:585
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
-
-#: mail/em-format-html.c:848
+#: mail/em-format-html.c:841
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:871
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/em-format-html.c:889
+#: mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:891
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:912
+#: mail/em-format-html.c:905
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:923
+#: mail/em-format-html.c:916
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1165
+#: mail/em-format-html.c:1138
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Saatja"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Vastus-Kuhu"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kellele"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Koopia"
-
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Pimekoopia"
-
 #. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
-#: mail/em-mailer-prefs.c:939
+#: mail/em-format-html.c:1538
+#: mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
@@ -14086,7 +14497,7 @@ msgstr "Postiprogramm:"
 #  translators: strftime format for local time equivalent in Date header display, with day
 #  translators: strftime format for local time equivalent in Date header display, with day
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1581
+#: mail/em-format-html.c:1565
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
@@ -14095,78 +14506,121 @@ msgstr "<I> (%a, %R %Z)</I>"
 #  translators: strftime format for local time equivalent in Date header display, without day
 #  translators: strftime format for local time equivalent in Date header display, without day
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1584
+#: mail/em-format-html.c:1568
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Kuupäev"
+#  message-search popup match count string
+#  message-search popup match count string
+#. message-search popup match count string
+#: mail/em-format-html-display.c:405
+#, c-format
+msgid "Matches: %d"
+msgstr "Sobivaid: %d"
 
-#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Uudisegrupid"
+#: mail/em-format-html-display.c:638
+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 ei saa garanteerida."
 
-#: mail/em-format.c:1056
-#, c-format
-msgid "%s attachment"
-msgstr "\"%s\" tüüpi manus"
+#: mail/em-format-html-display.c:639
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+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.c:1095 mail/em-format.c:1228
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
+#: mail/em-format-html-display.c:640
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr ""
 
-#: mail/em-format.c:1218
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:641
+msgid "Valid signature, cannot verify sender"
+msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
+
+#: mail/em-format-html-display.c:641
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1379
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
+#: mail/em-format-html-display.c:647
+msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
+msgstr ""
 
-#: mail/em-format.c:1398
-msgid "Unsupported signature format"
-msgstr "Toetamata allkirjavorming"
+#: mail/em-format-html-display.c:648
+msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format.c:1406
-msgid "Error verifying signature"
-msgstr "Viga allkirja tõestamisel"
+#: mail/em-format-html-display.c:649
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr ""
 
-#: mail/em-format.c:1406
-msgid "Unknown error verifying signature"
-msgstr "Tundmatu viga allkirja tõestamisel"
+#: mail/em-format-html-display.c:650
+msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:751
+#: smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Sertifikaadi kuvamine"
+
+#: mail/em-format-html-display.c:766
+msgid "This certificate is not viewable"
+msgstr "See sertifikaat ei ole kuvatav"
+
+#: mail/em-format-html-display.c:995
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1003
+msgid "Overdue:"
+msgstr "Tähtaja ületanud:"
+
+#: mail/em-format-html-display.c:1006
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1053
+msgid "_View Inline"
+msgstr "_Sisekuva"
 
-#: mail/em-junk-filter.c:86
+#: mail/em-format-html-display.c:1054
+msgid "_Hide"
+msgstr "_Peida"
+
+#: mail/em-format-html-display.c:1298
+#, fuzzy
+msgid "Attachment Button"
+msgstr "Manus"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Lehekülg %d %d-st"
+
+#: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
-#: mail/em-mailer-prefs.c:100
+#: mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Iga kord"
 
-#: mail/em-mailer-prefs.c:101
+#: mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Kord kuus"
 
 #: mail/em-migrate.c:1168
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -14200,81 +14654,80 @@ msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
+#: mail/em-migrate.c:2494
+#: mail/em-migrate.c:2506
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2578
+#: mail/em-migrate.c:2657
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/em-migrate.c:2596
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: mail/em-migrate.c:2675
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:700
+#: mail/em-popup.c:386
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: mail/em-popup.c:718
+#: mail/em-popup.c:405
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:499
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:501
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:553
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:554
 msgid "Se_nd message to..."
 msgstr "S_aada sõnum..."
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:555
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:985
+#: mail/em-popup.c:686
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:613
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:639
+#: mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/em-subscribe-editor.c:873
+#: mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: mail/em-utils.c:104
+#: mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
@@ -14300,7 +14753,7 @@ msgstr "Aadressi lisamine"
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1053
+#: mail/em-utils.c:1055
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
@@ -14309,10 +14762,6 @@ msgstr "Andmed (%s -st)"
 msgid "Virtual _Folders"
 msgstr "Virtuaalsed _kaustad"
 
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "_Lisa"
-
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VKausta allikas"
@@ -14427,10 +14876,7 @@ msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
 #: mail/evolution-mail.schemas.in.in.h:27
-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 "
-"in GNOME's mime-type database may be used for displaying content."
+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 in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:28
@@ -14451,9 +14897,7 @@ msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
 #: mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:33
@@ -14461,9 +14905,7 @@ msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:34
-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."
+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."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:35
@@ -14479,14 +14921,8 @@ msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
-msgstr ""
-"Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi "
-"ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on "
-"aadressiraamatus 3 - Alati laadi pildid võrgust maha."
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
+msgstr "Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on aadressiraamatus 3 - Alati laadi pildid võrgust maha."
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
@@ -14560,8 +14996,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -14575,17 +15010,13 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
 #: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
+msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
@@ -14627,14 +15058,6 @@ msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloetelus"
 
-#: mail/evolution-mail.schemas.in.in.h:71
-msgid "Show the \"Preview\" pane"
-msgstr "\"Eelvaatlus\" paani kuvamine"
-
-#: mail/evolution-mail.schemas.in.in.h:72
-msgid "Show the \"Preview\" pane."
-msgstr "\"Eelvaatlus\" paani kuvamine."
-
 #: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
@@ -14675,11 +15098,7 @@ msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
 #: mail/evolution-mail.schemas.in.in.h:82
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
@@ -14782,9 +15201,7 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:106
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:107
@@ -14795,54 +15212,82 @@ msgstr ""
 msgid "spamd port"
 msgstr "spamd port"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutioni Elm'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Kella häälestus"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutioni Netscape Mail'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr ""
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutioni Outlook Express 4 importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutioni Pine'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sisesta siia oma meiliaadress"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolutioni mbox'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolutioni meiliklient"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Expressi 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutioni kirjakoostaja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutioni Netscape Mail'i importija"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "Meilikontod"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Meili häälestus"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_Post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:255
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-mbox-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:259
+#: mail/importers/netscape-importer.c:1251
+#: mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importimine..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-mbox-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/netscape-importer.c:1253
+#: mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -14863,29 +15308,62 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:116
-#: mail/importers/evolution-outlook-importer.c:130
+#: mail/importers/evolution-mbox-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/evolution-outlook-importer.c:305
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: mail/importers/mail-importer.c:360
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutioni Elm'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutioni Netscape Mail'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutioni Outlook Express 4 importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolutioni Pine'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolutioni mbox'i importija"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Expressi 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
@@ -14959,10 +15437,6 @@ msgstr "Evolution impordib sinu Pine andmeid"
 msgid "Importing Pine data"
 msgstr "Pine'i andmete importimine"
 
-#: mail/importers/pine-importer.c:479
-msgid "Addressbook"
-msgstr "Aadressiraamat"
-
 #: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
@@ -14975,38 +15449,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#  give our dialog an OK button and title
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
-msgid "Evolution Account Editor"
-msgstr "Evolution kontoassistent"
-
-#: mail/mail-account-gui.c:246
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-
-#: mail/mail-account-gui.c:252
-#, c-format
-msgid "%s License Agreement"
-msgstr "Litsents %s"
-
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
-msgid "_Host:"
-msgstr "_Host:"
-
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
-msgid "User_name:"
-msgstr "_Kasutajanimi:"
-
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
-msgid "_Path:"
-msgstr "_Otsingutee:"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -15031,158 +15473,101 @@ msgstr "%s meililist"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:459
+#: mail/mail-component.c:139
+#, fuzzy
+msgid "Drafts"
+msgstr "Kuupäev"
+
+#: mail/mail-component.c:140
+msgid "Outbox"
+msgstr ""
+
+#: mail/mail-component.c:141
+#, fuzzy
+msgid "Sent"
+msgstr "Saada"
+
+#: mail/mail-component.c:484
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "Valitud"
 msgstr[1] "Valitud"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d saatmata"
+msgstr[1] "%d saatmata"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kokku"
+msgstr[1] "%d kokku"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ", %d lugemata"
+msgstr[1] ", %d lugemata"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:685
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:686
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:669
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:801
+#: mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
-msgid "Identity"
-msgstr "Identiteet"
-
-#: mail/mail-config-druid.c:364
-#, fuzzy
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
-"\"Mittekohustuslikud\" väljad\n"
-"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
-"sõnumitesse."
-
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:119
-msgid "Receiving Mail"
-msgstr "Meili vastuvõtmine"
-
-#: mail/mail-config-druid.c:372
-#, fuzzy
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. "
-"Kui sa ei ole para-\n"
-"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
-"interneti teenusepakkujalt"
-
-#: mail/mail-config-druid.c:379
-msgid "Please select among the following options"
-msgstr ""
-
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
-msgid "Sending Mail"
-msgstr "Meili saatmine"
-
-#: mail/mail-config-druid.c:384
-#, fuzzy
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
-"välja saata. Kui sa ei ole\n"
-"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
-"interneti teenusepakkujalt"
-
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
-msgid "Account Management"
-msgstr "Kontohaldus"
-
-#: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Teenuse kontrollimine"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Serveriga ühendumine..."
-
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: mail/mail-config.glade.h:1
+#: mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
@@ -15191,7 +15576,8 @@ msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
 
 #: mail/mail-config.glade.h:5
-msgid "<b>SSL is not supported in this build of evolution</b>"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL toetus ei ole selles evolutioni ehituses saadaval</b>"
 
 #: mail/mail-config.glade.h:6
@@ -15223,197 +15609,200 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
 #: mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "<span weight=\"bold\">Uute sõnumite kontrollimine</span>"
-
-#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sõnumite koostamine</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguratsioon</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad kirjapäised</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri häälestus</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
+#: plugins/itip-formatter/itip-formatter.c:1249
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Märgid ja värvid</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Piltide laadimine</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Sõnumikuva</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uute sõnumite kontrollimine</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslik informatsioon</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Häälestus</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 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:29
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslik informatsioon</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Kaitstud MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Kaitse</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri konfiguratsioon</span>"
 
 #: mail/mail-config.glade.h:35
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr ""
+msgid "Account Management"
+msgstr "Kontohaldus"
 
 #: mail/mail-config.glade.h:36
-msgid "Account Editor"
-msgstr "Kontoredaktor"
-
-#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "_Uue allkirja lisamine..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: mail/mail-config.glade.h:40
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
+
+#: mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati saada koopia (cc):"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati saada _pimekoopia (cc):"
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
-
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45
+#: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Automatically check for _new mail every"
-msgstr "_Kontrolli uusi sõnumeid automaatselt"
-
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check _incoming mail for junk"
 msgstr "Otsi sissetuleva posti seest rämpsu"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kon_trolli trükkimise ajal õigekirja"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Kontrolli sissetulevate kirjade seest rämpsu"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Cle_ar"
+msgstr "_Puhasta"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Clea_r"
+msgstr "_Puhasta"
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Hilinenud ülesannete värvus"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Värvid"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Kinnituse küsimine enne kataloogis asendamist"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15429,274 +15818,286 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Vaikekodeering:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
+
+#: mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Originaalsõnumite ei tsiteerita"
 
-#: mail/mail-config.glade.h:73
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
-
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72
+#: shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Meilikontod"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "_Meiliaadress:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikastid"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Krüpteerimissertifikaat:"
 
-#: mail/mail-config.glade.h:81
-msgid "Evolution Account Assistant"
-msgstr "Evolution'i kontoassistent"
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "Encrypt out_going messages (by default)"
+msgstr "Väljuvate sõnumite _krüpteerimine (vaikimisi)"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Käsu käivitamine..."
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML'is"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML post"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Päised"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Käivita _failiga..."
 
-#: mail/mail-config.glade.h:90
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "I_nclude remote tests"
 msgstr "Aeg testidele"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:90
+msgid "Identity"
+msgstr "Identiteet"
+
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Inline"
 msgstr "Edasta tekst&ina..."
 
-#: mail/mail-config.glade.h:96
-msgid "Kerberos "
-msgstr "Kerberos "
-
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Meili konfiguratsioon"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Kirjakasti asukoht"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: mail/mail-config.glade.h:104
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: mail/mail-config.glade.h:99
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
 #, fuzzy
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
+"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
+"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:106
 #, fuzzy
-msgid "Qmail maildir "
-msgstr "Maildir otsingutee:"
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr ""
+"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
+"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:107
+msgid "Please select among the following options"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+
+#: mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Originaalkirja tsiteerimine"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "_Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Autentimise (taas)saatmine kasutajale"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:120
-msgid "Receiving Options"
-msgstr "Vastuvõtmise häälestus"
-
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "Parooli _meeldejätmine"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "S_elect..."
+msgstr "Vali..."
+
+#: mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "_Tavaline kirjatüüp:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Se_lect..."
+msgstr "Vali..."
+
+#: mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali printimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Vali printimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:129
-msgid "Select..."
-msgstr "Vali..."
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:124
+msgid "Sending Mail"
+msgstr "Meili saatmine"
+
+#: mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "Serveri _tüüp:"
 
-#: mail/mail-config.glade.h:136
-msgid "Si_gning certificate:"
+#: mail/mail-config.glade.h:128
+#, fuzzy
+msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: mail/mail-config.glade.h:141
-msgid "Standard Unix mbox"
-msgstr "Standardne Unix'i mbox"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "T_erminali kirjatüüp"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "_Tüüp:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:135
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+#: mail/mail-config.glade.h:138
+msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "_Kasutajanimi:"
+
+#: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15706,85 +16107,95 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:148
+msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+msgstr ""
+
+#: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Alati lae pildid Internetist"
 
-#: mail/mail-config.glade.h:160
-msgid "_Digitally sign outgoing messages (by default)"
-msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
-
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
+
+#: mail/mail-config.glade.h:154
 msgid "_Enable"
 msgstr "_Lubamine"
 
-#: mail/mail-config.glade.h:164
-msgid "_Encrypt outgoing messages (by default)"
-msgstr "Väljuvate sõnumite _krüpteerimine (vaikimisi)"
-
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "_Host:"
+
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Piltide laadimine, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "Määra see konto minu _vaikimisi kontoks"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:162
 msgid "_Never load images from the Internet"
 msgstr "_Kunagi ära lae ühtegi pilti Internetist"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "_Otsingutee:"
+
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Täpsustus, kui püütakse saata sõnumit ilma teemata"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:166
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:167
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:168
 msgid "_Show animated images"
 msgstr "Animeeritud piltide kuvamine"
 
-#: mail/mail-config.glade.h:179
-msgid "_Use Secure Connection (SSL):"
-msgstr "_Turvalise ühenduse kasutamine (SSL):"
+#: mail/mail-config.glade.h:169
+#, fuzzy
+msgid "_Use Secure Connection:"
+msgstr "_Turvalise ühenduse kasutamine:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:170
 msgid "_Use the same fonts as other applications"
 msgstr "_Kasuta sama kirjatüüpi, mis teisedki rakendused"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:171
 msgid "color"
 msgstr "värv"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "kirjeldus"
 
@@ -15809,75 +16220,83 @@ msgstr "<span weight=\"bold\">Krüpteerimine</span>"
 
 #: mail/mail-dialogs.glade.h:10
 #, fuzzy
-msgid "Accept License"
-msgstr "Vastu võetud"
+msgid "Case _Sensitive"
+msgstr "Tõstutundlik"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Lõpetatud"
+#: mail/mail-dialogs.glade.h:11
+#: mail/message-tags.glade.h:2
+#, fuzzy
+msgid "Co_mpleted"
+msgstr "Lõpetatud"
 
-#: mail/mail-dialogs.glade.h:12
-msgid "Case Sensitive"
-msgstr "Tõstutundlik"
+#: mail/mail-dialogs.glade.h:13
+#, fuzzy
+msgid "F_ind:"
+msgstr "Otsing:"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
 #: mail/mail-dialogs.glade.h:15
-msgid "Find:"
-msgstr "Otsing:"
-
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Vastukaja sildi järgi"
 
-#: mail/mail-dialogs.glade.h:17
+#: mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Kaustade tellimused"
 
-#: mail/mail-dialogs.glade.h:18
+#: mail/mail-dialogs.glade.h:17
 #, fuzzy
 msgid "License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-dialogs.glade.h:19
+#: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "Ühtegi pole valitud"
 
-#: mail/mail-dialogs.glade.h:20
+#: mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: mail/mail-dialogs.glade.h:21
+#: mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "Turvalisuse info"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:22
+#: mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:25
+#: mail/mail-dialogs.glade.h:24
 #, fuzzy
-msgid "Tick this to accept the license agreement"
-msgstr "Aktsepteeritud litsentside loend"
+msgid "_Accept License"
+msgstr "Vastu võetud"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:25
+#: mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:26
+#: mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Silt:"
 
-#: mail/mail-dialogs.glade.h:28
+#: mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Telli"
 
+#: mail/mail-dialogs.glade.h:28
+#, fuzzy
+msgid "_Tick this to accept the license agreement"
+msgstr "Aktsepteeritud litsentside loend"
+
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
@@ -15905,12 +16324,8 @@ msgstr "Vigane autentimine"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
-"autentimist üleüldse."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see autentimist üleüldse."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15921,12 +16336,8 @@ msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
 #, fuzzy
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
-"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -15936,18 +16347,11 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-#, fuzzy
-msgid "_Send"
-msgstr "Saada"
-
 #  mail:ask-send-no-subject primary
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15956,51 +16360,38 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
 #. mail:ask-send-no-subject secondary
 #: mail/mail-errors.xml.h:19
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 msgstr ""
 
 #  mail:ask-send-only-bcc-contact primary
 #  mail:ask-send-only-bcc primary
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: mail/mail-errors.xml.h:22
+#: mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
 #. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+msgid "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
 #. mail:ask-default-drafts primary
@@ -16010,9 +16401,7 @@ msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
 msgstr ""
 
 #  default charset used in mail view
@@ -16024,14 +16413,12 @@ msgstr "Kasuta _vaikekodeeringut"
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: mail/mail-errors.xml.h:45
+#: mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
@@ -16043,9 +16430,7 @@ msgstr "_Puhasta"
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
 #: mail/mail-errors.xml.h:51
@@ -16059,9 +16444,7 @@ msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 
 #. mail:camel-exception primary
@@ -16072,10 +16455,8 @@ msgstr ""
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 msgstr ""
 
 #. mail:async-error primary
@@ -16114,9 +16495,8 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:94
+#: mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa salvestada."
@@ -16146,20 +16526,18 @@ msgstr "Fail juba eksisteerib, aga see ei ole tavaline fail."
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kausta \"{0}\" ei saa kustutada."
 
-#. mail:no-delete-spethal-folder primary
+#. mail:no-delete-special-folder primary
 #: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
-#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-delete-special-folder secondary
+#: mail/mail-errors.xml.h:116
+#: mail/mail-errors.xml.h:120
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr ""
 
-#. mail:no-rename-spethal-folder primary
+#. mail:no-rename-special-folder primary
 #: mail/mail-errors.xml.h:118
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa ümber nimetada ega liigutada."
@@ -16176,20 +16554,18 @@ msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#: mail/mail-errors.xml.h:128
+#: mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#: mail/mail-errors.xml.h:130
+#: mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
 
@@ -16199,26 +16575,26 @@ msgid "Because \"{2}\"."
 msgstr "Kuna \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#: mail/mail-errors.xml.h:136
+#: mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#: mail/mail-errors.xml.h:138
+#: mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" ei saa avada."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#: mail/mail-errors.xml.h:142
+#: mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" ei saa avada."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#: mail/mail-errors.xml.h:144
+#: mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
 
@@ -16233,8 +16609,8 @@ msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" ei saa avada"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#: mail/mail-errors.xml.h:156
+#: mail/mail-errors.xml.h:160
 #, fuzzy
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi ei saa salvestada."
@@ -16321,9 +16697,7 @@ msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
@@ -16399,15 +16773,15 @@ msgstr ""
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 msgstr ""
 
 #: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Eira"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231
+#: widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -16415,147 +16789,181 @@ msgstr "_Kirjuta üle"
 msgid "_Append"
 msgstr "_Lisa"
 
-#. mail:gw-accountsetup-error primary
+#. mail:no-load-license primary
 #: mail/mail-errors.xml.h:234
+#, fuzzy
+msgid "Unable to read license file."
+msgstr "Ei suuda luua uut kataloogi `%s': %s"
+
+#. mail:no-load-license secondary
+#: mail/mail-errors.xml.h:236
 msgid ""
-"Could not connect to {0}. Groupwise account setup is incomplete. You may "
-"need to setup  the account again"
+"Cannot read the license file \"{0}\", due to an\n"
+"      installation problem.  You will not be able to use this provider until\n"
+"      you can accept its license."
+msgstr ""
+
+#. mail:checking-service title
+#: mail/mail-errors.xml.h:240
+msgid "Querying server"
 msgstr ""
 
-#: mail/mail-folder-cache.c:795
+#. mail:checking-service primary
+#: mail/mail-errors.xml.h:242
+#, fuzzy
+msgid "Please wait."
+msgstr "Palun oota"
+
+#. mail:checking-service secondary
+#: mail/mail-errors.xml.h:244
+#, fuzzy
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s."
+
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:246
+msgid ""
+"Unable to connect to the GroupWise\n"
+"server."
+msgstr ""
+
+#. mail:gw-accountsetup-error secondary
+#: mail/mail-errors.xml.h:249
+msgid ""
+"\n"
+"Please check your account settings and try again.\n"
+msgstr ""
+
+#: mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-ops.c:98
+#: mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Filtrite rakendamine väljuvatele sõnumitele ebaõnnestus: %s"
 
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:581
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:576
+#: mail/mail-ops.c:590
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:703
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:707
+#: mail/mail-ops.c:722
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:804
+#: mail/mail-ops.c:819
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:1002
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" kaustade läbivaatamine"
-
-#: mail/mail-ops.c:1115
+#: mail/mail-ops.c:1130
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1158
+#: mail/mail-ops.c:1173
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1230
+#: mail/mail-ops.c:1245
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1308
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1402
+#: mail/mail-ops.c:1417
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1467
+#: mail/mail-ops.c:1482
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1538
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1625
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1623
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1691
+#: mail/mail-ops.c:1706
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1778
 #, 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:1849
+#: mail/mail-ops.c:1864
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Sõnumite liigutamine"
 msgstr[1] "Sõnumite liigutamine"
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:1914
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16564,7 +16972,7 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:1927
+#: mail/mail-ops.c:1942
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16573,11 +16981,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2013
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2025
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16586,36 +16994,40 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: mail/mail-send-recv.c:157
+#: mail/mail-ops.c:2301
+msgid "Checking Service"
+msgstr "Teenuse kontrollimine"
+
+#: mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Katkestan..."
 
-#: mail/mail-send-recv.c:264
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:266
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Tüüp: %s  "
@@ -16628,24 +17040,25 @@ msgstr "Posti saatmine ja vastuvõtmine"
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:410
+#: mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: mail/mail-session.c:207
+#: mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:209
+#: mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
@@ -16658,29 +17071,30 @@ msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
 #: mail/mail-signature-editor.c:414
+#: plugins/shared-folder/properties.glade.h:11
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:320
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
@@ -16700,79 +17114,86 @@ msgstr "'%s:%s' vkaustade uuendamine"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:942
+#: mail/mail-vfolder.c:950
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:981
+#: mail/mail-vfolder.c:989
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1065
+#: mail/mail-vfolder.c:1073
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
-#: mail/message-list.c:1000
+#: mail/message-list.c:999
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1000
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:1002
+#: mail/message-list.c:1001
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:1008
+#: mail/message-list.c:1007
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1008
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:1013
+#: mail/message-list.c:1012
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1013
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1337
+#: mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1344
+#. strftime format of a weekday, a date and a
+#: mail/message-list.c:1348
+#: plugins/itip-formatter/itip-view.c:149
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1353
+#: mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1365
+#: mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1373
+#: mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1375
+#: mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3376
+#: mail/message-list.c:2044
+#, fuzzy
+msgid "Message List"
+msgstr "_Sõnumid"
+
+#: mail/message-list.c:3409
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -16804,39 +17225,42 @@ msgstr "Vastuvõetud"
 msgid "Size"
 msgstr "Suurus"
 
-#: mail/message-tag-followup.c:73
+#: mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Helista"
 
-#: mail/message-tag-followup.c:74
+#: mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: mail/message-tag-followup.c:75
+#: mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Vastukaja"
 
-#: mail/message-tag-followup.c:76
+#: mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Teadmiseks"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:78
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
-#: mail/message-tag-followup.c:78
+#: mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:81
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:82
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: mail/message-tag-followup.c:82
+#: mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Ülevaade"
 
@@ -16872,81 +17296,766 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolutioni kest"
+#: plugins/backup-restore/backup.c:109
+#, fuzzy
+msgid "Backup Evolution directory"
+msgstr "Evolutioni viga"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolutioni test"
+#: plugins/backup-restore/backup.c:111
+#, fuzzy
+msgid "Restore Evolution directory"
+msgstr "Evolutioni viga"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: plugins/backup-restore/backup.c:113
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Testi vaate komponent"
+msgid "Check Evolution archive"
+msgstr "Ximian Evolution grupitarkvarakomplekt"
+
+#: plugins/backup-restore/backup.c:115
+#, fuzzy
+msgid "Restart Evolution"
+msgstr "Ei saa käivitada wombat serverit"
+
+#: plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr ""
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#, fuzzy
+msgid "Backup Settings..."
+msgstr "_Sätted..."
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "Backup and restore Evolution data and settings"
+msgstr "Muuda Evolutioni seadeid "
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "Restore Settings..."
+msgstr "Pilot pihuarvuti sätted..."
+
+#: plugins/bbdb/bbdb.c:387
+#, fuzzy
+msgid "Automatic Contacts"
+msgstr "Lisa kontaktide hulka"
+
+#: plugins/bbdb/bbdb.c:396
+#, fuzzy
+msgid "<span weight=\"bold\">Automatic Contacts</span>"
+msgstr "<span weight=\"bold\">Autentimine</span>"
+
+#. Enable BBDB checkbox
+#: plugins/bbdb/bbdb.c:409
+msgid "_Automatically create entries in the addressbook when responding to mail"
+msgstr ""
+
+#: plugins/bbdb/bbdb.c:427
+#, fuzzy
+msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
+
+#. Enable Gaim Checkbox
+#: plugins/bbdb/bbdb.c:440
+msgid "Periodically synchronize contact information and images from my _instant messenger"
+msgstr ""
+
+#. Synchronize now button.
+#: plugins/bbdb/bbdb.c:447
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Ei saa loobuda kaustast `%s': Puudulik käsk"
+
+#: plugins/itip-formatter/itip-formatter.c:650
+#, fuzzy, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Kalendrit '%s' ei saa avada."
+
+#: plugins/itip-formatter/itip-formatter.c:663
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:667
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:672
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:677
+#, c-format
+msgid "Sent to calendar '%s' as cancelled"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:725
+#, fuzzy
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
+
+#: plugins/itip-formatter/itip-formatter.c:736
+#, c-format
+msgid "Unable to update attendee statusAttendee status updated. %s"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:740
+#, fuzzy
+msgid "Attendee status updated"
+msgstr "Osavõtja olek uuendatud\n"
+
+#: plugins/itip-formatter/itip-formatter.c:1240
+#, fuzzy
+msgid "Meetings"
+msgstr "Koosolek"
+
+#. Delete message after acting
+#: plugins/itip-formatter/itip-formatter.c:1263
+msgid "_Delete message after acting"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1273
+#, fuzzy
+msgid "<span weight=\"bold\">Conflict Search</span>"
+msgstr "<span weight=\"bold\">Konfiguratsioon</span>"
+
+#. Source selector
+#: plugins/itip-formatter/itip-formatter.c:1286
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:135
+#: ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:450
+msgid "Today"
+msgstr "Täna"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:140
+#, fuzzy
+msgid "Today %H:%M"
+msgstr "Täna %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:144
+#, fuzzy
+msgid "Today %H:%M:%S"
+msgstr "Täna %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:153
+#, fuzzy
+msgid "Today %l:%M:%S %p"
+msgstr "Täna %l:%M %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:161
+#: plugins/itip-formatter/itip-view.c:213
+#, fuzzy
+msgid "%A, %B %e"
+msgstr "%A, %d. %B %Y"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:166
+#: plugins/itip-formatter/itip-view.c:218
+#, fuzzy
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %d. %B %Y"
+
+#  strptime format of a date and a time, in 24-hour format.
+#  strptime format of a date and a time, in 24-hour format.
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:170
+#: plugins/itip-formatter/itip-view.c:222
+#, fuzzy
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:175
+#: plugins/itip-formatter/itip-view.c:227
+#, fuzzy
+msgid "%A, %B %e %l:%M %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:179
+#: plugins/itip-formatter/itip-view.c:231
+#, fuzzy
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:187
+#, c-format
+msgid "%A"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:192
+#, fuzzy
+msgid "%A %H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:196
+#, fuzzy
+msgid "%A %H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:201
+#, fuzzy
+msgid "%A %l:%M %p"
+msgstr "%a, %d. %b %Y"
+
+#  strptime format for a time of day, in 12-hour format.
+#  strftime format of a time in 12-hour format.
+#  strptime format for a time of day, in 12-hour format.
+#  strftime format of a time in 12-hour format.
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:205
+#, fuzzy
+msgid "%A %l:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:237
+#, fuzzy
+msgid "%A, %B %e, %Y"
+msgstr "%A, %d. %B %Y"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:242
+#, fuzzy
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %d. %B %Y"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:246
+#, fuzzy
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:251
+#, fuzzy
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#: plugins/itip-formatter/itip-view.c:255
+#, fuzzy
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#: plugins/itip-formatter/itip-view.c:280
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr "<b>%s</b> avalikustas koosoleku info."
+
+#: plugins/itip-formatter/itip-view.c:282
+#, fuzzy, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr "<b>%s</b> avalikustas koosoleku info."
+
+#: plugins/itip-formatter/itip-view.c:287
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
+
+#: plugins/itip-formatter/itip-view.c:290
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
+
+#: plugins/itip-formatter/itip-view.c:292
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
+
+#: plugins/itip-formatter/itip-view.c:298
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
+
+#: plugins/itip-formatter/itip-view.c:300
+#, fuzzy, 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:303
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
+
+#: plugins/itip-formatter/itip-view.c:306
+#, fuzzy, c-format
+msgid "<b>%s</b> has accepted the following meeting:"
+msgstr "<b>%s</b> tühistas koosoleku."
+
+#: plugins/itip-formatter/itip-view.c:310
+#: plugins/itip-formatter/itip-view.c:316
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has cancelled the follow meeting:"
+msgstr "<b>%s</b> tühistas koosoleku."
+
+#: plugins/itip-formatter/itip-view.c:312
+#: plugins/itip-formatter/itip-view.c:318
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled the following meeting."
+msgstr "<b>%s</b> tühistas koosoleku."
+
+#: plugins/itip-formatter/itip-view.c:1265
+#, fuzzy
+msgid "_Calendar:"
+msgstr "Kalender:"
+
+#. org.gnome.mailing-list-actions:no-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#, fuzzy
+msgid "Action not available"
+msgstr "TLS ei ole kättesaadav"
+
+#. org.gnome.mailing-list-actions:no-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+msgid "This message does not contain the header information required for this action."
+msgstr ""
+
+#. org.gnome.mailing-list-actions:posting-not-allowed primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#, fuzzy
+msgid "Posting not allowed"
+msgstr "Postitamine nurjus: %s"
+
+#. org.gnome.mailing-list-actions:posting-not-allowed secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr ""
+
+#. org.gnome.mailing-list-actions:ask-send-message primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#, fuzzy
+msgid "Send e-mail message to mailing list?"
+msgstr "_Sõnumi saatmine loendisse..."
+
+#. org.gnome.mailing-list-actions:ask-send-message secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message has been sent."
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#, fuzzy
+msgid "_Send message"
+msgstr "Sõnumi saatmine"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#, fuzzy
+msgid "_Edit message"
+msgstr "Sõnumi saatmine"
+
+#. org.gnome.mailing-list-actions:malformed-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#, fuzzy
+msgid "Malformed header"
+msgstr "Saadetav sõnum"
+
+#. org.gnome.mailing-list-actions:malformed-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#. org.gnome.mailing-list-actions:no-action primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+#, fuzzy
+msgid "No e-mail action"
+msgstr "Filtrite tegevuste logimine"
+
+#. org.gnome.mailing-list-actions:no-action secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+msgid ""
+"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact list _owner"
+msgstr "Kontaktiloendi redaktor"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#, fuzzy
+msgid "Get list _usage information"
+msgstr "Koosoleku info"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#, fuzzy
+msgid "Mailing _List"
+msgstr "%s meililist"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post message to list"
+msgstr "_Sõnumi saatmine loendisse..."
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to list"
+msgstr "_Telli"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Un-subscribe to list"
+msgstr "_Lõpeta tellimus"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr ""
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#, fuzzy
+msgid "Manage Plugins..."
+msgstr "Katkestan..."
+
+#: plugins/plugin-manager/plugin-manager.c:45
+#, fuzzy
+msgid "Author(s)"
+msgstr "tund(i)"
+
+#: plugins/plugin-manager/plugin-manager.c:46
+#, fuzzy
+msgid "Id"
+msgstr "I"
+
+#: plugins/plugin-manager/plugin-manager.c:47
+#, fuzzy
+msgid "Path"
+msgstr "_Otsingutee:"
+
+#: plugins/plugin-manager/plugin-manager.c:48
+#, fuzzy
+msgid "Description"
+msgstr "Kirjeldus:"
+
+#. Setup the ui
+#: plugins/plugin-manager/plugin-manager.c:188
+#, fuzzy
+msgid "Plugin Manager"
+msgstr "Juht"
+
+#: plugins/plugin-manager/plugin-manager.c:201
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: plugins/plugin-manager/plugin-manager.c:210
+#, fuzzy
+msgid "Plugin"
+msgstr "Puhastamine"
+
+#: plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:150
+#, fuzzy
+msgid "HTML Mode"
+msgstr "HTML post"
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#, fuzzy
+msgid "Save Attachments ..."
+msgstr "_Manus..."
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#, fuzzy
+msgid "Save all attachments"
+msgstr "Manuse salvestamine"
+
+#: plugins/save-attachments/save-attachments.c:331
+#, fuzzy
+msgid "Select save base name"
+msgstr "Vali ajavöönd"
+
+#: plugins/save-attachments/save-attachments.c:351
+#, fuzzy
+msgid "MIME Type"
+msgstr "MIME tüüp:"
+
+#: plugins/save-attachments/save-attachments.c:359
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Salvesta"
+
+#: plugins/save-calendar/csv-format.c:167
+#, c-format
+msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+msgstr ""
+
+#: plugins/save-calendar/csv-format.c:370
+#, c-format
+msgid "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%sAttendees List%sLocation%sModified%s"
+msgstr ""
+
+#: plugins/save-calendar/csv-format.c:519
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: plugins/save-calendar/csv-format.c:526
+msgid "Prepend a header"
+msgstr ""
+
+# !PARANDA! - no kuidas siis tõlkida?
+#: plugins/save-calendar/csv-format.c:535
+#, fuzzy
+msgid "Value delimiter:"
+msgstr "Kohalik postijagaja"
+
+#: plugins/save-calendar/csv-format.c:541
+msgid "Record delimiter:"
+msgstr ""
+
+#: plugins/save-calendar/csv-format.c:547
+msgid "Encapsulate values with:"
+msgstr ""
+
+#: plugins/save-calendar/csv-format.c:569
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: plugins/save-calendar/ical-format.c:120
+#, fuzzy
+msgid "iCalendar format (.ics)"
+msgstr "iKalendri failid (.ics)"
+
+#: plugins/save-calendar/rdf-format.c:390
+msgid "RDF format (.rdf)"
+msgstr "RDF vorming (.rdf)"
+
+#: plugins/save-calendar/save-calendar.c:172
+#: plugins/save-calendar/save-calendar.c:182
+#, fuzzy
+msgid "Select destination file"
+msgstr "Vali sihtkoht"
+
+#: plugins/save-calendar/save-calendar.c:217
+#, c-format
+msgid "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+"Share List"
+msgstr "_Telefonide loend"
+
+#: plugins/shared-folder/properties.glade.h:4
+#, fuzzy
+msgid "Ad_d"
+msgstr "_Lisa"
+
+#: plugins/shared-folder/properties.glade.h:5
+msgid "Additional Access"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:7
+#, fuzzy
+msgid "Delet_e"
+msgstr "Kustuta"
+
+#: plugins/shared-folder/properties.glade.h:8
+#, fuzzy
+msgid "Edi_t"
+msgstr "Redigeermine"
+
+#: plugins/shared-folder/properties.glade.h:10
+#, fuzzy
+msgid "Message"
+msgstr "_Sõnumid"
+
+#: plugins/shared-folder/properties.glade.h:12
+msgid "Sen_d Custom Notification"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:13
+msgid "Shared Folder Notification"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:15
+msgid "The participants will receive the following notification.\n"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:18
+#, fuzzy
+msgid "_Not Shared"
+msgstr "Pole alanud"
+
+#: plugins/shared-folder/properties.glade.h:20
+msgid "_Shared With ..."
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:21
+#, fuzzy
+msgid "_Sharing"
+msgstr "Varjutamine"
+
+#: plugins/shared-folder/share-folder-common.c:282
+#, fuzzy
+msgid "Users"
+msgstr "Kasutajanimi"
+
+#: plugins/shared-folder/share-folder-common.c:283
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: plugins/shared-folder/share-folder-common.c:361
+#, fuzzy
+msgid "Sharing"
+msgstr "Varjutamine"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "480"
-msgstr "480"
+msgid "Button style"
+msgstr "Nuppude stiil"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Buttons are visible"
+msgstr "Nupud on nähtavad"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Vaikimisi kaustariba paani laius"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Vaikimisi akna kõrgus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Vaikimisi akna laius."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-msgid ""
-"If set to true, Evolution will start up in offline mode instead of online "
-"mode."
+msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"If set to true, the warning dialog in development versions of Evolution is "
-"not displayed."
+msgid "If set to true, Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 #, fuzzy
 msgid "Last upgraded Evolution configuration version"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "The style of the displayed buttons. Can be text, icons, both, toolbar. If toolbar is set, the style of the toolbar is followed as determined by the GNOME setting."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtaval"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Whether the buttons should be visible."
+msgstr "Kas kõik mängud peaksid olema lahendusega."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
 #, fuzzy
 msgid "Whether the toolbar should be visible."
 msgstr "Kas kõik mängud peaksid olema lahendusega."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
@@ -16964,7 +18073,39 @@ msgstr "Tegevused viiakse täide"
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell.c:590
+msgid "Uknown system error."
+msgstr "Tundmatu süsteemi viga."
+
+#: shell/e-shell.c:798
+#: shell/e-shell.c:799
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:1242
+#: widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "Olgu"
+
+#: shell/e-shell.c:1244
+msgid "Invalid arguments"
+msgstr "Vigased argumendid"
+
+#: shell/e-shell.c:1246
+msgid "Cannot register on OAF"
+msgstr "OAF'i ei saa registreerida"
+
+#: shell/e-shell.c:1248
+msgid "Configuration Database not found"
+msgstr "Ei leia häälestusandmebaasi"
+
+#: shell/e-shell.c:1250
+msgid "Generic error"
+msgstr "Üldine viga"
+
+#: shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -16974,18 +18115,17 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: shell/e-shell-importer.c:149
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 
 #: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158
+#: shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
@@ -16997,7 +18137,8 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:232
+#: shell/e-shell-importer.c:266
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17006,30 +18147,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:333
+#: shell/e-shell-importer.c:340
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:461
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
 
-#: shell/e-shell-importer.c:459
+#: shell/e-shell-importer.c:469
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:467
+#: shell/e-shell-importer.c:477
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:488
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
 
-#: shell/e-shell-importer.c:495
+#: shell/e-shell-importer.c:506
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17038,33 +18181,34 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:582
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:638
 #, fuzzy
 msgid "F_ilename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:631
+#: shell/e-shell-importer.c:643
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:655
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: shell/e-shell-importer.c:682
+#: shell/e-shell-importer.c:694
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja sätete importimine _vanematest programmidest"
 
-#: shell/e-shell-importer.c:685
+#: shell/e-shell-importer.c:697
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:765
+#: shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17073,45 +18217,44 @@ msgstr ""
 "Üritan tuvastada olemasolevaid programme"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:772
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:898
+#: shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1074
+#: shell/e-shell-importer.c:1092
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Faili %s jaoks ei ühtegi importijat saadaval"
 
-#: shell/e-shell-importer.c:1086
+#: shell/e-shell-importer.c:1106
 msgid "Unable to execute importer"
 msgstr "Importijat ei saa käivitada"
 
-#: shell/e-shell-importer.c:1200
+#: shell/e-shell-importer.c:1220
 msgid "_Import"
 msgstr "_Importimine"
 
-#: shell/e-shell-offline-handler.c:594
+#: shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Sulgen ühendused..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Evolutioni seaded "
 
-#: shell/e-shell-startup-wizard.c:575
+#: shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Importimise alustamine"
 
-#: shell/e-shell-startup-wizard.c:795
+#: shell/e-shell-startup-wizard.c:797
 msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
+"If you quit the Evolution Setup Assistant now, all of the information that you have entered will be forgotten. You will need to run this assistant again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
@@ -17136,6 +18279,26 @@ msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
+#: shell/e-shell-window.c:341
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
+
+#: shell/e-shell-window.c:356
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+
+#: shell/e-shell-window.c:708
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
 #: shell/e-shell-window-commands.c:67
 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."
@@ -17153,73 +18316,40 @@ msgstr "Veateatamisprogramm ei ole paigaldatud."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
-#: shell/e-shell-window-commands.c:323
+#. The translator-credits string is for translators to list
+#: shell/e-shell-window-commands.c:425
+msgid "translator-credits"
+msgstr ""
+"Tõlge eesti keelde:\n"
+"	Ilmar Kerm <ikerm@hot.ee>, 2001\n"
+"	Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005\n"
+"	Kaarel Jõgi <kaarel@gg.ee>, 2002\n"
+"	Priit Laes <amd@tt.ee>, 2003, 2004, 2005\n"
+"\n"
+"GNOME Translation Project Eesti meeskond.\n"
+"http://et-gnome.sourceforge.net\n"
+"Veateated, parandused: <gnome-et@linux.ee>"
+
+#: shell/e-shell-window-commands.c:439
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupitöö võimalused"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706
+#: ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
-"seda nuppu."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
-"seda nuppu."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
-#: shell/e-shell.c:585
-msgid "Uknown system error."
-msgstr "Tundmatu süsteemi viga."
-
-#: shell/e-shell.c:789 shell/e-shell.c:790
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:1212
-msgid "Invalid arguments"
-msgstr "Vigased argumendid"
-
-#: shell/e-shell.c:1214
-msgid "Cannot register on OAF"
-msgstr "OAF'i ei saa registreerida"
-
-#: shell/e-shell.c:1216
-msgid "Configuration Database not found"
-msgstr "Ei leia häälestusandmebaasi"
-
-#: shell/e-shell.c:1218
-msgid "Generic error"
-msgstr "Üldine viga"
-
-#: shell/e-user-creatable-items-handler.c:691
+#: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Uus"
 
@@ -17234,9 +18364,8 @@ msgid "Importing Files"
 msgstr "Impordi failist"
 
 #: shell/evolution-startup-wizard.glade.h:4
-#, fuzzy
 msgid "Timezone "
-msgstr "Ajav_öönd:"
+msgstr "Ajavöönd"
 
 #: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
@@ -17244,17 +18373,14 @@ msgstr ""
 
 #: shell/evolution-startup-wizard.glade.h:6
 msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:9
 msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
@@ -17271,6 +18397,19 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Loo uus testielement"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolutioni kest"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolutioni test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Testi vaate komponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -17310,7 +18449,8 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195
+#: smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Impordi"
 
@@ -17327,7 +18467,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:226
+#: shell/main.c:237
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17347,7 +18487,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:250
+#: shell/main.c:261
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17356,35 +18496,43 @@ msgstr ""
 "Tänud\n"
 "Ximian Evolution'i meeskond\n"
 
-#: shell/main.c:257
+#: shell/main.c:268
 msgid "Don't tell me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/main.c:462
+#: shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:464
+#: shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Alusta offlainrežiimis"
 
-#: shell/main.c:466
+#: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Alusta onlainrežiimis"
 
-#: shell/main.c:469
-msgid "Forcibly shut down all evolution components"
+#: shell/main.c:480
+msgid "Forcibly shut down all Evolution components"
 msgstr ""
 
-#: shell/main.c:473
+#: shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:476
+#: shell/main.c:487
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:490
+msgid "Disable the mono plugin environment."
+msgstr ""
+
+#: shell/main.c:493
+msgid "Disable loading of any plugins."
+msgstr ""
+
+#: shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17399,11 +18547,9 @@ msgstr ""
 #. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
 
 #. shell:upgrade-failed primary
@@ -17418,8 +18564,7 @@ msgstr ""
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
@@ -17428,8 +18573,8 @@ msgid "Continue"
 msgstr "Sisu sisaldab"
 
 #. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: shell/shell-errors.xml.h:17
+#: shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr ""
 
@@ -17438,10 +18583,7 @@ msgstr ""
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
+"If you choose to remove this data, the entire contents of the \"evolution\" directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of \"evolution\" at your convenience.\n"
 msgstr ""
 
 #: shell/shell-errors.xml.h:25
@@ -17454,35 +18596,31 @@ msgid "_Keep Data"
 msgstr ""
 
 #. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: shell/shell-errors.xml.h:28
+#: shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr ""
 
 #. shell:upgrade-remove-1-4-confirm secondary
 #: shell/shell-errors.xml.h:32
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be "
-"permanently removed.\n"
+"The entire contents of the \"evolution\" directory is about to be be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
 
 #. shell:noshell title
-#. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: shell/shell-errors.xml.h:39
+#: shell/shell-errors.xml.h:47
 #, fuzzy
 msgid "Cannot start Evolution"
 msgstr "Ei saa käivitada wombat serverit"
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: shell/shell-errors.xml.h:41
+#: shell/shell-errors.xml.h:49
 #, fuzzy
 msgid "Evolution can not start."
 msgstr "Evolution'i kontoassistent"
@@ -17513,36 +18651,28 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-
-#: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
-#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
+#: smime/gui/certificate-manager.c:134
+#: smime/gui/certificate-manager.c:142
+#: smime/gui/certificate-manager.c:375
+#: smime/gui/certificate-manager.c:383
+#: smime/gui/certificate-manager.c:595
+#: smime/gui/certificate-manager.c:603
 msgid "Select a cert to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
+#: smime/gui/certificate-manager.c:263
+#: smime/gui/certificate-manager.c:472
 #: smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
+#: smime/gui/certificate-manager.c:272
+#: smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:281
+#: smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -17560,6 +18690,14 @@ msgstr "E-posti aadress"
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
@@ -17576,21 +18714,21 @@ msgid "Enter new password"
 msgstr "Sisesta uus parool"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:121
+#: smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:122
+#: smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
 
-#: smime/gui/e-cert-selector.c:169
+#: smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Vali sertifikaat"
 
@@ -17646,12 +18784,11 @@ msgid "Backup All"
 msgstr "Kogu päev"
 
 #: smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: smime/gui/smime-ui.glade.h:14
+#: smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -17720,11 +18857,13 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: smime/gui/smime-ui.glade.h:34
+#: smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: smime/gui/smime-ui.glade.h:35
+#: smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
@@ -17753,8 +18892,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
@@ -17769,12 +18907,12 @@ msgstr "Sinu sertifikaadid"
 msgid "_Edit CA Trust"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Sertifikaat on juba olemas."
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: smime/lib/e-cert.c:238
+#: smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17894,11 +19032,13 @@ msgstr "Teema avaliku võtme info"
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit ei saa töödelda"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -17944,7 +19084,8 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: smime/lib/e-cert.c:940
+#: smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -17957,7 +19098,8 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: smime/lib/e-cert.c:1091
+#: smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -17977,15 +19119,20 @@ msgstr "Teema unikaalne ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#: smime/lib/e-pkcs12.c:263
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikaat on juba olemas."
+
+#: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faili parool"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Sisestage PKCS12 faili jaoks parool:"
 
-#: smime/lib/e-pkcs12.c:362
+#: smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Imporditud sertifikaat"
 
@@ -18020,8 +19167,6 @@ msgstr "Vaikimisi sõnumi teema."
 #  This most likely means that KILL_PROCESS_CMD wasn't
 #  * found, so just bail completely.
 #. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
 #: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
@@ -18036,7 +19181,8 @@ msgstr "Süsteemi %s sulgemine (%s)\n"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopeeri kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
@@ -18044,7 +19190,8 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -18060,7 +19207,8 @@ msgstr "Liiguta kontakt(id) teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -18068,8 +19216,9 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -18119,17 +19268,18 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
@@ -18137,7 +19287,8 @@ msgstr "_Edasta kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -18194,7 +19345,8 @@ msgstr "Loend"
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Järgmine"
 
@@ -18202,7 +19354,8 @@ msgstr "Järgmine"
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -18214,7 +19367,8 @@ msgstr "Kalendri trükkimine"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publitseeri selle kalendri vaba/hõivatud info"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhastamine"
 
@@ -18254,11 +19408,6 @@ msgstr "Näitab ühte nädalat"
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Täna"
-
 #: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Käesoleva sündmuse kuvamine"
@@ -18275,81 +19424,12 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Sündmus avamine"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Sulge"
-
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Sulge"
-
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Sulgeb elemendi"
-
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
-msgid "Delete this item"
-msgstr "Kustuta see element"
-
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Peatööriistariba"
-
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Trükitava elemendi eelvaatlemine"
-
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
-msgid "Print this item"
-msgstr "Trüki see element"
-
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "_Salvesta kui..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save and Close"
-msgstr "Salvesta ja sulge"
-
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
-msgstr "Salvesta ja _sulge"
-
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
-
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "Salvestab elemendi kettale"
-
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
-msgid "_File"
-msgstr "_Fail"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2
+#: ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
@@ -18361,7 +19441,8 @@ msgstr "Lõika valitud tekst lõikelauale"
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5
+#: ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -18370,82 +19451,6 @@ msgstr "Vali _kõik"
 msgid "Select all text"
 msgstr "Vali kogu tekst"
 
-#: ui/evolution-contact-editor.xml.h:6
-msgid "Print En_velope..."
-msgstr "Ü_mbriku trükkimine..."
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Save the contact and close the dialog box"
-msgstr "Salvestab kontakti ja sulgeb dialoogiakna"
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "Send _Message to Contact..."
-msgstr "Sõ_numi saatmine kontaktile..."
-
-#: ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Salvesta"
-
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete this list"
-msgstr "Kustuta see loetelu"
-
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Save the list and close the dialog box"
-msgstr "Salvestab nimekirja ja sulgeb dialoogiakna"
-
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Se_nd list to other..."
-msgstr "_Saada loend teistele.."
-
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Send _message to list..."
-msgstr "_Sõnumi saatmine loendisse..."
-
-#: ui/evolution-contact-list-editor.xml.h:12
-msgid "_Delete..."
-msgstr "_Kustuta..."
-
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Koo_soleku ärajätmine"
-
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "_Edasta iKalendrina"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Edastab elemendi e-posti kaudu"
-
-#: ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "Koosolek"
-
-#: ui/evolution-event-editor.xml.h:7
-#, fuzzy
-msgid "Obtain the latest meeting information"
-msgstr "Hangi värskeim ülesannete informatsioon"
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "K_oosoleku värskendamine"
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "_Koosoleku ajastamine"
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr ""
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Minu Evolutioni kohandamine"
@@ -18510,11 +19515,13 @@ msgstr "_Filtrid..."
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) kopeerimine lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) lõikamine lõikelauale"
 
@@ -18535,8 +19542,7 @@ msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -18547,7 +19553,8 @@ msgstr "Märgi Kõik loetuks"
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Sõnumi(te) asetamine lõikepuhvrist"
 
@@ -18595,7 +19602,8 @@ msgstr "Esitab sõnumeid jutulõngadena"
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteeri valik"
 
@@ -18603,6 +19611,38 @@ msgstr "_Inverteeri valik"
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3
+#: ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Sulge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Sulgeb akna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "Peatööriistariba"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
+msgid "_Close"
+msgstr "Sul_ge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:39
+msgid "_File"
+msgstr "_Fail"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Saatja lisamine _aadressiraamatusse"
@@ -19002,7 +20042,8 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129
+#: ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -19010,16 +20051,6 @@ msgstr "T_ööriistad"
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Sulgeb akna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Sul_ge"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -19028,7 +20059,8 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -19044,7 +20076,8 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
@@ -19072,15 +20105,14 @@ msgstr "S/MIME krüptimine"
 msgid "S/MIME Sign"
 msgstr "S/MIME allkiri"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Salvesta"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salvesta kui"
 
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "_Salvesta kui..."
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Salvesta _mustand"
@@ -19195,6 +20227,11 @@ msgstr "_Saada-kellele väli"
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele väli"
 
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Salvesta"
+
 #: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Turvalisus"
@@ -19203,10 +20240,22 @@ msgstr "_Turvalisus"
 msgid "_To Field"
 msgstr "_Vasta-kellele (To) väli"
 
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Sulge"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Salvesta ja sulge"
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "Salvesta ja _sulge"
+
 #: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Salvestab aktiivne fail ja sulge aken"
@@ -19239,30 +20288,6 @@ msgstr "Telli"
 msgid "Unsubscribe"
 msgstr "Lõpeta tellimus"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Omista ülesanne"
-
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Määra ülesanne teistele"
-
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Tühista ülesanne"
-
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Katkesta aktiivne ülesanne"
-
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Hangi värskeim ülesannete informatsioon"
-
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Ü_lesande värskendamine"
-
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopeeri valitud ülesanne"
@@ -19325,99 +20350,151 @@ msgid "Create a new window displaying this folder"
 msgstr "Loo uus aken, mis kuvab seda kausta"
 
 #: ui/evolution.xml.h:7
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+
+#: ui/evolution.xml.h:8
+msgid "Display window buttons with icons and text"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+msgid "Display window buttons with icons only"
+msgstr ""
+
+#: ui/evolution.xml.h:10
+msgid "Display window buttons with text only"
+msgstr ""
+
+#: ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "_Välju"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolutioni _KKK "
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Välju programmist"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Unusta _paroolid"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Unustab meeldejäetud paroolid, vajadusel küsitakse paroolid uuesti."
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:16
+msgid "Hide window buttons"
+msgstr ""
+
+#: ui/evolution.xml.h:17
+msgid "Icons _and text"
+msgstr ""
+
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Impordib andmeid teistest programmidest"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "P_ilot'i sätted..."
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Prefere_nces"
+msgstr "Meili häälestus"
+
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Saada / võta vastu"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Saada ära järjekorras olevad teated ja tõmba ära uued teated"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Säti Pilot'i seadeid"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Show information about Evolution"
 msgstr "Näita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:23
-msgid "T_oolbar"
-msgstr "_Tööriistariba"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Lülitab autonoomse reziimi sisse või välja"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Tool_bar"
+msgstr "_Tööriistariba"
+
+#: ui/evolution.xml.h:32
+#, fuzzy
+msgid "Tool_bar style"
+msgstr "Tööriistariba on nähtaval"
+
+#: ui/evolution.xml.h:33
+msgid "Window B_uttons"
+msgstr ""
+
+#: ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "Evolutionist..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Abi"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:41
+msgid "_Hide buttons"
+msgstr ""
+
+#: ui/evolution.xml.h:42
+msgid "_Icons only"
+msgstr ""
+
+#: ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Kiirviide"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Saada / Võta vastu"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_Text only"
+msgstr "CPU mudel"
+
+#: ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Aken"
 
@@ -19486,8 +20563,8 @@ msgstr "_Tähtajaga"
 msgid "With _Status"
 msgstr "_Staatusega"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
@@ -19499,14 +20576,18 @@ msgstr "<b>Ajavööndid</b>"
 msgid "<b>_Selection</b>"
 msgstr "<b>_Valik</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Vali ajavöönd"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#, fuzzy
+msgid "TimeZone Combobox"
+msgstr "Ajavöönd"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
@@ -19516,45 +20597,46 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#  bonobo displays this string so it must be in locale
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "Kohandatud vaade"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Salvesta kohandatud vaade..."
 
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "Kirjelda vaateid..."
+#: widgets/misc/e-calendar.c:177
+#: widgets/misc/e-calendar.c:201
+#, fuzzy
+msgid "Previous Button"
+msgstr "Eelmine"
+
+#: widgets/misc/e-calendar.c:226
+#, fuzzy
+msgid "Month Calendar"
+msgstr "Kalendri laadimine"
 
 #  Translators: These are the first characters of each day of the
 #  week, 'M' for 'Monday', 'T' for Tuesday etc.
 #. 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:423
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #  This is a strftime() format. %B = Month name, %Y = Year.
 #  This is a strftime() format. %B = Month name, %Y = Year.
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Praegu"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Kellaaeg peab olema sisestatud %s formaadis"
 
-#: widgets/misc/e-cell-percent.c:77
+#: widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
@@ -19606,13 +20688,16 @@ msgstr "lääne-euroopa"
 msgid "Western European, New"
 msgstr "Lääne-euroopa, uust"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "traditsiooniline"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
@@ -19629,7 +20714,8 @@ msgstr "visuaalne"
 msgid "Unknown character set: %s"
 msgstr "Tundmatu märgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: widgets/misc/e-charset-picker.c:216
+#: widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -19645,32 +20731,63 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
-#: widgets/misc/e-error.c:126
+#  and now for the action area
+#: widgets/misc/e-dateedit.c:313
+#, fuzzy
+msgid "Date and Time Entry"
+msgstr "<b>Kuupäev ja kellaaeg</b>"
+
+#: widgets/misc/e-dateedit.c:332
+msgid "Text entry to input date"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:333
+msgid "Text Date Entry"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:350
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:351
+#, fuzzy
+msgid "Date Button"
+msgstr "Saatmise kuupäev"
+
+#: widgets/misc/e-dateedit.c:371
+msgid "Combo box to select time"
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:372
+msgid "Time Combo Box"
+msgstr ""
+
+#: widgets/misc/e-error.c:84
+#: widgets/misc/e-error.c:85
+#: widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
-#: widgets/misc/e-error.c:124
+#: widgets/misc/e-error.c:86
+#: widgets/misc/e-error.c:87
+#: widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
-#: widgets/misc/e-error.c:123
+#: widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolutioni info"
 
-#: widgets/misc/e-error.c:125
+#: widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolutioni päring"
 
 #  setup a dummy error
 #. setup a dummy error
-#: widgets/misc/e-error.c:421
+#: widgets/misc/e-error.c:436
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19689,9 +20806,7 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: widgets/misc/e-expander.c:198
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
@@ -19740,15 +20855,18 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92
+#: widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93
+#: widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Täpsemalt..."
 
@@ -19756,6 +20874,14 @@ msgstr "_Täpsemalt..."
 msgid "Choose Image"
 msgstr "Vali pilt"
 
+#: widgets/misc/e-map.c:647
+msgid "World Map"
+msgstr ""
+
+#: widgets/misc/e-map.c:649
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
+msgstr ""
+
 #: widgets/misc/e-pilot-settings.c:103
 #, fuzzy
 msgid "Sync with:"
@@ -19777,7 +20903,8 @@ msgstr "_Otsing"
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547
+#: widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
@@ -19817,245 +20944,13 @@ msgstr "Faili \"{0}\" pole võimalik salvestada."
 msgid "Cannot open file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa avada."
 
-#: widgets/misc/e-task-widget.c:212
+#: widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:217
+#: widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#~ msgid "_Add Group"
-#~ msgstr "_Grupi lisamine"
-
-#~ msgid "Ximian Evolution (Unstable)"
-#~ msgstr "Ximian Evolution (ebastabiilne)"
-
-#~ msgid "Remember this password"
-#~ msgstr "Jäta see parool meelde"
-
-#~ msgid "Remember this password for the remainder of this session"
-#~ msgstr "Jäta see parool meelde kuni selle sessiooni lõpuni"
-
-#, fuzzy
-#~ msgid "Keep"
-#~ msgstr "Belize"
-
-#~ msgid "New Contacts Group"
-#~ msgstr "Uus kontaktide grupp"
-
-#, fuzzy
-#~ msgid "Contacts Grou_p"
-#~ msgstr "_Kontaktide grupp"
-
-#~ msgid "Create a new contacts group"
-#~ msgstr "Uue kontaktide grupi loomine"
-
-#~ msgid "Add Contacts Group"
-#~ msgstr "Lisa kontaktide grupp"
-
-#~ msgid "Download limit:"
-#~ msgstr "Allalaadimise piirang:"
-
-#~ msgid "Search base only"
-#~ msgstr "Otsi ainult baasist"
-
-#~ msgid "Search base:"
-#~ msgstr "Otsingu baas:"
-
-#~ msgid "Search scope:"
-#~ msgstr "Otsingu ulatus:"
-
-#~ msgid "Timeout:"
-#~ msgstr "Taimaut:"
-
-#~ msgid "_Add Contacts Group"
-#~ msgstr "_Lisa kontaktide grupp"
-
-#~ msgid "_Email address:"
-#~ msgstr "_E-posti aadress: "
-
-#, fuzzy
-#~ msgid "_Log in:"
-#~ msgstr "Logi sellest hoolimata sisse"
-
-#~ msgid "Add Tasks Group"
-#~ msgstr "Ülesannetegrupi lisamine"
-
-#~ msgid "L_ocation:"
-#~ msgstr "As_ukoht:"
-
-#  and now for the action area
-#  and now for the action area
-#, fuzzy
-#~ msgid "<b>Organizer</b>"
-#~ msgstr "<b>Teised</b>"
-
-#~ msgid "New tasks group"
-#~ msgstr "Uus ülesannet grupp"
-
-#, fuzzy
-#~ msgid "Tasks Gro_up"
-#~ msgstr "Ü_lesannete grupp"
-
-#~ msgid "Create a new tasks group"
-#~ msgstr "Loo uus kontaktide grupp"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Saadi BYE vastus"
-
-#~ msgid "mail"
-#~ msgstr "kirjad"
-
-#, fuzzy
-#~ msgid "Authentication Credentials for HTTP Server"
-#~ msgstr "Serverilt saadi vigane autentimise vastus."
-
-#, fuzzy
-#~ msgid "Calendars selected for publishing"
-#~ msgstr "valitud valiku väärtus"
-
-#~ msgid "Login name:"
-#~ msgstr "Sisselogimisnimi:"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "User Publishes"
-#~ msgstr "Kasutajanimi"
-
-#~ msgid "C_alendar"
-#~ msgstr "_Kalender"
-
-#~ msgid "Audio Alarm Options"
-#~ msgstr "Helialarmi häälestus"
-
-#~ msgid "Message Alarm Options"
-#~ msgstr "Sõnumialarmi häälestus"
-
-#, fuzzy
-#~ msgid "Email Alarm Options"
-#~ msgstr "Helialarmi häälestus"
-
-#~ msgid "Program Alarm Options"
-#~ msgstr "Programmi alarmi häälestus"
-
-#~ msgid "Unknown Alarm Options"
-#~ msgstr "Tundmatu alarmi häälestus"
-
-#~ msgid "Alarm Repeat"
-#~ msgstr "Korduv alarm"
-
-#~ msgid "Message to Display:"
-#~ msgstr "Näidatav sõnum:"
-
-#~ msgid "With these arguments:"
-#~ msgstr "Nende parameetritega:"
-
-#~ msgid "Basics"
-#~ msgstr "Põhilised asjad"
-
-#~ msgid "Date/Time:"
-#~ msgstr "Kuupäev ja kell:"
-
-#~ msgid "Reminders"
-#~ msgstr "Meeldetuletajad"
-
-#~ msgid "_Options..."
-#~ msgstr "_Häälestus..."
-
-#~ msgid "Addressbook..."
-#~ msgstr "Aadressiraamat..."
-
-#~ msgid "B_usy"
-#~ msgstr "_Hõivatud"
-
-#~ msgid "Co_nfidential"
-#~ msgstr "S_alajane"
-
-#~ msgid "Date & Time"
-#~ msgstr "Kuupäev ja kellaaeg"
-
-#~ msgid "F_ree"
-#~ msgstr "Va_ba"
-
-#~ msgid "Pri_vate"
-#~ msgstr "_Isiklik"
-
-#~ msgid "Pu_blic"
-#~ msgstr "A_valik"
-
-#~ msgid "Add A_ttendee"
-#~ msgstr "Lisa _osavõtja"
-
-#, fuzzy
-#~ msgid "Add attendees from addressbook."
-#~ msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "Korduse reegel"
-
-#~ msgid "_Custom recurrence"
-#~ msgstr "K_ohandatud kordus"
-
-#~ msgid "_Modify"
-#~ msgstr "_Muuda"
-
-#~ msgid "_No recurrence"
-#~ msgstr "E_i kordu"
-
-#~ msgid "_Simple recurrence"
-#~ msgstr "Li_htne kordus"
-
-#~ msgid "% _Complete"
-#~ msgstr "(%) _valmis"
-
-#~ msgid "Progress"
-#~ msgstr "Edenemine"
-
-#~ msgid "Con_fidential"
-#~ msgstr "_Salajane"
-
-#~ msgid "Folder:"
-#~ msgstr "Kaust:"
-
-#~ msgid "Object could not be found\n"
-#~ msgstr "Objekti ei suudetud leida\n"
-
-#~ msgid "You don't have the right permissions to update the calendar\n"
-#~ msgstr "Sul pole õigusi kalendri muutmiseks\n"
-
-#~ msgid "Attendee status could not be updated!\n"
-#~ msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
-
-#, fuzzy
-#~ msgid "Add attendees from addressbook"
-#~ msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
-
-#~ msgid "_Options"
-#~ msgstr "_Häälestus"
-
-#~ msgid "Meeting _start time:"
-#~ msgstr "Koosoleku _algus:"
-
-#~ msgid "Meeting _end time:"
-#~ msgstr "Koosoleku l_õpp:"
-
-#, fuzzy
-#~ msgid "Can't find certificate for `%s'"
-#~ msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
-
-#~ msgid "Can't create CMS Message"
-#~ msgstr "CMS sõnumit ei saa luua"
-
-#, fuzzy
-#~ msgid "Can't create encoder context"
-#~ msgstr "ei suuda luua objekti '%s'"
-
-#~ msgid "_Score Rules"
-#~ msgstr "_Hindereeglid"
-
-# vim:set encoding=utf8:
author	Priit Laes <plaes@cvs.gnome.org>	2005-01-07 21:04:59 +0800
committer	Priit Laes <plaes@src.gnome.org>	2005-01-07 21:04:59 +0800
commit	3189458511655d73566b9eaf698dbbae8be02f2a (patch)
tree	9326f9b0e32a784c942c3e4dbe66ef1176290f8e /po/et.po
parent	cf5a35e070ec5a390b46cb475dbbd147925a82f0 (diff)
download	gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.gz gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.bz2 gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.lz gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.xz gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.tar.zst gsoc2013-evolution-3189458511655d73566b9eaf698dbbae8be02f2a.zip