Translation updated.

2005-02-12 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated. svn path=/trunk/; revision=28777
author: Priit Laes <plaes@cvs.gnome.org> 2005-02-13 00:08:25 +0800
committer: Priit Laes <plaes@src.gnome.org> 2005-02-13 00:08:25 +0800
commit: b2b84e8e04aea849d4b2192c63d8143f77ec7e84 (patch)
tree: 5370e9f5ea45f53ba110cde7a81365b2aead3bb9
parent: 383a33137aff2f683177cb30ce9c3ce205fa4c9e (diff)
download: gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.gz
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.bz2
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.lz
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.xz
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.zst
gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.zip
2 files changed, 5493 insertions, 6519 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 165d013007..c648e8cabf 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-12  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
 2005-02-12  Changwoo Ryu  <cwryu@debian.org>
 
 	* ko.po: Updated Korean translation.
diff --git a/po/et.po b/po/et.po
index 2facb691a8..fee5f563ec 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-13 14:55-0400\n"
-"PO-Revision-Date: 2005-02-05 23:12+0200\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"POT-Creation-Date: 2005-02-12 12:46+0100\n"
+"PO-Revision-Date: 2005-02-12 17:44+0300\n"
+"Last-Translator: Priit Laes <amd@store20.com>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,10 +22,27 @@ msgstr ""
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:172
+#: a11y/addressbook/ea-minicard-view.c:166
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "New Contact"
+msgstr "Uus kontakt"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:190
+msgid "New Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: a11y/addressbook/ea-minicard-view.c:149
+#, fuzzy, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "aktiivne aadressiraamatu kaust"
+msgstr[1] "aktiivne aadressiraamatu kaust"
+
 #: a11y/addressbook/ea-minicard.c:31
 #: calendar/gui/alarm-notify/alarm-queue.c:863
 #: ui/evolution-message-composer.xml.h:10
@@ -44,35 +61,36 @@ msgstr "Kontakt:"
 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/calendar/ea-cal-view-event.c:235
+msgid "It has alarms."
+msgstr ""
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:105
-msgid "New Contact List"
-msgstr "Uus kontaktide nimekiri"
+#: a11y/calendar/ea-cal-view-event.c:238
+#, fuzzy
+msgid "It has recurrences."
+msgstr "kordumine"
 
-#: a11y/addressbook/ea-minicard-view.c:153
-msgid "current addressbook folder "
-msgstr "aktiivne aadressiraamatu kaust"
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "It is a meeting."
+msgstr ""
 
-#: a11y/addressbook/ea-minicard-view.c:154
-msgid "have "
-msgstr "omab"
+#: a11y/calendar/ea-cal-view-event.c:247
+#, fuzzy, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalendrisündmused"
 
-#: a11y/addressbook/ea-minicard-view.c:154
-msgid "has "
-msgstr "omab"
+#: a11y/calendar/ea-cal-view-event.c:249
+#, fuzzy
+msgid "Calendar Event: It has no summary."
+msgstr "Kalendrisündmused"
 
-#: a11y/addressbook/ea-minicard-view.c:156
-msgid " cards"
-msgstr " kaarti"
+#: a11y/calendar/ea-cal-view-event.c:268
+msgid "calendar view event"
+msgstr ""
 
-#: a11y/addressbook/ea-minicard-view.c:156
-msgid " card"
-msgstr " kaart"
+#: a11y/calendar/ea-cal-view-event.c:485
+msgid "Grab Focus"
+msgstr ""
 
 #: a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
@@ -83,7 +101,7 @@ 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
+#: calendar/gui/e-calendar-view.c:1372
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
@@ -95,80 +113,57 @@ msgstr "Mine tänasele päevale"
 msgid "Go to Date"
 msgstr "Mine kuupäevale"
 
-#: a11y/calendar/ea-cal-view-event.c:235
-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
-msgid "empty"
-msgstr ""
-
-#: a11y/calendar/ea-cal-view-event.c:288
-msgid "calendar view event"
-msgstr ""
-
-#: a11y/calendar/ea-cal-view-event.c:505
-msgid "Grab Focus"
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:147
+#: a11y/calendar/ea-day-view.c:146
 #: a11y/calendar/ea-week-view.c:148
-#, c-format
-msgid ", %d event"
-msgstr ", %d sündmus"
+#, fuzzy, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] ", %d sündmus"
+msgstr[1] ", %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:148
+#: a11y/calendar/ea-week-view.c:150
+msgid "It has no events."
+msgstr ""
 
-#: a11y/calendar/ea-day-view.c:150
-msgid "work week view :"
-msgstr "töönädala vaade :"
+#: a11y/calendar/ea-day-view.c:152
+#, fuzzy, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Töönädala vaade"
 
-#: a11y/calendar/ea-day-view.c:154
-msgid "day view :"
-msgstr "päeva vaade :"
+#: a11y/calendar/ea-day-view.c:155
+#, fuzzy, c-format
+msgid "Day View: %s. %s"
+msgstr "Päeva vaade"
 
-#: a11y/calendar/ea-day-view.c:181
+#: a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:183
+#: a11y/calendar/ea-day-view.c:188
 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
-msgid "a table to view and select the current time range"
-msgstr ""
-
 #: a11y/calendar/ea-gnome-calendar.c:187
-#: calendar/gui/calendar-component.c:519
+#: calendar/gui/calendar-component.c:520
 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.
 #: 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/calendar-component.c:523
+#: calendar/gui/e-day-view-top-item.c:719
+#: calendar/gui/e-day-view.c:1511
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -176,9 +171,9 @@ msgstr "%a, %d. %b"
 #: a11y/calendar/ea-gnome-calendar.c:192
 #: a11y/calendar/ea-gnome-calendar.c:197
 #: a11y/calendar/ea-gnome-calendar.c:199
-#: calendar/gui/calendar-component.c:524
-#: calendar/gui/calendar-component.c:529
-#: calendar/gui/calendar-component.c:531
+#: calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:530
+#: calendar/gui/calendar-component.c:532
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
@@ -186,25 +181,29 @@ msgstr "%a, %d. %b %Y"
 #: a11y/calendar/ea-gnome-calendar.c:222
 #: a11y/calendar/ea-gnome-calendar.c:228
 #: a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:543
-#: calendar/gui/calendar-component.c:550
-#: calendar/gui/calendar-component.c:556
-#: calendar/gui/calendar-component.c:558
+#: calendar/gui/calendar-component.c:544
+#: calendar/gui/calendar-component.c:551
+#: calendar/gui/calendar-component.c:557
+#: calendar/gui/calendar-component.c:559
 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.
 #: 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/calendar-component.c:549
+#: calendar/gui/e-day-view-top-item.c:723
+#: calendar/gui/e-day-view.c:1527
 #: 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
+#: calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -224,43 +223,51 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:153
-msgid "month view :"
-msgstr "kuu vaade :"
+#: a11y/calendar/ea-week-view.c:155
+#, fuzzy, c-format
+msgid "Month View: %s. %s"
+msgstr "Kuu vaade"
 
-#: a11y/calendar/ea-week-view.c:158
-msgid "week view :"
-msgstr "nädala vaade :"
+#: a11y/calendar/ea-week-view.c:159
+#, fuzzy, c-format
+msgid "Week View: %s. %s"
+msgstr "Nädala vaade"
 
-#: a11y/calendar/ea-week-view.c:185
+#: a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:187
+#: a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr ""
 
-#: a11y/widgets/ea-calendar-item.c:293
-#: a11y/widgets/ea-calendar-item.c:299
-msgid " %d %B %Y"
+#: a11y/widgets/ea-calendar-item.c:290
+#: a11y/widgets/ea-calendar-item.c:296
+#, fuzzy
+msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:301
-msgid "calendar (from "
+#: a11y/widgets/ea-calendar-item.c:298
+#, fuzzy, c-format
+msgid "Calendar: from %s to %s"
+msgstr "iKalendri vorming (.ics)"
+
+#: a11y/widgets/ea-calendar-item.c:333
+msgid "evolution calendar item"
 msgstr ""
 
-#: 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-combo-button.c:40
+#, fuzzy
+msgid "Combo Button"
+msgstr "Ajavööndi nupp"
 
-#: a11y/widgets/ea-calendar-item.c:305
-msgid ")"
-msgstr ")"
+#: a11y/widgets/ea-combo-button.c:50
+#, fuzzy
+msgid "Activate Default"
+msgstr "Kasuta _vaikekodeeringut"
 
-#: a11y/widgets/ea-calendar-item.c:337
-msgid "evolution calendar item"
+#: a11y/widgets/ea-combo-button.c:52
+msgid "Popup Menu"
 msgstr ""
 
 #. addressbook:ldap-init primary
@@ -281,10 +288,7 @@ msgstr "Tõrge LDAP serverisse autentimisel."
 #. addressbook:ldap-auth secondary
 #: addressbook/addressbook-errors.xml.h:8
 msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Kontrolli, kas parool on õigesti kirjutatud ja kas sa kasutad toetatud "
-"logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et "
-"caps lock ei oleks peal."
+msgstr "Kontrolli, kas parool on õigesti kirjutatud ja kas sa kasutad toetatud logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et caps lock ei oleks peal."
 
 #. addressbook:ldap-search-base primary
 #: addressbook/addressbook-errors.xml.h:10
@@ -332,24 +336,36 @@ msgid "Category editor not available."
 msgstr "Kategooriaredaktor ei ole saadaval."
 
 #. 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/addressbook-errors.xml.h:28
 #: 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
+#: mail/mail-errors.xml.h:75
+#: mail/mail-errors.xml.h:77
+#: mail/mail-errors.xml.h:79
+#: mail/mail-errors.xml.h:81
+#: mail/mail-errors.xml.h:83
+#: mail/mail-errors.xml.h:85
+#: mail/mail-errors.xml.h:89
+#: mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
+#. mail-composer:no-attach secondary
+#. mail:no-save-path secondary
 #: addressbook/addressbook-errors.xml.h:30
 #: composer/mail-composer-errors.xml.h:4
-#: mail/mail-errors.xml.h:92
+#: mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
@@ -419,18 +435,34 @@ msgstr "Aadress '{0}' on juba olemas"
 
 #. addressbook:ask-list-add-exists secondary
 #: addressbook/addressbook-errors.xml.h:61
-msgid ""
-"A contact already exists with this address.  Would you like to add a new "
-"card with the same address anyway?"
-msgstr ""
-"Sellise aadressiga kontakt on juba olemas.  Kas sa soovid uut lisada?"
+msgid "A contact already exists with this address.  Would you like to add a new card with the same address anyway?"
+msgstr "Sellise aadressiga kontakt on juba olemas.  Kas sa soovid uut lisada?"
 
 #: addressbook/addressbook-errors.xml.h:62
 #: mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:17
+#: plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Lisa"
 
+#. addressbook:server-version title
+#. calendar:server-version title
+#: addressbook/addressbook-errors.xml.h:64
+#: calendar/calendar-errors.xml.h:142
+msgid "Server Version"
+msgstr "Serveri versioon"
+
+#. addressbook:server-version primary
+#. calendar:server-version primary
+#: addressbook/addressbook-errors.xml.h:66
+#: calendar/calendar-errors.xml.h:144
+msgid "Your server needs to be updated"
+msgstr ""
+
+#. addressbook:server-version secondary
+#: addressbook/addressbook-errors.xml.h:68
+msgid "Some features may not work correctly with your current server version"
+msgstr ""
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
@@ -445,54 +477,127 @@ msgstr "Aadressiraamatut ei õnnestunud laadida"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: 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:1
+msgid "Autocompletion"
+msgstr "Automaatne lõpetamine"
 
-#: 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 "Tõrge autentimisel.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "K_ontaktid"
 
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Sertifikaadid"
 
-#: addressbook/gui/component/addressbook-component.c:98
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Seadista automaatlõpetamist siit"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/addressbook-view.c:1119
+#: calendar/gui/migration.c:378
+msgid "Contacts"
+msgstr "Kontaktid"
+
+#: 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
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution'i S/Mime sertifikaatide haldamise juhtimine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutioni kaustaseadistuste 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"
+
+#. create the local source group
+#. On This Computer is always first and vFolders is always last
+#: addressbook/gui/component/addressbook-component.c:120
+#: addressbook/gui/component/addressbook-migrate.c:493
+#: calendar/gui/migration.c:452
+#: calendar/gui/migration.c:545
+#: mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:199
+#: mail/mail-component.c:270
+#: mail/mail-vfolder.c:222
+msgid "On This Computer"
+msgstr "Kohalikus arvutis"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-component.c:128
+#: addressbook/gui/component/addressbook-migrate.c:501
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: calendar/gui/migration.c:460
+#: calendar/gui/migration.c:553
+#: filter/filter-label.c:123
+#: mail/em-migrate.c:1013
+#: mail/mail-config.c:77
+#: mail/mail-config.glade.h:101
+msgid "Personal"
+msgstr "Isiklik"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:136
+#: addressbook/gui/component/addressbook-migrate.c:509
+msgid "On LDAP Servers"
+msgstr "LDAP serveris"
+
+#: addressbook/gui/component/addressbook-component.c:183
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:99
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Create a new contact"
 msgstr "Loob uue kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:106
+#: addressbook/gui/component/addressbook-component.c:191
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:107
+#: addressbook/gui/component/addressbook-component.c:192
 msgid "Create a new contact list"
 msgstr "Loob uue kontaktide nimekirja"
 
-#: addressbook/gui/component/addressbook-component.c:113
-#: addressbook/gui/component/addressbook-config.c:1116
+#: addressbook/gui/component/addressbook-component.c:198
+#: addressbook/gui/component/addressbook-config.c:1121
 #: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:114
+#: addressbook/gui/component/addressbook-component.c:199
 msgid "Address _Book"
 msgstr "_Aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:115
+#: addressbook/gui/component/addressbook-component.c:200
 msgid "Create a new address book"
 msgstr "Lisab uue aadressiraamatu"
 
-#: addressbook/gui/component/addressbook-component.c:188
+#: addressbook/gui/component/addressbook-component.c:273
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Tõrge aadressiraamatu kataloogide või seadistuste uuendamisel."
 
@@ -512,11 +617,11 @@ msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:904
 #: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: 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
+#: mail/em-folder-properties.c:215
+#: mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
@@ -549,50 +654,24 @@ msgstr "Otsing"
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: addressbook/gui/component/addressbook-config.c:1114
+#: addressbook/gui/component/addressbook-config.c:1119
 #: 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
+#: calendar/gui/migration.c:142
 #: mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:188
+#: calendar/gui/migration.c:189
 #: mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: 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 "Kohalikus arvutis"
-
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: 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"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:509
-msgid "On LDAP Servers"
-msgstr "LDAP serveris"
-
 #: addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
@@ -607,8 +686,7 @@ msgid ""
 "\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..."
 
@@ -640,8 +718,8 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: calendar/gui/calendar-component.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:935
+#: calendar/gui/calendar-component.c:386
 #: calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11
 #: ui/evolution-addressbook.xml.h:8
@@ -652,107 +730,75 @@ msgid "Delete"
 msgstr "Kustuta"
 
 #: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:386
+#: calendar/gui/calendar-component.c:387
 #: calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Omadused..."
 
-#. 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/addressbook-view.c:1130
+#, fuzzy
+msgid "Contact Source Selector"
+msgstr "Kalendri allika valimine"
+
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
+
+#: addressbook/gui/component/addressbook.c:193
+#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+msgid "Failed to authenticate.\n"
+msgstr "Tõrge autentimisel.\n"
+
+#: addressbook/gui/component/addressbook.c:200
+#: plugins/groupwise-account-setup/camel-gw-listener.c:461
+#, fuzzy, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
+#, fuzzy
+msgid "Autocomplete length"
+msgstr "Automaatne lõpetamine"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
-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:3
-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:4
-msgid "Position of the vertical pane in main view."
-msgstr "Vertikaalpaani asukoht põhivaates."
+#, fuzzy
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Vertikaalpaani asukoht kuuvaates"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#: mail/evolution-mail.schemas.in.in.h:71
-msgid "Show the \"Preview\" pane"
+#, fuzzy
+msgid "Show 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
-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
 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
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 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"
-
-#: 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"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Vertical pane position"
 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
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution'i S/Mime sertifikaatide haldamise juhtimine"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutioni kaustaseadistuste 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/apps_evolution_addressbook.schemas.in.in.h:10
+#, fuzzy
+msgid "Whether to show the preview pane."
+msgstr "\"Eelvaatlus\" paani kuvamine."
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -760,19 +806,18 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-attachment.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: 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
-#: plugins/shared-folder/properties.glade.h:3
+#: plugins/shared-folder/properties.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -849,8 +894,7 @@ msgstr "E-posti aadress:"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
+msgstr "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
@@ -875,23 +919,15 @@ msgstr "_Otsingubaas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 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 "
-"juhul, kui LDAP server toetab SSL või TLS protokolli."
+msgstr "See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult juhul, kui LDAP server toetab SSL või TLS protokolli."
 
 #: addressbook/gui/component/ldap-config.glade.h:29
 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 ebaturvalises keskkonnas. Näiteks kui sina ja sinu "
-"LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei "
-"pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
+msgstr "See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
 
 #: addressbook/gui/component/ldap-config.glade.h:30
 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 protokolle. "
-"Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
+msgstr "See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolle. Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
@@ -927,10 +963,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:39
 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. Nimekiri "
-"standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
-"peaksid määrama."
+msgstr "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. Nimekiri standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa peaksid määrama."
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
@@ -964,7 +997,7 @@ msgstr "_Sisselogimismeetod"
 #: addressbook/gui/component/ldap-config.glade.h:47
 #: calendar/gui/dialogs/calendar-setup.c:243
 #: calendar/gui/dialogs/calendar-setup.glade.h:8
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -994,11 +1027,12 @@ 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/alarm-dialog.glade.h:26
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
 #: filter/filter.glade.h:16
-#: mail/em-account-editor.c:1816
+#: mail/em-account-editor.c:1825
 #: plugins/calendar-http/calendar-http.c:263
+#: plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minutit"
 
@@ -1039,181 +1073,180 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address:"
-msgstr "Aadress:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: 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:13
-msgid "Anniversary:"
-msgstr "Aastapäev:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:531
+msgid "Contact Editor"
+msgstr "Kontaktiredaktor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Assistant:"
-msgstr "Assistent:"
+msgid "Full _Name..."
+msgstr "T_äisnimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Birthday:"
-msgstr "Sünnipäev:"
+#, fuzzy
+msgid "Image"
+msgstr "sõnum"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Calendar:"
-msgstr "Kalender:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
+msgstr "MSN Kiirsuhtlusklient"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "City:"
-msgstr "Linn:"
+msgid "Mailing Address"
+msgstr "Kodune aadress"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Company:"
-msgstr "Firma:"
+msgid "Ni_ckname:"
+msgstr "_Hüüdnimi:"
 
 #: 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: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:533
-msgid "Contact Editor"
-msgstr "Kontaktiredaktor"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "Country:"
-msgstr "Riik:"
+msgid "Personal Information"
+msgstr "Isiklik info"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Department:"
-msgstr "Osakond:"
+#, fuzzy
+msgid "Telephone"
+msgstr "<b>Telefon</b>"
 
+#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Free/Busy:"
-msgstr "Vaba/hõivatud:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: addressbook/gui/contact-editor/e-contact-editor.c:199
+#: filter/filter-label.c:122
+#: mail/em-migrate.c:1012
+#: mail/mail-config.c:76
+#: mail/mail-config.glade.h:148
+msgid "Work"
+msgstr "Töö"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "Full _Name..."
-msgstr "T_äisnimi..."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "_Aadress:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Home Page:"
-msgstr "Koduleht:"
+msgid "_Anniversary:"
+msgstr "_Aastapäev:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "MSN Kiirsuhtlusklient"
+msgid "_Assistant:"
+msgstr "_Assistent:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Mailing Address"
-msgstr "Kodune aadress"
+msgid "_Birthday:"
+msgstr "_Sünnipäev:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "Manager:"
-msgstr "Juht:"
+#: plugins/itip-formatter/itip-view.c:1619
+msgid "_Calendar:"
+msgstr "_Kalender:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Ni_ckname:"
-msgstr "_Hüüdnimi:"
+msgid "_Categories"
+msgstr "_Kategooriad"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "Notes:"
-msgstr "Märkused:"
+msgid "_City:"
+msgstr "_Linn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+msgid "_Company:"
+msgstr "_Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "Office:"
-msgstr "Kontor:"
+msgid "_Country:"
+msgstr "_Riik:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "PO Box:"
-msgstr "Sidejaoskonna postkast:"
+msgid "_Department:"
+msgstr "_Osakond:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_File under:"
+msgstr "_Salvesta kui:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "Personal Information"
-msgstr "Isiklik info"
+msgid "_Free/Busy:"
+msgstr "_Vaba/hõivatud:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "Profession:"
-msgstr "Eriala:"
+msgid "_Home Page:"
+msgstr "_Koduleht:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "Spouse:"
-msgstr "Abikaasa:"
+msgid "_Manager:"
+msgstr "_Juht:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "State/Province:"
-msgstr "Maakond/Provints:"
+msgid "_Notes:"
+msgstr "_Märkused:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "Title:"
-msgstr "Tiitel:"
+msgid "_Office:"
+msgstr "_Kontor:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "Video Chat:"
-msgstr "Videovestlus:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr "_Sidejaoskonna postkast:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "Wants to receive HTML mail"
-msgstr "Soovib saada _HTML sõnumeid"
+msgid "_Profession:"
+msgstr "_Eriala:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Web Log:"
-msgstr "Veebilogi:"
+msgid "_Spouse:"
+msgstr "_Abikaasa:"
 
-#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: 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öö"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr "_Maakond/Provints:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "Zip/Postal Code:"
-msgstr "Postiindeks:"
+#: addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "_Tiitel:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:45
-msgid "_Categories"
-msgstr "_Kategooriad"
+msgid "_Video Chat:"
+msgstr "_Videovestlus:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:46
-msgid "_File under:"
-msgstr "_Salvesta kui:"
+msgid "_Wants to receive HTML mail"
+msgstr "Soovib saada _HTML sõnumeid"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr "_Veebilogi:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: 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/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr "_Postiindeks:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -1222,16 +1255,16 @@ 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-list-editor/e-contact-list-editor.c:182
-#: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/widgets/e-addressbook-model.c:310
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: 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:519
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigeeritav"
 
@@ -2203,80 +2236,104 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: 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-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:183
 #: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: 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:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: 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: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-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Kodu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr "Vajalikud väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:307
+#: addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2463
-msgid "This contact belongs to these categories:"
-msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2556
+#: addressbook/gui/contact-editor/e-contact-editor.c:2578
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontaki jaoks pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2557
+#: addressbook/gui/contact-editor/e-contact-editor.c:2579
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: addressbook/gui/contact-editor/e-contact-editor.c:2855
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2284,55 +2341,42 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: addressbook/gui/contact-editor/e-contact-editor.c:2907
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: 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-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
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:156
-msgid "_Full Name:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+msgid "_Full name:"
 msgstr "Täis_nimi:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
 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:"
@@ -2349,18 +2393,6 @@ msgstr "_Riik:"
 msgid "Full Address"
 msgstr "Täisaadress"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_Aadress:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_PO Box:"
-msgstr "_Sidejaoskonna postkast:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_State/Province:"
-msgstr "_Maakond/Provints:"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Postiindeks:"
@@ -2430,10 +2462,6 @@ msgstr "L_iignimi:"
 msgid "_Suffix:"
 msgstr "_Järelliide:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:18
-msgid "_Title:"
-msgstr "_Tiitel:"
-
 #: addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Lisa KS konto:"
@@ -2447,6 +2475,7 @@ msgid "_IM Service:"
 msgstr "_KS teenus:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
+#: plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Asukoht:"
 
@@ -2459,7 +2488,7 @@ msgid "Add an email to the List"
 msgstr "Lisa sõnum loendisse"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:820
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
@@ -2468,7 +2497,6 @@ msgid "Insert email adresses from Adress Book"
 msgstr "Lisab aadressiraamatust e-posti aadressi"
 
 #: 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"
 
@@ -2477,35 +2505,39 @@ msgid "Remove an email address from the List"
 msgstr "Eemaldab e-postiaadressi loendist"
 
 #: 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:10
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sõnumi saatmisel sellesse loendisse"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Loendi nimi:"
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Select"
+msgstr "Vali"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
-#: addressbook/gui/widgets/e-addressbook-model.c:295
-#: 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/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:296
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+msgid "_Members"
+msgstr "_Liikmed"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:713
 msgid "Contact List Members"
 msgstr "Kontaktiloendi liikmed"
 
@@ -2552,6 +2584,417 @@ msgstr ""
 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
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakti"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:303
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-addressbook-view.c:237
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:512
+msgid "Query"
+msgstr "Päring"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:446
+msgid "Error getting book view"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+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:169
+msgid "Name begins with"
+msgstr "Nimi algab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "E-post algab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Kategooria on"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "Suvaline väli sisaldab"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:173
+#: addressbook/gui/widgets/e-addressbook-view.c:178
+msgid "Advanced..."
+msgstr "Edasijõudnutele..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:230
+msgid "Source"
+msgstr "Allikas"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:244
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Tüüp"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+msgid "Address Book"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Salvesta vKaardina..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact..."
+msgstr "Uus kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+msgid "New Contact List..."
+msgstr "Uus kontaktide loend..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Edasta kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924
+msgid "Send Message to Contact"
+msgstr "Saada kontaktile sõnum"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: calendar/gui/calendar-commands.c:120
+#: calendar/gui/print.c:2489
+#: 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:928
+msgid "Copy to Address Book..."
+msgstr "Kopeeri aadressiraamatusse..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:929
+msgid "Move to Address Book..."
+msgstr "Liiguta aadressiraamatusse..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Lõika"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: calendar/gui/calendar-component.c:385
+#: 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:934
+#: 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:1537
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "Suvaline kategooria"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#, fuzzy
+msgid "Print cards"
+msgstr "Trüki ülesanded"
+
+#: 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:6
+#: 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:560
+#: 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:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+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:379
+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:390
+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:360
+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: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"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Tiitel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "Ühik"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+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
+msgid "Has Focus"
+msgstr ""
+
+#: 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
+msgid "Text Model"
+msgstr "Teksti mudel"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Suurim välja nime pikkus"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Veeru laius"
+
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Otsi kontakti\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
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Otsi kontakti."
+
+#: 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.c:160
+msgid "Selected"
+msgstr "Valitud"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
@@ -2572,11 +3015,6 @@ msgstr "Nimekirja liikmed"
 msgid "E-mail"
 msgstr "E-post"
 
-#: 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"
@@ -2607,30 +3045,14 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
-#: 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: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: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 "Koduleht"
@@ -2641,6 +3063,7 @@ msgid "Success"
 msgstr "Õnnestus"
 
 #. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
 #: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
@@ -2661,6 +3084,8 @@ msgid "No Self Contact defined"
 msgstr "Enda kontakti ei ole kirjeldatud"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
 #: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
@@ -2684,15 +3109,10 @@ msgstr "Mitte toetatud protokoll"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: 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/e-calendar-table.c:458
 #: 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"
 
@@ -2718,6 +3138,7 @@ msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Sellist allikat ei ole olemas"
@@ -2733,28 +3154,19 @@ msgstr ""
 
 #: addressbook/gui/widgets/eab-gui-util.c:98
 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."
+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: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õib olla see, et sisestasid "
-"vigase URI või kasutatav LDAP server ei ole kättesaadav."
+msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võib olla see, et sisestasid vigase URI või kasutatav LDAP server ei ole kättesaadav."
 
 #: addressbook/gui/widgets/eab-gui-util.c:110
 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 LDAP'i toega. Kui sa "
-"soovid kasutada Evolution'i koos LDAP'i toega, pead paigaldama omale vastava "
-"Evolution'i paki."
+msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAP'i toega. Kui sa soovid kasutada Evolution'i koos LDAP'i toega, pead paigaldama omale vastava Evolution'i paki."
 
 #: 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 nurjus.  Põhjuseks võib olla see, et sisestasid "
-"vigase URI või kasutatav server ei ole kättesaadav."
+msgstr "Aadressiraamatu avamine nurjus.  Põhjuseks võib olla see, et sisestasid vigase URI või kasutatav server ei ole kättesaadav."
 
 #: addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
@@ -2876,7 +3288,11 @@ msgstr "Mitu VKaarti"
 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:198
 msgid "(none)"
 msgstr "(puudub)"
@@ -2885,16 +3301,6 @@ msgstr "(puudub)"
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
-#: 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"
@@ -2913,24 +3319,22 @@ msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:952
-msgid "Edit Contact Info"
-msgstr "Muuda kontakti andmeid"
-
-#: addressbook/gui/widgets/eab-popup-control.c:982
-msgid "Add to Contacts"
-msgstr "Lisa kontaktide hulka"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1007
+#: addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
+#, fuzzy, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
 msgstr[0] ""
+"\n"
+"\n"
+"Otsi kontakti."
 msgstr[1] ""
+"\n"
+"\n"
+"Otsi kontakti."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:223
 #: addressbook/gui/widgets/eab-vcard-control.c:272
@@ -2945,375 +3349,6 @@ msgstr "Kompaktse VKaardi näitamine"
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Kontakte pole"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakti"
-
-#: 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
-msgid "Error getting book view"
-msgstr ""
-
-#: 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 loend..."
-
-#: 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
-msgid "Has Focus"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valitud"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
-#: 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
-msgid "Text Model"
-msgstr "Teksti mudel"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Suurim välja nime pikkus"
-
-#: addressbook/gui/widgets/e-minicard-view.c:171
-msgid ""
-"\n"
-"\n"
-"Search for the Contact\n"
-"\n"
-"or double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Otsi kontakti\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
-msgid ""
-"\n"
-"\n"
-"Search for the Contact."
-msgstr ""
-"\n"
-"\n"
-"Otsi kontakti."
-
-#: 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"
@@ -3338,7 +3373,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:1000
+#: addressbook/printing/e-contact-print-envelope.c:213
+#: addressbook/printing/e-contact-print-envelope.c:234
+msgid "Print envelope"
+msgstr "Trüki ümbrik"
+
+#: addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
@@ -3347,11 +3387,6 @@ msgstr "Kontaktide trükkimine"
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
-#: 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"
@@ -3441,12 +3476,6 @@ 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 "Valikud"
 
@@ -3549,6 +3578,20 @@ msgstr ""
 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
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Määra standardväljundi asemel väljundfail"
@@ -3601,20 +3644,6 @@ msgstr ""
 msgid "Unhandled error"
 msgstr "Käsitlemata 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
-msgid "Couldn't get list of addressbooks"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
@@ -3628,6 +3657,7 @@ msgid "No filename provided."
 msgstr "Failinime ei esitatud."
 
 #. calendar:prompt-cancel-meeting primary
+#. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2
 #: calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
@@ -3636,9 +3666,7 @@ msgstr "Kas soovid teisi osalejaid katkestamisest teavitada?"
 #. 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."
-msgstr ""
-"Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
-"katkestamisest mitte teada saada."
+msgstr "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad katkestamisest mitte teada saada."
 
 #: calendar/calendar-errors.xml.h:5
 #: calendar/calendar-errors.xml.h:15
@@ -3664,16 +3692,12 @@ msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
 #. 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."
-msgstr ""
-"Kõik selle koosoleku kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik selle koosoleku kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. 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."
-msgstr ""
-"Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad "
-"selle ülesande kustutamisest mitte teada saada."
+msgstr "Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle ülesande kustutamisest mitte teada saada."
 
 #. calendar:prompt-delete-task primary
 #: calendar/calendar-errors.xml.h:18
@@ -3682,13 +3706,13 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
 
 #. 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:46
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Kõik selle ülesande kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik selle ülesande kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-cancel-journal primary
 #: calendar/calendar-errors.xml.h:22
@@ -3698,9 +3722,7 @@ msgstr "Kas soovid teisi osalejaid selle päevikukirje katkestamisest teavitada?
 #. 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."
-msgstr ""
-"Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
-"selle päeviku kustutamisest mitte teada saada."
+msgstr "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle päeviku kustutamisest mitte teada saada."
 
 #. calendar:prompt-delete-journal primary
 #: calendar/calendar-errors.xml.h:28
@@ -3711,9 +3733,7 @@ msgstr "Kas sa tõesti soovid kustutada seda päevikukirjet?"
 #. 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."
-msgstr ""
-"Kõik selle päevikukirje kohta käiv teave kustutatakse ja seda ei ole "
-"võimalik enam taastada."
+msgstr "Kõik selle päevikukirje kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-delete-titled-appointment primary
 #: calendar/calendar-errors.xml.h:32
@@ -3721,12 +3741,11 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada sündmust nimega '{0}'?"
 
 #. 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."
-msgstr ""
-"Kõik selle sündmuse kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik selle sündmuse kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-delete-appointment primary
 #: calendar/calendar-errors.xml.h:36
@@ -3744,12 +3763,11 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada päevikukirjet '{0}'?"
 
 #. 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."
-msgstr ""
-"Kõik selle päeviku kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik selle päeviku kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-delete-appointments primary
 #: calendar/calendar-errors.xml.h:56
@@ -3759,9 +3777,7 @@ msgstr "Kas sa tõesti soovid kustutada neid {0} sündmusi?"
 #. 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."
-msgstr ""
-"Kõik nende sündmuste kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik nende sündmuste kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-delete-tasks primary
 #: calendar/calendar-errors.xml.h:60
@@ -3771,9 +3787,7 @@ msgstr "Kas sa tõesti soovid kustutada neid {0} ülesandeid?"
 #. calendar:prompt-delete-tasks secondary
 #: calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Kõik nende ülesannete kohta käiv teave kustutatakse ja seda ei ole võimalik "
-"enam taastada."
+msgstr "Kõik nende ülesannete kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-delete-journals primary
 #: calendar/calendar-errors.xml.h:64
@@ -3783,9 +3797,7 @@ msgstr "Kas sa tõesti soovid kustutada neid {0} päevikukirjeid?"
 #. 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."
-msgstr ""
-"Kõik nende päevikukirjete kohta käiv teave kustutatakse ja seda ei ole "
-"võimalik enam taastada."
+msgstr "Kõik nende päevikukirjete kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
 
 #. calendar:prompt-save-appointment title
 #: calendar/calendar-errors.xml.h:68
@@ -3835,9 +3847,7 @@ msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 #. 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."
-msgstr ""
-"E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
-"neil oma osalemisest teada anda (RSVP)."
+msgstr "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab neil oma osalemisest teada anda (RSVP)."
 
 #: calendar/calendar-errors.xml.h:88
 #: calendar/calendar-errors.xml.h:94
@@ -3855,9 +3865,7 @@ msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 #. 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."
-msgstr ""
-"Värskendatud teave aitab teistel osalejatel nende kalendreid ajakohasena "
-"hoida"
+msgstr "Värskendatud teave aitab teistel osalejatel nende kalendreid ajakohasena hoida"
 
 #. calendar:prompt-send-task primary
 #: calendar/calendar-errors.xml.h:96
@@ -3867,9 +3875,7 @@ msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 #. 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."
-msgstr ""
-"E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
-"neil ülesandele nõusolekut anda."
+msgstr "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab neil ülesandele nõusolekut anda."
 
 #. calendar:prompt-send-updated-task-info primary
 #: calendar/calendar-errors.xml.h:102
@@ -3879,9 +3885,7 @@ msgstr "Kas soovid saata osalejatele värskemat teavet ülesande kohta?"
 #. 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."
-msgstr ""
-"Värskendatud teave aitab teistel osalejatel nende ülesannete nimekirja "
-"ajakohasena hoida"
+msgstr "Värskendatud teave aitab teistel osalejatel nende ülesannete nimekirja ajakohasena hoida"
 
 #. calendar:tasks-crashed primary
 #: calendar/calendar-errors.xml.h:108
@@ -3949,7 +3953,34 @@ msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
 
 #. 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."
+msgid "Adding a meaningful Summary to your task will give your recipients an idea of what your task is about."
+msgstr ""
+
+#. calendar:prompt-no-contents-offline-calendar primary
+#: calendar/calendar-errors.xml.h:134
+#, fuzzy
+msgid "Error loading calendar"
+msgstr "Viga kalendri avamisel"
+
+#. calendar:prompt-no-contents-offline-calendar secondary
+#: calendar/calendar-errors.xml.h:136
+msgid "The calendar is not marked for offline usage"
+msgstr ""
+
+#. calendar:prompt-no-contents-offline-tasks primary
+#: calendar/calendar-errors.xml.h:138
+#, fuzzy
+msgid "Error loading task list"
+msgstr "Viga loendi lisamisel"
+
+#. calendar:prompt-no-contents-offline-tasks secondary
+#: calendar/calendar-errors.xml.h:140
+msgid "The task list is not marked for offline usage"
+msgstr ""
+
+#. calendar:server-version secondary
+#: calendar/calendar-errors.xml.h:146
+msgid " Some features may not work correctly with your current server version"
 msgstr ""
 
 #: calendar/common/authentication.c:49
@@ -3983,6 +4014,68 @@ msgstr "Vaikimisi tähtsus:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 
+#: 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:2
+#: calendar/gui/calendar-component.c:1150
+msgid "Calendars"
+msgstr "Kalendrid"
+
+#: 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 ülesandeloend"
+
+#: 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
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutioni kalendri seadistuste juhtimine"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i kalendri/ülesande redaktor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolutioni kalendrikomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Tasks component"
+msgstr "Evolutioni ülesannetekomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/e-tasks.c:1219
+#: calendar/gui/print.c:1822
+#: calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:881
+#: calendar/gui/tasks-control.c:408
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:701
+#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+msgid "Tasks"
+msgstr "Ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution'i kalendri alarmteadete teenus"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
@@ -3990,7 +4083,7 @@ msgstr[0] "minut"
 msgstr[1] "minutit"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:138
+#: calendar/gui/dialogs/event-editor.c:140
 #: calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Sündmus"
@@ -4001,14 +4094,14 @@ msgstr "Sündmuse pealkiri"
 
 #. End time
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:685
+#: plugins/itip-formatter/itip-view.c:876
 msgid "End time:"
 msgstr "Lõpp:"
 
 #. Location
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: calendar/gui/e-itip-control.c:1118
-#: plugins/itip-formatter/itip-view.c:668
+#: plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Asukoht:"
 
@@ -4018,12 +4111,12 @@ msgstr "_Edasilükkamise aeg:"
 
 #. Start time
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:676
+#: plugins/itip-formatter/itip-view.c:867
 msgid "Start time:"
 msgstr "Algus:"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 #: filter/filter.glade.h:11
 #: mail/mail-config.glade.h:153
@@ -4126,10 +4219,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution'i kalendri alarmteadete teenus"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa lähtestada Bonobot"
@@ -4143,239 +4232,407 @@ msgid "invalid time"
 msgstr "vigane aeg"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
-msgid "Allocate less space to weekend appointments"
-msgstr ""
+#, fuzzy
+msgid "Alarm programs"
+msgstr "Programmi käivitamine"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-msgid "Calendars to run alarms for"
-msgstr ""
+#, fuzzy
+msgid "Ask for confirmation when deleting items"
+msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-msgid "Color of tasks that are due today"
+#, fuzzy
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Täna tähtaja ületavate ülesannete värv"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-msgid "Color of tasks that are overdue"
+#, fuzzy
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Tähtaja ületanud ülesannete värvus"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
-msgid "Days that are work days"
-msgstr "Päevad, mis on tööpäevad"
+msgid "Calendars to run alarms for"
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Default timezone for meetings"
-msgstr "Vaikimisi ajavöönd koosolekute jaoks"
+#, fuzzy
+msgid "Compress weekends in month view"
+msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
-msgid "Hour the workday ends on"
-msgstr "Tund, millal tööpäev lõpeb"
+#, fuzzy
+msgid "Confirm expunge"
+msgstr "_Kinnituse küsimine enne kataloogi puhastamist"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
-msgid "Hour the workday starts on"
-msgstr "Tund, millal tööpäev algab"
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
-msgid "Intervals shown in Day and Work Week views"
-msgstr ""
+#, fuzzy
+msgid "Default appointment reminder"
+msgstr "Kustuta sündmus"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "List of urls for free/busy publishing"
-msgstr ""
+#, fuzzy
+msgid "Default reminder units"
+msgstr "Vaikimisi akna laius."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday ends on"
-msgstr "Minut, millal tööpäev lõpeb"
+#, fuzzy
+msgid "Default reminder value"
+msgstr "Vaikimisi vastamise laad"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Minute the workday starts on"
-msgstr "Minut, millal tööpäev algab"
+#, fuzzy
+msgid "Free/busy server urls"
+msgstr "Soov saada vaba/hõivatud teavet"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for default reminder"
-msgstr ""
+#, fuzzy
+msgid "Free/busy template url"
+msgstr "Vaba/hõivatud vastus"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Number of units for determining when to hide tasks"
-msgstr ""
+#, fuzzy
+msgid "Hide completed tasks"
+msgstr "_Peida lõpetatud ülesanded pärast"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane"
-msgstr "Horisontaalpaani asukoht"
+#, fuzzy
+msgid "Hide task units"
+msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the horizontal pane in the month view"
-msgstr "Horisontaalpaani asukoht kuuvaates"
+msgid "Hide task value"
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane"
-msgstr "Vertikaalpaani asukoht"
+msgid "Horizontal pane position"
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the month view"
-msgstr "Vertikaalpaani asukoht kuuvaates"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Position of the vertical pane in the task view"
-msgstr "Vertikaalpaani asukoht ülesandevaates"
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
-msgid "Programs that can run as part of alarms"
-msgstr ""
+#, fuzzy
+msgid "Last alarm time"
+msgstr "algusaeg"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-msgid "Show where events end in week and month views"
-msgstr "Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
+msgid "List of server urls for free/busy publishing."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "The url template to use as a free/busy data fallback"
-msgstr ""
+#, fuzzy
+msgid "Minute the workday ends on, 0 to 59"
+msgstr "Minut, millal tööpäev lõpeb"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-msgid "Time last alarm ran"
-msgstr ""
+#, fuzzy
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minut, millal tööpäev algab"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "Units for determining when to hide tasks"
-msgstr ""
+#, fuzzy
+msgid "Month view horizontal pane position"
+msgstr "Horisontaalpaani asukoht"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-msgid "Units of default reminder"
-msgstr ""
+#, fuzzy
+msgid "Month view vertical pane position"
+msgstr "Vertikaalpaani asukoht põhivaates"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Weekday the week starts on"
-msgstr "Nädalapäev, millal nädal algab"
+msgid "Number of units for determining for a default reminder."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether or not to use the notification tray for display alarms"
+msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
 #: 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"
+#, fuzzy
+msgid "Overdue tasks color"
+msgstr "_Tähtaja ületanud ülesanded:"
 
 #: 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"
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to hide completed tasks"
-msgstr "Kas peita lõpetatud ülesanded"
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to set a default reminder for events"
-msgstr ""
+#, fuzzy
+msgid "Position of the vertical pane, between task list and the task preview pane, in pixels."
+msgstr "Vertikaalpaani asukoht ülesandevaates"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr ""
-"Kas näidata kellaaega 24-tunnises vormingus või kasutada EL/PL vormingut"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
-msgid "Whether to show week numbers in date navigator"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+msgid "Programs that are allowed to be run by alarms."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#, fuzzy
+msgid "Show week numbers in date navigator"
+msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#, fuzzy
+msgid "Tasks due today color"
+msgstr "_Tänase tähtajaga ülesanded:"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+msgid "Tasks vertical pane position"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#, no-c-format
+msgid "The url template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+msgid "Time divisions</short> <short>Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Time the last alarm ran, in time_t."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Timezone"
+msgstr "Ajavöönd"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Week start"
+msgstr "Nädala algus"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#, fuzzy
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "Nädalapäev, millal nädal algab"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#, fuzzy
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#, fuzzy
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#, fuzzy
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#, fuzzy
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Kas peita lõpetatud ülesanded"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#, fuzzy
+msgid "Whether to set a default reminder for appointments."
+msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#, fuzzy
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Kas näidata kellaaega 24-tunnises vormingus või kasutada EL/PL vormingut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#, fuzzy
+msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+msgid "Work days"
+msgstr "Tööpäevad"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#, fuzzy
+msgid "Workday end hour"
+msgstr "Tund, millal tööpäev lõpeb"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#, fuzzy
+msgid "Workday end minute"
+msgstr "Ühendu v_õrku"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#, fuzzy
+msgid "Workday start hour"
+msgstr "Tund, millal tööpäev algab"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#, fuzzy
+msgid "Workday start minute"
+msgstr "Tund, millal tööpäev algab"
+
+#: 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
+msgid "Unmatched"
+msgstr "Puudub"
+
 #: calendar/gui/calendar-commands.c:120
-#: calendar/gui/calendar-component.c:567
+#: calendar/gui/calendar-component.c:568
 #: 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
+#: calendar/gui/gnome-cal.c:1942
+#: plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
 #: 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."
+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:361
 msgid "Purge events older than"
 msgstr "Puhasta sündmustest, mis on vanemad kui"
 
 #: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #: filter/filter.glade.h:14
 #: plugins/calendar-http/calendar-http.c:265
+#: plugins/calendar-weather/calendar-weather.c:566
+#: widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-component.c:383
+#: calendar/gui/calendar-component.c:384
 #: calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:638
+#: calendar/gui/calendar-component.c:703
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:999
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:950
+#: calendar/gui/calendar-component.c:1015
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1060
+#: calendar/gui/calendar-component.c:1125
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: 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
+#: calendar/gui/calendar-component.c:1316
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1317
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1318
 msgid "Create a new appointment"
 msgstr "Lisab uue sündmuse"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1324
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1325
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1326
 msgid "Create a new meeting request"
 msgstr "Loob uue koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1267
+#: calendar/gui/calendar-component.c:1332
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1268
+#: calendar/gui/calendar-component.c:1333
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1334
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava sündmuse"
 
-#: calendar/gui/calendar-component.c:1275
+#: calendar/gui/calendar-component.c:1340
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1276
+#: calendar/gui/calendar-component.c:1341
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:1277
+#: calendar/gui/calendar-component.c:1342
 msgid "Create a new calendar"
 msgstr "Loob uue kalendri"
 
@@ -4395,27 +4652,6 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: 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
 msgid "Error while opening the calendar"
 msgstr "Viga kalendri avamisel"
@@ -4429,137 +4665,116 @@ msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
 #: 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
+#: shell/e-shell.c:1259
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Valikud</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Kordumine</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Alarmi lisamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Kohandatud _sõnum"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Kohandatud alarmheli"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "_Sõnum:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Heli mängimine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9
 #: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Hoiatuse kuvamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Programmi käivitamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
 #: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "E-kirja saatmine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Argumendid:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Programm:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "_Alarmi täiendav kordamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Heli:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "pärast"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "enne"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "päev(a)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "sündmuse lõppu"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
 #: filter/filter.glade.h:15
 #: plugins/calendar-http/calendar-http.c:264
+#: plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
 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
-msgid "option menu to choose alarm relative"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-dialog.glade.h:30
-msgid "option menu to choose alarm time"
-msgstr ""
-
-#: 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
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
@@ -4575,68 +4790,111 @@ msgstr "L_isa"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
-msgid "Copy calendar contents locally for offline operation"
-msgstr ""
+#: calendar/gui/dialogs/cal-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:103
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "Vä_rvus:"
+#: calendar/gui/dialogs/cal-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:106
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
-msgid "Tasks List"
-msgstr "Ülesannete loend"
+#: calendar/gui/dialogs/cal-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:109
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
-msgid "Calendar Properties"
-msgstr "Kalendri omadused"
+#: calendar/gui/dialogs/cal-attachment-bar.c:298
+#: calendar/gui/dialogs/cal-attachment-bar.c:913
+#: composer/e-msg-composer-attachment-bar.c:295
+#: mail/em-utils.c:436
+msgid "attachment"
+msgstr "manus"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
-msgid "Task List Properties"
-msgstr "Ülesandeloendi omadused"
+#: calendar/gui/dialogs/cal-attachment-bar.c:439
+#: calendar/gui/dialogs/meeting-page.c:781
+#: composer/e-msg-composer-attachment-bar.c:437
+#: plugins/shared-folder/properties.glade.h:14
+msgid "_Remove"
+msgstr "_Eemalda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Kalendri lisamine"
+#: calendar/gui/dialogs/cal-attachment-bar.c:440
+#: composer/e-msg-composer-attachment-bar.c:438
+#: mail/em-folder-tree.c:2818
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Omadused"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "Lisa uus ülesandeloend"
+#: calendar/gui/dialogs/cal-attachment-bar.c:442
+#: composer/e-msg-composer-attachment-bar.c:440
+msgid "_Add attachment..."
+msgstr "_Lisa manus..."
 
-#: 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/cal-attachment-bar.c:699
+#, fuzzy
+msgid "Attachment Bar"
+msgstr "Manus"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Kalendri lisamine"
+#: calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: calendar/gui/dialogs/cal-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-select-file.c:95
+#: composer/e-msg-composer-select-file.c:115
+msgid "Suggest automatic display of attachment"
+msgstr "Manuse automaatkuvamise soovitamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "Lisa uus _ülesandeloend"
+#: calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: composer/e-msg-composer-select-file.c:230
+msgid "Attach file(s)"
+msgstr "Faili(de) manustamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-msgid "_Refresh:"
-msgstr "_Värskendamissagedus:"
+#: calendar/gui/dialogs/cal-attachment.c:197
+#: calendar/gui/dialogs/cal-attachment.c:213
+#: 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"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/cal-attachment.c:205
+#: 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"
 
-#: 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"
+#: calendar/gui/dialogs/cal-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Manuse omadused"
+
+#: calendar/gui/dialogs/cal-attachment.glade.h:3
+#: 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:68
+msgid "Description:"
+msgstr "Kirjeldus:"
 
+#: calendar/gui/dialogs/cal-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Faili nimi:"
+
+#: calendar/gui/dialogs/cal-attachment.glade.h:5
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "MIME tüüp:"
+
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: 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
+#: mail/em-account-prefs.c:460
+#: mail/em-composer-prefs.c:888
 #: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Lubatud"
@@ -4656,277 +4914,329 @@ msgstr "Ära eemalda"
 #: 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
+#: mail/em-account-prefs.c:307
+#: mail/em-account-prefs.c:335
+#: mail/em-account-prefs.c:366
 msgid "Disable"
 msgstr "Keela"
 
 #: 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
+#: mail/em-account-prefs.c:307
+#: mail/em-account-prefs.c:335
+#: mail/em-account-prefs.c:368
 msgid "Enable"
 msgstr "Luba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Alarmid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Üldine</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>Avalikustamine</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Ülesandeloend</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Aeg</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Töönädal</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
-"aadressist.</i>"
+msgstr "<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post aadressist.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendri ja ülesannete sätted"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Päev(a)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Kuva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: mail/mail-config.glade.h:74
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: mail/mail-config.glade.h:73
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Reede"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Tund(i)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minut(it)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "S_un"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletuse näitamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_hu"
 msgstr "_N"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Template:"
 msgstr "Mall:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/recurrence-page.c:1043
 #: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time format:"
 msgstr "Ajavorming:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/recurrence-page.c:1041
 #: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "W_eek starts:"
 msgstr "Nä_dala algus:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/recurrence-page.c:1042
 #: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Add URL"
 msgstr "_URL'i lisamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Day begins:"
 msgstr "Päev _algab:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Fri"
 msgstr "_R"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Hide completed tasks after"
 msgstr "_Peida lõpetatud ülesanded pärast"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Mon"
 msgstr "_E"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Overdue tasks:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Sat"
 msgstr "_L"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Show appointment end times in week and month views"
 msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Time divisions:"
 msgstr "_Aja jaotised:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Tue"
 msgstr "_T"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Wed"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "option menu to choose reminder units"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose time units"
 msgstr ""
 
+#: 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ä_rvus:"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+msgid "Tasks List"
+msgstr "Ülesannete loend"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+msgid "Calendar Properties"
+msgstr "Kalendri omadused"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+msgid "Task List Properties"
+msgstr "Ülesandeloendi omadused"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "Lisa uus ülesandeloend"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#: mail/mail-config.glade.h:102
+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
+msgid "_Add Task List"
+msgstr "Lisa uus _ülesandeloend"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+#: plugins/calendar-weather/calendar-weather.c:549
+msgid "_Refresh:"
+msgstr "_Värskendamissagedus:"
+
+#: 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
+#: plugins/calendar-weather/calendar-weather.c:567
+msgid "weeks"
+msgstr "nädalat"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
@@ -4942,8 +5252,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
@@ -4965,94 +5274,168 @@ 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.c:257
+#: 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:2261
+msgid " to "
+msgstr " kuni "
+
+#: 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/comp-editor.c:181
+#: composer/e-msg-composer.c:2676
+#, c-format
+msgid "Attached message - %s"
+msgstr ""
+
+#. translators, this count will always be >1
+#: calendar/gui/dialogs/comp-editor.c:186
+#: calendar/gui/dialogs/comp-editor.c:349
+#: composer/e-msg-composer.c:2681
+#: composer/e-msg-composer.c:2844
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/comp-editor.c:412
+#: calendar/gui/e-calendar-table.c:1164
+#: calendar/gui/e-calendar-view.c:1402
+#: composer/e-msg-composer.c:2906
+#: mail/em-folder-tree.c:1046
+#: 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:105
+#: ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "_Kopeeri"
+
+#: calendar/gui/dialogs/comp-editor.c:413
+#: composer/e-msg-composer.c:2907
+#: mail/em-folder-tree.c:1047
+#: mail/em-folder-tree.c:2311
+#: mail/em-folder-view.c:860
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Liiguta"
+
+#: calendar/gui/dialogs/comp-editor.c:415
+#: composer/e-msg-composer.c:2909
+#: mail/em-folder-tree.c:1049
+#: mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:659
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:820
+#: composer/e-msg-composer.c:2310
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> fail manusena"
+msgstr[1] "<b>%d</b> faili manusena"
+
+#: calendar/gui/dialogs/comp-editor.c:873
+#: composer/e-msg-composer.c:2339
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba peitmine (tõsta manused siia)"
+
+#: calendar/gui/dialogs/comp-editor.c:876
+#: calendar/gui/dialogs/comp-editor.c:928
+#: composer/e-msg-composer.c:2342
+#: composer/e-msg-composer.c:3471
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba kuvamine (tõsta manused siia)"
+
+#: calendar/gui/dialogs/comp-editor.c:952
+msgid "Attachment Button: Press space key to toggle attachment bar"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1499
+#: calendar/gui/dialogs/comp-editor.c:1542
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:1505
+#: calendar/gui/dialogs/comp-editor.c:1548
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:907
-#: calendar/gui/dialogs/comp-editor.c:950
+#: calendar/gui/dialogs/comp-editor.c:1507
+#: calendar/gui/dialogs/comp-editor.c:1550
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:954
+#: calendar/gui/dialogs/comp-editor.c:1511
+#: calendar/gui/dialogs/comp-editor.c:1554
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:913
-#: calendar/gui/dialogs/comp-editor.c:956
+#: calendar/gui/dialogs/comp-editor.c:1513
+#: calendar/gui/dialogs/comp-editor.c:1556
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:916
-#: calendar/gui/dialogs/comp-editor.c:959
+#: calendar/gui/dialogs/comp-editor.c:1516
+#: calendar/gui/dialogs/comp-editor.c:1559
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:927
-#: calendar/gui/dialogs/comp-editor.c:969
+#: calendar/gui/dialogs/comp-editor.c:1527
+#: calendar/gui/dialogs/comp-editor.c:1569
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1368
-#: calendar/gui/dialogs/comp-editor.c:1392
+#: calendar/gui/dialogs/comp-editor.c:2001
+#: calendar/gui/dialogs/comp-editor.c:2034
+#: calendar/gui/dialogs/comp-editor.c:2058
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1416
+#: calendar/gui/dialogs/comp-editor.c:2082
 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 nurjus"
@@ -5125,67 +5508,67 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:147
+#: calendar/gui/dialogs/event-editor.c:149
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:159
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:372
+#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:233
+#: calendar/gui/dialogs/event-editor.c:378
 msgid "Scheduling"
 msgstr "Plaanimine"
 
-#: calendar/gui/dialogs/event-editor.c:166
-#: calendar/gui/dialogs/event-editor.c:231
-#: calendar/gui/dialogs/event-editor.c:375
+#: calendar/gui/dialogs/event-editor.c:168
+#: calendar/gui/dialogs/event-editor.c:236
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Invitations"
 msgstr "Kutsed"
 
-#: calendar/gui/dialogs/event-page.c:718
+#: calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:721
+#: calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:887
-#: calendar/gui/dialogs/task-page.c:553
+#: calendar/gui/dialogs/event-page.c:885
+#: calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: calendar/gui/dialogs/event-page.c:897
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:920
+#: calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:927
+#: calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1668
+#: calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' ei saa avada."
 
-#: calendar/gui/dialogs/event-page.c:1874
+#: calendar/gui/dialogs/event-page.c:1872
 #, 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:1882
+#: calendar/gui/dialogs/event-page.c:1880
 #, 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:1890
+#: calendar/gui/dialogs/event-page.c:1888
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5205,15 +5588,17 @@ msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Sisu</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:2
 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
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
 msgstr "<b>Saatmise valikud</b>"
 
@@ -5230,7 +5615,7 @@ msgid "C_ustomize..."
 msgstr "_Kohanda..."
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
@@ -5239,15 +5624,15 @@ msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "_Liigitamine"
 
 #: 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/dialogs/task-page.glade.h:8
 #: calendar/gui/e-cal-list-view.c:255
 #: calendar/gui/e-cal-model.c:305
+#: calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Salajane"
 
@@ -5260,19 +5645,19 @@ msgid "Locat_ion:"
 msgstr "_Asukoht:"
 
 #: 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/dialogs/task-page.glade.h:10
 #: calendar/gui/e-cal-list-view.c:254
 #: calendar/gui/e-cal-model.c:303
+#: calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Isiklik"
 
 #: 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/dialogs/task-page.glade.h:11
 #: calendar/gui/e-cal-list-view.c:253
 #: calendar/gui/e-cal-model.c:294
 #: calendar/gui/e-cal-model.c:301
+#: calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Avalik"
 
@@ -5281,7 +5666,7 @@ msgid "Show time as _busy"
 msgstr "Näita aega kui _hõivatut"
 
 #: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "K_okkuvõte:"
 
@@ -5308,17 +5693,23 @@ msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-cal-model-tasks.c:652
 #: calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2122
+#: composer/e-msg-composer.c:2117
 #: 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
+#: mail/em-account-editor.c:1273
+#: mail/em-account-prefs.c:421
+#: mail/em-folder-view.c:998
+#: plugins/calendar-weather/calendar-weather.c:371
+#: plugins/calendar-weather/calendar-weather.c:425
+#: plugins/itip-formatter/itip-formatter.c:1376
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: widgets/misc/e-cell-date-edit.c:248
 #: widgets/misc/e-dateedit.c:458
@@ -5343,12 +5734,6 @@ msgstr "Vähemalt üks osaleja peab olema märgitud."
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
-#: 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:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -5392,7 +5777,7 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:145
+#: calendar/gui/dialogs/task-editor.c:146
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:265
 #: calendar/gui/e-meeting-time-sel.etspec.h:10
@@ -5495,51 +5880,51 @@ msgstr "Kõik juhtumid"
 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:799
+#: calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: calendar/gui/dialogs/recurrence-page.c:910
+#: calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "esimene"
 
-#: calendar/gui/dialogs/recurrence-page.c:972
+#: calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "teine"
 
-#: calendar/gui/dialogs/recurrence-page.c:973
+#: calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "neljas"
 
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "viimane"
 
-#: calendar/gui/dialogs/recurrence-page.c:998
+#: calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1026
+#: calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "päev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1163
+#: calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1349
+#: calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2302
+#: calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -5548,7 +5933,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
@@ -5593,6 +5978,10 @@ msgstr "aasta(t)"
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
+#: calendar/gui/dialogs/task-details-page.c:522
+msgid "Web Page"
+msgstr "Veebileht"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Muu</span>"
@@ -5602,11 +5991,12 @@ msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Olek</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: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-calendar-table.c:457
 #: calendar/gui/e-itip-control.c:896
 #: calendar/gui/e-meeting-store.c:196
 #: calendar/gui/e-meeting-store.c:219
@@ -5616,41 +6006,41 @@ msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #: 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: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/e-calendar-table.c:456
 #: 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:252
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #: 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:250
-#: calendar/gui/e-calendar-table.c:382
 #: calendar/gui/e-cal-model.c:899
+#: calendar/gui/e-calendar-table.c:383
 #: 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: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/e-calendar-table.c:455
 #: calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Pole alanud"
@@ -5660,7 +6050,7 @@ msgid "P_ercent complete:"
 msgstr "Täitmis_protsent"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -5669,6 +6059,7 @@ msgid "_Date completed:"
 msgstr "_Lõpetamise kuupäev:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "Tä_htsus:"
 
@@ -5680,55 +6071,47 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: calendar/gui/dialogs/task-editor.c:136
+#: calendar/gui/dialogs/task-editor.c:137
 #: calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/dialogs/task-editor.c:156
-#: calendar/gui/dialogs/task-editor.c:218
-#: calendar/gui/dialogs/task-editor.c:356
+#: calendar/gui/dialogs/task-editor.c:157
+#: calendar/gui/dialogs/task-editor.c:219
+#: calendar/gui/dialogs/task-editor.c:358
 msgid "Assignment"
 msgstr "Täitjad"
 
-#: calendar/gui/dialogs/task-page.c:526
+#: calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: calendar/gui/dialogs/task-page.c:870
+#: calendar/gui/dialogs/task-page.c:868
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ei saa avada ülesandeid '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Põhiline</span>"
-
 #: calendar/gui/dialogs/task-page.glade.h:4
-msgid "<span weight=\"bold\">Date and Time</span>"
-msgstr "<span weight=\"bold\">Kuupäev ja aeg</span>"
-
-#: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ad_vanced send options"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Kirjeldus:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
 msgstr "Ülesande kirjeldus"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -5745,8 +6128,9 @@ msgid "<b>Publishing _Location</b>"
 msgstr "<b>Avalikustamise _asukoht</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Editor"
-msgstr "Vaba/Hõivatud teabe redaktor"
+#, fuzzy
+msgid "Free/Busy Publishing Settings"
+msgstr "Vaba/Hõivatud teave"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
@@ -5852,7 +6236,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: calendar/gui/e-cal-component-preview.c:70
-#: mail/em-folder-view.c:2467
+#: mail/em-folder-view.c:2520
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliki, et avada aadressi %s"
@@ -5878,8 +6262,12 @@ msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #. write status
+#. translators: exchange out of office status header
+#. Status
 #: calendar/gui/e-cal-component-preview.c:222
 #: calendar/gui/e-itip-control.c:1132
+#: plugins/exchange-account-setup/exchange-account-setup.c:129
+#: plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Olek:"
 
@@ -5887,183 +6275,252 @@ msgstr "Olek:"
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: 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:299
 msgid "Web Page:"
 msgstr "Veebileht:"
 
-#: calendar/gui/e-calendar-table.c:403
+#: 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:21
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#: calendar/gui/e-cal-model-calendar.c:179
+#: calendar/gui/e-calendar-table.c:434
+msgid "Free"
+msgstr "Vaba"
+
+#: calendar/gui/e-cal-model-calendar.c:182
+#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-meeting-time-sel.c:412
+msgid "Busy"
+msgstr "Hõivatud"
+
+#: 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"
+
+#: calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-cal-model.c:905
+#: 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-tasks.c:1017
+#: calendar/gui/e-cal-model.c:905
+#: calendar/gui/e-meeting-list-view.c:164
+#: calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "Ei"
+
+#. 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
+#: mail/em-utils.c:1157
+#: plugins/itip-formatter/itip-formatter.c:251
+#: plugins/itip-formatter/itip-formatter.c:1398
+#: plugins/plugin-manager/plugin-manager.c:72
+#: shell/e-component-registry.c:201
+#: shell/e-component-registry.c:205
+#: 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-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: 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:516
+#, fuzzy
+msgid "Task Table"
+msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-calendar-table.c:689
+#: calendar/gui/e-calendar-table.c:694
 #: calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:873
 #: calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1014
 #: calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1241
 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
+#: calendar/gui/e-calendar-table.c:1156
+#: calendar/gui/e-calendar-view.c:1395
+#: mail/em-folder-view.c:964
 #: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:1152
+#: calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: 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
+#: calendar/gui/e-calendar-table.c:1158
+#: calendar/gui/e-calendar-view.c:1396
+#: mail/em-folder-view.c:966
+#: mail/em-popup.c:493
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1154
-#: calendar/gui/e-calendar-view.c:1370
-#: calendar/gui/e-calendar-view.c:1391
+#: calendar/gui/e-calendar-table.c:1159
+#: calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1397
 #: ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:121
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1158
-#: calendar/gui/e-calendar-view.c:1395
+#: calendar/gui/e-calendar-table.c:1163
+#: calendar/gui/e-calendar-view.c:1401
 #: 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: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:1160
-#: calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1397
+#: calendar/gui/e-calendar-table.c:1165
+#: calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1403
 #: 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-mail-message.xml.h:119
 #: ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:1164
+#: calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1165
+#: calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: calendar/gui/e-calendar-table.c:1166
+#: calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1167
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
 #. FIXME: need to disable for undeletable folders
-#: 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
+#: calendar/gui/e-calendar-table.c:1176
+#: calendar/gui/e-calendar-view.c:1414
+#: mail/em-folder-tree.c:2814
+#: mail/em-folder-view.c:989
 #: ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1323
+#: calendar/gui/e-calendar-table.c:1328
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -6074,9 +6531,7 @@ 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:611
+#: mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -6096,174 +6551,83 @@ 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 sortimine"
 
-#: calendar/gui/e-calendar-view.c:1179
+#: calendar/gui/e-calendar-view.c:1185
 msgid "Moving items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1181
+#: calendar/gui/e-calendar-view.c:1187
 msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1364
+#: calendar/gui/e-calendar-view.c:1370
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1371
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1373
 msgid "New Task"
 msgstr "Uus ülesanne"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1377
+#: calendar/gui/e-calendar-view.c:1383
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1385
 #: ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1386
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1385
+#: calendar/gui/e-calendar-view.c:1391
 #: ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Avalikusta vaba/hõivatud teave"
 
-#: calendar/gui/e-calendar-view.c:1401
+#: calendar/gui/e-calendar-view.c:1407
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1402
+#: calendar/gui/e-calendar-view.c:1408
 msgid "Mo_ve to Calendar..."
 msgstr "_Liiguta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1403
+#: calendar/gui/e-calendar-view.c:1409
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1404
+#: calendar/gui/e-calendar-view.c:1410
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1409
+#: calendar/gui/e-calendar-view.c:1415
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1416
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1411
+#: calendar/gui/e-calendar-view.c:1417
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: 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"
-
-#. 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:115
 #: e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -6271,6 +6635,10 @@ 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:118
 #: e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
@@ -6288,33 +6656,38 @@ msgstr ""
 "\n"
 "%s"
 
+#: calendar/gui/e-day-view-time-item.c:527
+#, 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:715
+#: calendar/gui/e-day-view.c:1494
+#: calendar/gui/e-week-view-main-item.c:312
+#: calendar/gui/print.c:1517
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
+
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:748
-#: calendar/gui/e-week-view.c:513
+#: calendar/gui/e-week-view.c:512
 #: 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:751
-#: calendar/gui/e-week-view.c:516
+#: calendar/gui/e-week-view.c:515
 #: calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
 
-#. 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)"
@@ -6405,28 +6778,30 @@ msgstr "iKalendri viga"
 #: 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
+#: plugins/itip-formatter/itip-view.c:329
+#: plugins/itip-formatter/itip-view.c:330
+#: plugins/itip-formatter/itip-view.c:397
+#: plugins/itip-formatter/itip-view.c:398
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
 #: 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."
+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
+#: calendar/gui/itip-utils.c:422
+#: plugins/itip-formatter/itip-formatter.c:1389
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
 #: calendar/gui/e-itip-control.c:1141
-#: calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:425
+#: plugins/itip-formatter/itip-formatter.c:1392
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
@@ -6434,8 +6809,9 @@ msgstr "Proovinõusolek antud"
 #: 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
+#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:454
+#: plugins/itip-formatter/itip-formatter.c:1395
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
@@ -6650,10 +7026,9 @@ msgid "Attendee status updated\n"
 msgstr "Osavõtja olek värskendatud\n"
 
 #: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:744
+#: plugins/itip-formatter/itip-formatter.c:852
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
+msgstr "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
 
 #: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
@@ -6702,9 +7077,9 @@ msgid "Send Latest Information"
 msgstr "Saadab värskeima teabe"
 
 #: 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
+#: calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:414
+#: mail/mail-send-recv.c:466
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -6838,6 +7213,40 @@ msgstr "Delegeeritud"
 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:444
+#: calendar/gui/e-meeting-time-sel.c:2104
+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:448
+#: calendar/gui/e-meeting-time-sel.c:2137
+#: 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: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-meeting-time-sel.c:413
 #: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
@@ -6891,36 +7300,13 @@ msgstr "_Vajalikud inimesed"
 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 parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:734
-#: calendar/gui/gnome-cal.c:2429
+#: calendar/gui/e-tasks.c:763
+#: calendar/gui/gnome-cal.c:2373
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6929,45 +7315,34 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:782
+#: calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: calendar/gui/e-tasks.c:864
+#: calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: calendar/gui/e-tasks.c:1061
+#: calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:1084
+#: calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:1111
+#: calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: 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
 msgid "Timezone Button"
 msgstr "Ajavööndi nupp"
 
 #. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/e-week-view-main-item.c:329
 #: calendar/gui/print.c:1501
 msgid "%d %B"
@@ -6978,80 +7353,39 @@ msgid "Updating query"
 msgstr "Päringu uuendamine"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2040
+#: calendar/gui/gnome-cal.c:2057
 #: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Kohandatud vaade"
 
-#: calendar/gui/gnome-cal.c:2041
+#: calendar/gui/gnome-cal.c:2058
 msgid "Save Custom View"
 msgstr "Salvesta kohandatud vaade"
 
-#: calendar/gui/gnome-cal.c:2046
+#: calendar/gui/gnome-cal.c:2063
 #: widgets/menus/gal-view-menus.c:373
 msgid "Define Views..."
 msgstr "Kirjelda vaateid..."
 
-#: calendar/gui/gnome-cal.c:2206
+#: calendar/gui/gnome-cal.c:2223
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2225
+#: calendar/gui/gnome-cal.c:2242
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2318
+#: calendar/gui/gnome-cal.c:2339
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:3286
+#: calendar/gui/gnome-cal.c:3229
 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 ülesandeloend"
-
-#: 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
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutioni kalendri seadistuste juhtimine"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i kalendri/ülesande redaktor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolutioni kalendrikomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Tasks component"
-msgstr "Evolutioni ülesannetekomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-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"
@@ -7108,111 +7442,109 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:270
-#: calendar/gui/itip-utils.c:318
-#: calendar/gui/itip-utils.c:350
+#: calendar/gui/itip-utils.c:271
+#: calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: calendar/gui/itip-utils.c:305
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:393
-#: calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:394
+#: calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:395
-#: calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:396
+#: calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:397
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Päevaraamatu teave"
 
-#: calendar/gui/itip-utils.c:399
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:400
+#: calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud teave"
 
-#: calendar/gui/itip-utils.c:401
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Kalendri teave"
 
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: calendar/gui/itip-utils.c:445
+#: calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: calendar/gui/itip-utils.c:449
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: calendar/gui/itip-utils.c:520
+#: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud teave (%s -> %s)"
 
-#: calendar/gui/itip-utils.c:530
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: calendar/gui/migration.c:150
+#: calendar/gui/migration.c:151
 msgid ""
 "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 ""
-"Evolution'i kontaktikaustade asukoht ja hierarhia on peale Evolution 1.x. "
-"versiooni muutunud.\n"
+"Evolution'i kontaktikaustade asukoht ja hierarhia on peale Evolution 1.x. versiooni muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: calendar/gui/migration.c:154
+#: calendar/gui/migration.c:155
 msgid ""
 "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..."
 
-#: calendar/gui/migration.c:380
+#: calendar/gui/migration.c:381
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:478
-#: calendar/gui/migration.c:571
+#: calendar/gui/migration.c:479
+#: calendar/gui/migration.c:572
 msgid "On The Web"
 msgstr "Veebis"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:735
-#: calendar/gui/migration.c:887
+#: calendar/gui/migration.c:738
+#: calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:764
+#: calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit `%s' ei saa siirdada"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:916
+#: calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' ei saa siirdada"
@@ -7433,21 +7765,17 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2562
-#: calendar/gui/print.c:2648
-#: calendar/gui/print.c:2740
+#: calendar/gui/print.c:2565
+#: calendar/gui/print.c:2653
+#: calendar/gui/print.c:2779
 #: mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: calendar/gui/print.c:2596
+#: calendar/gui/print.c:2600
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/print.c:2762
-msgid "Print Setup"
-msgstr "Trükkimise seaded"
-
 #: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Uus ülesandeloend"
@@ -7520,25 +7848,25 @@ msgstr "Ü_lesannete nimekiri"
 msgid "Create a new task list"
 msgstr "Lisab uue ülesannete nimekirja"
 
-#: calendar/gui/tasks-control.c:372
+#: calendar/gui/tasks-control.c:370
 msgid ""
 "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:375
+#: calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:433
+#: calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
-#: calendar/gui/weekday-picker.c:318
+#. The first letter of each day of the week starting with Sunday
+#: calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
@@ -7566,15 +7894,15 @@ msgstr "vKalendri failid (.vcf)"
 msgid "Appointments and Meetings"
 msgstr "Sündmused ja koosolekud"
 
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Meeldetuletus!!"
 
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Kalendrisündmused"
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7582,7 +7910,11 @@ msgstr ""
 "Evolution leidis Gnome Calendar kalendrifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
+#.
 #. * 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"
@@ -9108,3401 +9440,134 @@ msgstr "Vaikne_ookean/Wallis"
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
-#: 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:129
-msgid "Signing message"
-msgstr "Sõnumi signeerimine"
-
-#: 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:172
-msgid "Verifying message"
-msgstr "Sõnumi verifitseerimine"
-
-#: camel/camel-cipher-context.c:190
-msgid "Encryption is not supported by this cipher"
-msgstr "See šiffer ei toeta krüptimist"
-
-#: camel/camel-cipher-context.c:216
-msgid "Encrypting message"
-msgstr "Sõnumi krüptimine"
-
-#: camel/camel-cipher-context.c:233
-msgid "Decryption is not supported by this cipher"
-msgstr "See šiffer ei toeta dekrüptimist"
-
-#: camel/camel-cipher-context.c:255
-msgid "Decrypting message"
-msgstr "Sõnumi dekrüptimine"
-
-#: 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:302
-msgid "You may not export keys with this cipher"
-msgstr "Sa ei tohi eksportida selle šifriga võtmeid"
-
-#: camel/camel-data-cache.c:134
-msgid "Unable to create cache path"
-msgstr ""
-
-#: camel/camel-data-cache.c:376
-#, c-format
-msgid "Could not remove cache entry: %s: %s"
-msgstr ""
-
-#: camel/camel-disco-diary.c:195
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"Ei olnud võimalik kirjutada logisse kirjet: %s\n"
-"Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
-"taastad ühenduse võrguga."
-
-#: camel/camel-disco-diary.c:258
-#, c-format
-msgid ""
-"Could not open `%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"Ei ole võimalik avada `%s':\n"
-"%s\n"
-"Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
-
-#: camel/camel-disco-diary.c:294
-msgid "Resynchronizing with server"
-msgstr "Taassünkroniseeritakse serveriga"
-
-#: 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:104
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:467
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr ""
-
-#: camel/camel-disco-store.c:405
-msgid "You must be working online to complete this operation"
-msgstr "Selle operatsiooni täitmiseks pead olema võrku ühendatud"
-
-#: 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 "Tõrge toru loomisel -> '%s': %s"
-
-#: camel/camel-filter-driver.c:713
-#: camel/camel-process.c:90
-#, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
-
-#: camel/camel-filter-driver.c:756
-#, c-format
-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
-msgid "Syncing folders"
-msgstr "Kaustade sünkroniseerimine"
-
-#: 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:1429
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Viga filtri täitmisel: %s: %s"
-
-#: camel/camel-filter-driver.c:1119
-msgid "Unable to open spool folder"
-msgstr "Puhverkausta pole võimalik avada"
-
-#: camel/camel-filter-driver.c:1128
-msgid "Unable to process spool folder"
-msgstr "Puhverkausta pole võimalik töödelda"
-
-#: camel/camel-filter-driver.c:1143
-#, c-format
-msgid "Getting message %d (%d%%)"
-msgstr "Võetakse vastu teadet %d (%d%%)"
-
-#: camel/camel-filter-driver.c:1147
-msgid "Cannot open message"
-msgstr "Sõnumit ei saa avada"
-
-#: camel/camel-filter-driver.c:1148
-#: camel/camel-filter-driver.c:1160
-#, c-format
-msgid "Failed on message %d"
-msgstr "Tõrge sõnumi %d juures"
-
-#: camel/camel-filter-driver.c:1174
-#: camel/camel-filter-driver.c:1265
-msgid "Syncing folder"
-msgstr "Kausta sünkroniseerimine"
-
-#: camel/camel-filter-driver.c:1235
-#, c-format
-msgid "Getting message %d of %d"
-msgstr "Tõmban %d. sõnumit %dst"
-
-#: camel/camel-filter-driver.c:1250
-#, c-format
-msgid "Failed at message %d of %d"
-msgstr "Tõrge sõnumi %d juures (kokku sõnumeid: %d)"
-
-#: camel/camel-filter-search.c:135
-msgid "Failed to retrieve message"
-msgstr "Tõrge sõnumi vastuvõtmisel"
-
-#: camel/camel-filter-search.c:385
-msgid "Invalid arguments to (system-flag)"
-msgstr ""
-
-#: camel/camel-filter-search.c:400
-msgid "Invalid arguments to (user-tag)"
-msgstr ""
-
-#: camel/camel-filter-search.c:548
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
-
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: 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.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
-msgid "Learning junk"
-msgstr "Rämpsposti tundmaõppimine"
-
-#: camel/camel-folder.c:1618
-msgid "Learning non-junk"
-msgstr "Mitte-rämpsposti tundmaõppimine"
-
-#: 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"
-"%s"
-msgstr ""
-"Otsinguavaldist ei ole võimalik analüüsida: %s\n"
-"%s"
-
-#: camel/camel-folder-search.c:367
-#: camel/camel-folder-search.c:488
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Viga otsinguavaldise täitmisel: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:674
-#: camel/camel-folder-search.c:707
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
-
-#: camel/camel-folder-search.c:757
-msgid "(match-threads) not allowed inside match-all"
-msgstr ""
-
-#: 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:786
-msgid "(match-threads) expects an array result"
-msgstr ""
-
-#: camel/camel-folder-search.c:792
-msgid "(match-threads) requires the folder set"
-msgstr ""
-
-#: camel/camel-folder-search.c:881
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Täidetakse päringut tundmatul päisel: %s"
-
-#: camel/camel-gpg-context.c:735
-#, c-format
-msgid ""
-"Unexpected GnuPG status message encountered:\n"
-"\n"
-"%s"
-msgstr ""
-"Ootamatu GnuPG olekusõnum:\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:749
-msgid "Failed to parse gpg userid hint."
-msgstr "Tõrge gpg kasutaja ID vihje analüüsimisel."
-
-#: camel/camel-gpg-context.c:773
-msgid "Failed to parse gpg passphrase request."
-msgstr "Tõrge gpg paroolipäringu analüüsimisel."
-
-#: camel/camel-gpg-context.c:787
-#, c-format
-msgid ""
-"You need a passphrase to unlock the key for\n"
-"user: \"%s\""
-msgstr "Sul on kasutaja \"%s\" võtme lahtilukustamiseks vaja parooli"
-
-#: 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."
-
-#: camel/camel-gpg-context.c:822
-msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Tõrge salajase võtme avamisel: sisestati 3 valet parooli."
-
-#: camel/camel-gpg-context.c:828
-#, c-format
-msgid "Unexpected response from GnuPG: %s"
-msgstr "Ootamatu vastus GnuPG'lt: %s"
-
-#: camel/camel-gpg-context.c:880
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Tõrge sõnumi krüptimisel: Saajate aadressid on määramata."
-
-#: camel/camel-gpg-context.c:1157
-#, c-format
-msgid ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-msgstr ""
-"Tõrge GPG töötlemisel %s: %s\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:1162
-#, c-format
-msgid "Failed to GPG %s: %s\n"
-msgstr "Tõrge %s GPG töötlemisel: %s\n"
-
-#: camel/camel-gpg-context.c:1275
-#: camel/camel-smime-context.c:389
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Signeerimisandmete genereerimine ei õnnestunud: %s"
-
-#: 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 nurjus: %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: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 "Tõrge gpg käivitamisel."
-
-#: camel/camel-gpg-context.c:1350
-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:692
-#: camel/camel-smime-context.c:703
-#: camel/camel-smime-context.c:710
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Ei saa kontrollida sõnumi signatuuri: Sõnum on vigaselt vormindatud"
-
-#: camel/camel-gpg-context.c:1477
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Ei saa kontrollida sõnumi signatuuri: ajutise faili loomine nurjus: %s"
-
-#: camel/camel-gpg-context.c:1565
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr ""
-
-#: camel/camel-gpg-context.c:1623
-msgid "This is a digitally encrypted message part"
-msgstr "See on sõnumi digitaalselt krüptitud osa"
-
-#: camel/camel-gpg-context.c:1674
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Tõrge MIME osa dekrüptimisel: 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:1744
-msgid "Unable to parse message content"
-msgstr ""
-
-#: 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"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Tõrge fcntl(2) abil lukustamisel: %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Tõrge flock(2) abil lukustamisel: %s"
-
-#: camel/camel-lock-client.c:100
-#, 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
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ei lukustamine ei õnnestunud, 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:117
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Sõnumifaili %s ei saa avada: %s"
-
-#: 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:154
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Tõrge sõnumi salvestamisel ajutisse faili %s: %s"
-
-#: camel/camel-movemail.c:184
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Soklit ei saa luua: %s"
-
-#: camel/camel-movemail.c:196
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Ei saa forkida: %s"
-
-#: camel/camel-movemail.c:234
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Tõrge Movemail programmis: %s"
-
-#: camel/camel-movemail.c:235
-msgid "(Unknown error)"
-msgstr "(tundmatu viga)"
-
-#: camel/camel-movemail.c:258
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Viga sõnumifaili lugemisel: %s"
-
-#: 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: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-signed.c:559
-msgid "parse error"
-msgstr "analüüsimisviga"
-
-#: camel/camel-net-utils.c:465
-msgid "cannot create thread"
-msgstr "lõime ei saa luua"
-
-#: camel/camel-net-utils.c:612
-#, c-format
-msgid "Resolving: %s"
-msgstr "Lahendan: %s"
-
-#: camel/camel-net-utils.c:634
-msgid "Host lookup failed"
-msgstr "Hostinime lahendamine nurjus"
-
-#: camel/camel-net-utils.c:636
-#, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "Hostinime lahendamine nurjus: %s: %s"
-
-#: camel/camel-net-utils.c:743
-msgid "Resolving address"
-msgstr "Aadressi lahendamine"
-
-#: camel/camel-net-utils.c:763
-msgid "Name lookup failed"
-msgstr "Tõrge nime lahendamisel"
-
-#: camel/camel-net-utils.c:766
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "Tõrge nime lahendamisel: %s"
-
-#: camel/camel-provider.c:59
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-provider.c:61
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: 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:194
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Ei saa laadida '%s': %s"
-
-#: 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:374
-#: camel/camel-session.c:161
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr ""
-
-#: camel/camel-sasl-anonymous.c:35
-msgid "Anonymous"
-msgstr "Anonüümne"
-
-#: camel/camel-sasl-anonymous.c:37
-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:88
-msgid "Authentication failed."
-msgstr "Autentimine nurjus."
-
-#: camel/camel-sasl-anonymous.c:121
-#, c-format
-msgid ""
-"Invalid email address trace information:\n"
-"%s"
-msgstr ""
-"Ebakorrektne e-posti aadressi jälitusinfo:\n"
-"%s"
-
-#: camel/camel-sasl-anonymous.c:133
-#, c-format
-msgid ""
-"Invalid opaque trace information:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-sasl-anonymous.c:145
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Vigane jälitusinfo:\n"
-"%s"
-
-#: camel/camel-sasl-cram-md5.c:36
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: 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:49
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: 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:814
-msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
-
-#: camel/camel-sasl-digest-md5.c:823
-msgid "Server challenge invalid\n"
-msgstr "Vigane serveri kutsung\n"
-
-#: 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:859
-msgid "Server response did not contain authorization data\n"
-msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
-
-#: 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:887
-msgid "Server response does not match\n"
-msgstr "Serveri vastus oli vigane\n"
-
-#: camel/camel-sasl-gssapi.c:53
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: camel/camel-sasl-gssapi.c:55
-msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "See valik loob ühenduse serverisse kasutades Kerberos 5 autentimist."
-
-#: 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:158
-msgid "The provided target_name parameter was ill-formed."
-msgstr ""
-
-#: 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:165
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr ""
-
-#: 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: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:179
-msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-
-#: camel/camel-sasl-gssapi.c:182
-msgid "The consistency checks performed on the input_token failed."
-msgstr "Tõrge input_token'i kooskõlalisuse kontrollimisel."
-
-#: camel/camel-sasl-gssapi.c:185
-msgid "The consistency checks performed on the credential failed."
-msgstr "Tõrge volituste kooskõlalisuse kontrollimisel."
-
-#: camel/camel-sasl-gssapi.c:188
-msgid "The referenced credentials have expired."
-msgstr "Osutatud volitused on aegunud."
-
-#: 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:303
-msgid "Unsupported security layer."
-msgstr "Toetamata turvakiht."
-
-#: camel/camel-sasl-kerberos4.c:42
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: 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:169
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberose piletit ei saa hankida:\n"
-"%s"
-
-#: camel/camel-sasl-login.c:33
-msgid "Login"
-msgstr "Kasutajanimi"
-
-#: 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:128
-msgid "Unknown authentication state."
-msgstr "Teadmata autentimisseisund"
-
-#: camel/camel-sasl-ntlm.c:32
-msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
-
-#: camel/camel-sasl-ntlm.c:34
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "See valik loob ühenduse Windowsil baseeruvasse serverisse kasutades "
-"NTLM / Secure Password Authentication autentimist."
-
-#: camel/camel-sasl-plain.c:33
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-popb4smtp.c:37
-msgid "POP before SMTP"
-msgstr "POP enne SMTPd"
-
-#: 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:104
-msgid "POP Source URI"
-msgstr "POP allika URI"
-
-#: camel/camel-sasl-popb4smtp.c:107
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr ""
-
-#: camel/camel-sasl-popb4smtp.c:112
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr ""
-
-#: 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:272
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' vajab kasutajanime osa"
-
-#: camel/camel-service.c:276
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' vajab hosti osa"
-
-#: camel/camel-service.c:280
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' vajab kataloogitee osa"
-
-#: camel/camel-session.c:283
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Ei suuda luua kataloogi %s:\n"
-"%s"
-
-#: 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:237
-msgid "Cannot create CMS message"
-msgstr "CMS sõnumit ei saa luua"
-
-#: camel/camel-smime-context.c:242
-msgid "Cannot create CMS signed data"
-msgstr "CMS sõnumi signeeritud andmeid ei saa luua"
-
-#: camel/camel-smime-context.c:248
-msgid "Cannot attach CMS signed data"
-msgstr "CMS signeeritud andmeid ei saa manustada"
-
-#: camel/camel-smime-context.c:255
-msgid "Cannot attach CMS data"
-msgstr "CMS andmeid ei saa manustada"
-
-#: camel/camel-smime-context.c:261
-msgid "Cannot create CMS Signer information"
-msgstr "CMS Signeerija teavet ei saa luua"
-
-#: camel/camel-smime-context.c:267
-msgid "Cannot find certificate chain"
-msgstr "Sertifikaadiahelat ei leitud"
-
-#: camel/camel-smime-context.c:273
-msgid "Cannot add CMS Signing time"
-msgstr "CMS Signeerimise aega ei saa lisada"
-
-#: camel/camel-smime-context.c:295
-#: camel/camel-smime-context.c:307
-#, c-format
-msgid "Encryption certificate for '%s' does not exist"
-msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas"
-
-#: camel/camel-smime-context.c:314
-msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Attribuuti SMIMEEncKeyPrefs ei saa lisada"
-
-#: camel/camel-smime-context.c:319
-msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Attribuuti MS SMIMEEncKeyPrefs ei saa lisada"
-
-#: camel/camel-smime-context.c:324
-msgid "Cannot add encryption certificate"
-msgstr "Krüptimissertifikaati ei saa lisada"
-
-#: camel/camel-smime-context.c:330
-msgid "Cannot add CMS Signer information"
-msgstr "CMS Signeerija teavet ei saa lisada"
-
-#: camel/camel-smime-context.c:400
-#: camel/camel-smime-context.c:848
-msgid "Cannot create encoder context"
-msgstr ""
-
-#: camel/camel-smime-context.c:406
-msgid "Failed to add data to CMS encoder"
-msgstr "Tõrge andmete lisamisel CMS kodeerijasse"
-
-#: camel/camel-smime-context.c:411
-#: camel/camel-smime-context.c:865
-msgid "Failed to encode data"
-msgstr "Tõrge andmete kodeerimisel"
-
-#: camel/camel-smime-context.c:484
-msgid "Unverified"
-msgstr "Määramata"
-
-#: camel/camel-smime-context.c:486
-msgid "Good signature"
-msgstr "Hea allkiri"
-
-#: camel/camel-smime-context.c:488
-msgid "Bad signature"
-msgstr "Halb allkiri"
-
-#: camel/camel-smime-context.c:490
-msgid "Content tampered with or altered in transit"
-msgstr ""
-
-#: camel/camel-smime-context.c:492
-msgid "Signing certificate not found"
-msgstr "Allkirjastamissertifikaati ei leitud"
-
-#: camel/camel-smime-context.c:494
-msgid "Signing certificate not trusted"
-msgstr "Signeerimissertifikaat ei ole usaldusväärne"
-
-#: camel/camel-smime-context.c:496
-msgid "Signature algorithm unknown"
-msgstr "Tundmatu signeerimisalgoritm"
-
-#: camel/camel-smime-context.c:498
-msgid "Signature algorithm unsupported"
-msgstr "Toetamata signeerimisalgoritm"
-
-#: camel/camel-smime-context.c:500
-msgid "Malformed signature"
-msgstr ""
-
-#: camel/camel-smime-context.c:502
-msgid "Processing error"
-msgstr "Vea töötlemine"
-
-#: camel/camel-smime-context.c:539
-msgid "No signed data in signature"
-msgstr ""
-
-#: camel/camel-smime-context.c:546
-msgid "Digests missing from enveloped data"
-msgstr "Andmeümbrikus puudub sõnumilühend"
-
-#: camel/camel-smime-context.c:559
-#: camel/camel-smime-context.c:569
-msgid "Cannot calculate digests"
-msgstr "Sõnumilühendeid pole võimalik arvutada"
-
-#: camel/camel-smime-context.c:574
-msgid "Cannot set message digests"
-msgstr "Sõnumilühendit pole võimalik määrata"
-
-#: camel/camel-smime-context.c:584
-#: camel/camel-smime-context.c:589
-msgid "Certificate import failed"
-msgstr "Tõrge sertifikaadi importimisel"
-
-#: camel/camel-smime-context.c:599
-msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-
-#: camel/camel-smime-context.c:602
-msgid "Certificate is the only message, certificates imported and verified"
-msgstr ""
-
-#: camel/camel-smime-context.c:606
-msgid "Cannot find signature digests"
-msgstr "Ei leia signatuurilühendit"
-
-#: camel/camel-smime-context.c:622
-#, c-format
-msgid "Signer: %s <%s>: %s\n"
-msgstr "Allkirjastaja: %s <%s>: %s\n"
-
-#: camel/camel-smime-context.c:723
-msgid "Decoder failed"
-msgstr "Tõrge dekodeerimisel"
-
-#: camel/camel-smime-context.c:775
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "Ei leia sertifikaati `%s' jaoks"
-
-#: camel/camel-smime-context.c:782
-msgid "Cannot find common bulk encryption algorithm"
-msgstr ""
-
-#. PORT_GetError(); ??
-#: camel/camel-smime-context.c:791
-msgid "Cannot allocate slot for encryption bulk key"
-msgstr ""
-
-#: camel/camel-smime-context.c:802
-msgid "Cannot create CMS Message"
-msgstr "CMS sõnumit ei saa luua"
-
-#: camel/camel-smime-context.c:808
-msgid "Cannot create CMS Enveloped data"
-msgstr "CMS Ümbriku andmeid ei saa luua"
-
-#: camel/camel-smime-context.c:814
-msgid "Cannot attach CMS Enveloped data"
-msgstr "CMS Ümbriku andmeid ei saa manustada"
-
-#: camel/camel-smime-context.c:820
-msgid "Cannot attach CMS data object"
-msgstr "CMS andmeobjekti ei saa manustada"
-
-#: camel/camel-smime-context.c:829
-msgid "Cannot create CMS Recipient information"
-msgstr "CMS Vastuvõtja teavet ei saa luua"
-
-#: camel/camel-smime-context.c:834
-msgid "Cannot add CMS Recipient information"
-msgstr "CMS Vastuvõtja teavet ei saa lisada"
-
-#: camel/camel-smime-context.c:859
-msgid "Failed to add data to encoder"
-msgstr "Tõrge andmete lisamisel enkooderile"
-
-#: camel/camel-smime-context.c:946
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "Tõrge dekodeerimisel, viga %d"
-
-#: camel/camel-smime-context.c:953
-msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME dekrüptimine: Krüptitud sisu ei leitud"
-
-#: camel/camel-smime-context.c:980
-msgid "import keys: unimplemented"
-msgstr "võtmete importimine: pole veel teostatud"
-
-#: camel/camel-smime-context.c:988
-msgid "export keys: unimplemented"
-msgstr "võtmete eksportimine: pole veel teostatud"
-
-#: camel/camel-store.c:214
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-
-#: camel/camel-store.c:244
-#, c-format
-msgid "Cannot create folder `%s': folder exists"
-msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
-
-#: camel/camel-store.c:298
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-
-#: camel/camel-store.c:326
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
-
-#: 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: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:778
-msgid "Trash"
-msgstr "Prügikast"
-
-#: 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ämpspost"
-
-#: camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to get issuer's certificate"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to get Certificate Revocation List"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decrypt certificate signature"
-msgstr "Ei saa dekrüptida sertifikaadi signatuuri"
-
-#: camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decode issuer's public key"
-msgstr "Väljaandja avalikku võtit ei saa dekodeerida"
-
-#: camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate signature failure"
-msgstr "Sertifikaadi signatuuri tõrge"
-
-#: camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate Revocation List signature failure"
-msgstr "Sertifikaadi tühistusnimekirja (CRL) tõrge"
-
-#: camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate not yet valid"
-msgstr "Sertifikaat ei ole veel kehtiv"
-
-#: camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate has expired"
-msgstr "Sertifikaat on aegunud"
-
-#: camel/camel-tcp-stream-openssl.c:586
-msgid "CRL not yet valid"
-msgstr "CRL ei ole veel kehtiv"
-
-#: camel/camel-tcp-stream-openssl.c:588
-msgid "CRL has expired"
-msgstr "CRL on aegunud."
-
-#: camel/camel-tcp-stream-openssl.c:593
-msgid "Error in CRL"
-msgstr "Viga CRL'is"
-
-#: camel/camel-tcp-stream-openssl.c:595
-msgid "Out of memory"
-msgstr "Mälu puudujääk"
-
-#: camel/camel-tcp-stream-openssl.c:597
-msgid "Zero-depth self-signed certificate"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:599
-msgid "Self-signed certificate in chain"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:601
-msgid "Unable to get issuer's certificate locally"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:603
-msgid "Unable to verify leaf signature"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:605
-msgid "Certificate chain too long"
-msgstr "Sertifitseerimisahel on liiga pikk"
-
-#: camel/camel-tcp-stream-openssl.c:607
-msgid "Certificate Revoked"
-msgstr "Sertifikaat on tühistatud"
-
-#: camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Vigane sertifitseerimiskeskus"
-
-#: camel/camel-tcp-stream-openssl.c:611
-msgid "Path length exceeded"
-msgstr "Otsingutee pikkus ületatud"
-
-#: camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid purpose"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:615
-msgid "Certificate untrusted"
-msgstr "Sertifikaat ei ole usaldatav"
-
-#: camel/camel-tcp-stream-openssl.c:617
-msgid "Certificate rejected"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:620
-msgid "Subject/Issuer mismatch"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:622
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID mittesobivus"
-
-#: camel/camel-tcp-stream-openssl.c:624
-msgid "AKID/Issuer serial mismatch"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:626
-msgid "Key usage does not support certificate signing"
-msgstr "Kasutusala ei sisalda sertifikaatide signeerimist"
-
-#: camel/camel-tcp-stream-openssl.c:629
-msgid "Error in application verification"
-msgstr "Viga rakenduse verifitseerimisel"
-
-#: camel/camel-tcp-stream-openssl.c:696
-#: camel/camel-tcp-stream-ssl.c:827
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-"Väljastaja:            %s\n"
-"Teema:           %s\n"
-"Sõrmejälg:       %s\n"
-"Signatuur:       %s"
-
-#: 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:833
-msgid "BAD"
-msgstr "HALB"
-
-#: camel/camel-tcp-stream-openssl.c:704
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Halb sertifikaat %s isikult:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Kas soovid seda siiski vastu võtta?"
-
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:837
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"SSL sertifikaadi kontrollimine %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Kas soovida vastu võtta?"
-
-#: camel/camel-tcp-stream-ssl.c:881
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Probleem sertifikaadiga: %s\n"
-"Väljastaja: %s"
-
-#: camel/camel-tcp-stream-ssl.c:933
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-
-#: camel/camel-tcp-stream-ssl.c:951
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Sertifikaat on aegunud: %s\n"
-"Väljastaja: %s"
-
-#: 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"
-"Väljaandja: %s"
-
-#: 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:476
-#, c-format
-msgid "Error storing `%s': %s"
-msgstr "Viga `%s' salvestamisel: %s"
-
-#: 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: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: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: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:47
-msgid "Cannot copy messages to the Trash folder"
-msgstr "Sõnumeid ei saa kopeerida Prügi kausta"
-
-#: 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: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: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:61
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
-"sõnumitele "
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "Check new messages for Junk contents"
-msgstr "Kontrolli, kas uued sõnumid on rämpspost"
-
-#: 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:67
-msgid "Automatically synchronize account locally"
-msgstr "Automaatne konto kohalik sünkroniseerimine"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Address Book and Calendar"
-msgstr "Aadressiraamat ja kalender"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent:"
-msgstr ""
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Post Office Agent SOAP Port:"
-msgstr ""
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Use Secure Connection (SSL)"
-msgstr "Turvalise ühenduse (SSL) kasutamine"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
-msgid "Novell GroupWise"
-msgstr "Novell Groupwise"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:96
-msgid "For accessing Novell Groupwise servers"
-msgstr "Novell Groupwise serveri kasutamiseks"
-
-#: 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: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: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
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ootamatu tervitus 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
-#, c-format
-msgid "Cannot access folder `%s': %s"
-msgstr "Kaustale `%s' ei pääse ligi: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:418
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:565
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kausta `%s' ei saa tühjendada: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-folder.c:570
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa tühjendada: 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
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Sõnumit %s ei saadud: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:772
-msgid "This message is not available in offline mode."
-msgstr "See sõnum ei ole autonoomses režiimis 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
-msgid "Cannot append messages to IMAP folders in offline mode."
-msgstr "IMAP kausta ei saa autonoomses režiimis sõnumeid lisada."
-
-#: 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
-msgid "Cannot move messages to or from IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid liigutada."
-
-#: camel/providers/imap4/camel-imap4-folder.c:1041
-msgid "Cannot copy messages to or from IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid kopeerida."
-
-#: 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 sisendkausta 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
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:83
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"See valik loob ühenduse IMAPv4rev1 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
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Ei saa ühenduda hosti %s: %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 "Tõrge turvalisel ü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
-msgid "SSL negotiations failed"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:378
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"IMAP serverisse %s ei saa autentimistüüpi %s kasutades autentida"
-
-#: 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
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta 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
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kausta nimi \"%s\" on lubamatu 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
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta kustutada."
-
-#: 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
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta ümber nimetada."
-
-#: 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
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta tellida."
-
-#: 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
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Autonoomses olekus ei saa IMAP kausta tellimisest loobuda."
-
-#: 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
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Kaustast `%s' ei saa loobuda: 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
-msgid "Fetching envelopes for new messages"
-msgstr "Uute sõnumite ümbrikute vastuvõtmine"
-
-#: camel/providers/imap4/camel-imap4-utils.c:368
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: 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:3200
-msgid "Operation cancelled"
-msgstr "Operatsioon katekstatud"
-
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3203
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server katkestas ootamatult: %s"
-
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-msgstr ""
-"Häire IMAP serverilt %s@%s:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-command.c:389
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Ootamatu vastus IMAP serverilt: %s"
-
-#: camel/providers/imap/camel-imap-command.c:399
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAPi käsk nurjus: %s"
-
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
-msgstr "Serveri vastus lõppes liiga vara."
-
-#: camel/providers/imap/camel-imap-command.c:649
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP serveri vastus ei sisalda %s teavet"
-
-#: camel/providers/imap/camel-imap-command.c:685
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Ootamatu OK vastus IMAP serverilt: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:226
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Kataloogi %s ei saa luua: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:245
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s kokkuvõtet ei saa laadida"
-
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
-msgstr "Kaust hävitati ja taasloodi serveris."
-
-#: 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:1979
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Sõnumit %s ei saadud: \n"
-"  %s"
-
-#: 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: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: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:2464
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr ""
-
-#: 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:2485
-#, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-
-#: 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: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: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 "Tõrge sõnumi %s puhverdamisel: %s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:418
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Tõrge %s puhverdamisel: %s"
-
-#: 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:46
-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:51
-msgid "_Use custom command to connect to server"
-msgstr "_Proxyserveriga ühendumiseks kasutatakse kohandatud käsku"
-
-#: camel/providers/imap/camel-imap-provider.c:53
-msgid "Command:"
-msgstr "Käsk:"
-
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "_Show only subscribed folders"
-msgstr "_Näita ainult tellitud kaustu"
-
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "O_verride server-supplied folder namespace"
-msgstr "Kasuta serveri pakutava kaustade _nimeruumi asemel enda oma"
-
-#: camel/providers/imap/camel-imap-provider.c:66
-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:68
-msgid "Check new messages for _Junk contents"
-msgstr "Uute sõnumite _rämpspostikontroll"
-
-#: camel/providers/imap/camel-imap-provider.c:70
-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
-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: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:653
-#: camel/providers/smtp/camel-smtp-transport.c:323
-msgid "STARTTLS not supported"
-msgstr "STARTTLS ei ole toetatud."
-
-#: 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: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: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: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:1292
-msgid "You didn't enter a password."
-msgstr "Sa ei sisestanud parooli."
-
-#: camel/providers/imap/camel-imap-store.c:1321
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Ei saa autentimida IMAP serverisse.\n"
-"%s\n"
-"\n"
-
-#: 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: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: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
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "Kausta `%s' ei saa luua: kaust on juba olemas."
-
-#: camel/providers/imap/camel-imap-store.c:2250
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Tundmatu ülemkaust: %s"
-
-#: 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:48
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: 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"
-"\n"
-" !!! 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"
-"\n"
-" !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
-
-#: camel/providers/imapp/camel-imapp-store.c:251
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Ei saa ühenduda %s (port: %s): %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"
-
-#: camel/providers/local/camel-local-folder.c:179
-msgid "Index message body data"
-msgstr "Sõnumite sisu indekseerimine"
-
-#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:391
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
-
-#. /var/spool/mail relative path + protocol
-#: 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
-#: camel/providers/local/camel-local-folder.c:402
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: 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:52
-msgid "MH-format mail directories"
-msgstr "MH-vormingus postikataloogid"
-
-#: camel/providers/local/camel-local-provider.c:53
-msgid "For storing local mail in MH-like mail directories."
-msgstr "Kohalikku posti hoitakse MH vorminguga kataloogides."
-
-#: camel/providers/local/camel-local-provider.c:68
-msgid "Local delivery"
-msgstr "Kohalik postijagaja"
-
-#: camel/providers/local/camel-local-provider.c:69
-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 ja "
-"tõstetakse Evolution'i poolt hallatavatesse kaustadesse."
-
-#: 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:88
-msgid "Maildir-format mail directories"
-msgstr "\"Maildir\" vormingus postikataloog"
-
-#: 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: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:108
-msgid "Standard Unix mbox spool or directory"
-msgstr "Standardne Unix'i \"mbox\" puhverfail või -kataloog"
-
-#: camel/providers/local/camel-local-provider.c:109
-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 salvestatakse standardsetes välistes \"mbox\" "
-"vorminguga puhverfailides. Võib kasutada ka juhul, kui soovitakse kasutada "
-"programmide Elm, Pine või Mutt postikaustu."
-
-#: 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:150
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:159
-#: camel/providers/local/camel-local-store.c:167
-#: camel/providers/local/camel-local-store.c:265
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kausta `%s' ei saadud: %s"
-
-#: camel/providers/local/camel-local-store.c:179
-msgid "Local stores do not have an inbox"
-msgstr ""
-
-#: 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: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:399
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Ei saa ümber nimetada '%s': %s"
-
-#: 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: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: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:406
-#, c-format
-msgid "Could not save summary: %s: %s"
-msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
-
-#: camel/providers/local/camel-local-summary.c:464
-msgid "Unable to add message to summary: unknown reason"
-msgstr "Sõnumite ei saa lisada kokkuvõttesse: tundmatu põhjus"
-
-#. Inbox is always first
-#: 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:215
-msgid "Maildir append message cancelled"
-msgstr "Sõnumi lisamine maildir kausta katkestati"
-
-#: 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: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"
-"  %s"
-msgstr ""
-"Ei saa kätte sõnumit %s kaustast %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:268
-msgid "Invalid message contents"
-msgstr "Vigane sõnumi sisu"
-
-#: 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: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 ole olemas."
-
-#: 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:137
-#, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "Kausta `%s' ei saadud: see ei ole maildir kataloog."
-
-#: 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:178
-msgid "not a maildir directory"
-msgstr "ei ole maildir vormingus kataloog"
-
-#: 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:425
-#: camel/providers/local/camel-maildir-summary.c:556
-#, c-format
-msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Maildir kataloogi ei saa avada %s: %s"
-
-#: camel/providers/local/camel-maildir-summary.c:549
-msgid "Checking folder consistency"
-msgstr "Kausta kooskõlalisuse kontrollimine"
-
-#: camel/providers/local/camel-maildir-summary.c:652
-msgid "Checking for new messages"
-msgstr "Uute sõnumite kontrollimine"
-
-#: 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: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: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:329
-msgid "Mail append cancelled"
-msgstr "E-posti lisamine katkestati"
-
-#: camel/providers/local/camel-mbox-folder.c:332
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Sõnumit ei saa mbox faili lisada: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:453
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Kaust tundub olevad parandamatult rikutud."
-
-#: camel/providers/local/camel-mbox-folder.c:461
-#: camel/providers/local/camel-mh-folder.c:223
-msgid "Message construction failed."
-msgstr "Tõrge sõnumi kokkupanekul."
-
-#: 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:204
-#, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "Kausta `%s' ei saadud: see ei ole tavaline fail."
-
-#: 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:\n"
-"%s"
-
-#: 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: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:372
-#, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Kataloogi %s ei saa luua: %s"
-
-#: 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:388
-msgid "Folder already exists"
-msgstr "Kaust on juba olemas"
-
-#: camel/providers/local/camel-mbox-store.c:470
-msgid "The new folder name is illegal."
-msgstr "Uus kaustanimi on lubamatu!"
-
-#: 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:558
-#, 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:422
-#, c-format
-msgid "Could not open folder: %s: %s"
-msgstr "Kausta ei saa avada: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:470
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Pöördumatu postianalüüsija viga positsioonil %ld kaustad %s"
-
-#: camel/providers/local/camel-mbox-summary.c:526
-#, c-format
-msgid "Cannot check folder: %s: %s"
-msgstr "Kausta ei saa kontrollida: %s: %s"
-
-#: 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:606
-#: camel/providers/local/camel-spool-summary.c:165
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Ajutist kirjakasti ei saa avada: %s"
-
-#: 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 "Lähtekausta ei saa sulgeda %s: %s"
-
-#: 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:639
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Kataloogi ei saa ümber nimetada: %s"
-
-#: 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: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:894
-#, c-format
-msgid "Could not store folder: %s"
-msgstr "Kausta ei saa salvestada: %s"
-
-#: 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:1005
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Tõrge ajutisse kirjakasti kirjutamisel: %s: %s"
-
-#: camel/providers/local/camel-mh-folder.c:175
-msgid "MH append message cancelled"
-msgstr "MH sõnumi lisamine katkestatud"
-
-#: 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:220
-#, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "Kataloogi `%s' ei saa luua: %s"
-
-#: camel/providers/local/camel-mh-store.c:232
-#, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "Kausta `%s' ei saa lugeda: see ei ole kataloog."
-
-#: 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:123
-#, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "Puhvrit `%s' ei saa avada: %s"
-
-#: camel/providers/local/camel-spool-store.c:135
-#, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "Puhver '%s' pole tavaline fail ega kataloog"
-
-#: camel/providers/local/camel-spool-store.c:154
-#, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "Kausta `%s/%s' ei ole olemas."
-
-#: camel/providers/local/camel-spool-store.c:164
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kausta `%s' ei saa avada:\n"
-"%s"
-
-#: camel/providers/local/camel-spool-store.c:168
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Kataloogi '%s' pole olema."
-
-#: camel/providers/local/camel-spool-store.c:173
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kausta `%s' ei saa luua:\n"
-"%s"
-
-#: 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:198
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spool-store.c:210
-#, c-format
-msgid "Spool mail file %s"
-msgstr "E-posti puhverfail %s"
-
-#: camel/providers/local/camel-spool-store.c:210
-#, c-format
-msgid "Spool folder tree %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-store.c:218
-msgid "Spool folders cannot be renamed"
-msgstr "Puhverkaustu ei saa ümber nimetada"
-
-#: camel/providers/local/camel-spool-store.c:226
-msgid "Spool folders cannot be deleted"
-msgstr "Puhverkaustu ei saa kustutada"
-
-#: 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:214
-#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr ""
-
-#: 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"
-"Folder may be corrupt, copy saved in `%s'"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: 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"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server keeldus kasutajanime vastu võtmast"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Tõrge kasutajanime saatmisel serverile"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
-
-#: 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: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:394
-msgid "You cannot post NNTP messages while working offline!"
-msgstr ""
-
-#: 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!"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr "Gruppide nimekirja serverist ei saadud."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
-#: 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 "Kaustanimede näitamine lühendatult (comp.os.linux asemel c.o.linux)"
-
-#: camel/providers/nntp/camel-nntp-provider.c:46
-msgid "In the subscription dialog, show relative folder names"
-msgstr "Kaustade tellimisdialoogis näita kaustade suhtnimesid"
-
-#: camel/providers/nntp/camel-nntp-provider.c:53
-msgid "USENET news"
-msgstr "USENETi uudised"
-
-#: camel/providers/nntp/camel-nntp-provider.c:55
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"Selle kaudu on võimalik lugeda ja kirjutada USENET'i uudistegruppidesse."
-
-#: 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:232
-#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr ""
-
-#: 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:420
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENETi uudised üle %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:799
-#, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"Viga uudistegrupi vastuvõtmisel:\n"
-"\n"
-"%s"
-
-#: 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:925
-msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-
-#: 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:958
-msgid "You cannot rename a folder in a News store."
-msgstr ""
-
-#: 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:1136
-msgid "Authentication requested but no username provided"
-msgstr "Nõutakse autentimist kuid kasutajanime ei ole sisestatud"
-
-#: 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:1264
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Tõrge NNTP käsu täitmisel: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:1320
-msgid "Not connected."
-msgstr "Ühendamata."
-
-#: 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: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:228
-#, c-format
-msgid "Unexpected server response from xover: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-summary.c:331
-#, c-format
-msgid "Unexpected server response from head: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-summary.c:371
-msgid "Use cancel"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-summary.c:373
-#, c-format
-msgid "Operation failed: %s"
-msgstr "Tõrge toimingu läbiviimisel: %s"
-
-#: 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: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:309
-msgid "Expunging deleted messages"
-msgstr "Hävitan kustutatud sõnumid"
-
-#: camel/providers/pop3/camel-pop3-folder.c:405
-#, c-format
-msgid "No message with uid %s"
-msgstr "Sõnumit uid'iga %s ei ole"
-
-#: 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: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:41
-msgid "Leave messages on server"
-msgstr "Jäta sõnumid serverisse"
-
-#: 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:47
-msgid "Disable support for all POP3 extensions"
-msgstr "Keela kõigi POP3 laienduste toetus"
-
-#: camel/providers/pop3/camel-pop3-provider.c:55
-msgid "POP"
-msgstr "POP"
-
-#: 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: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: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:202
-#, c-format
-msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP serverilt %s ei saa korrektset tervitust"
-
-#: camel/providers/pop3/camel-pop3-store.c:215
-#: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:242
-#, c-format
-msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Tõrge turvalisel ühendumisel POP serverisse %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:216
-msgid "STLS not supported"
-msgstr "STLS 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: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."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:411
-#, c-format
-msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "Tõrge SASL `%s' sisselogimisel POP serverisse %s: %s"
-
-#: 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:442
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Tõrge autentimisel POP serverisse %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:468
-#, c-format
-msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%sPalun sisesta kasutaja %s POP parool hostile %s"
-
-#: 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"
-"Error sending password: %s"
-msgstr ""
-"Ei saa luua ühendust POP serveriga %s.\n"
-"Viga parooli saatmisel: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:530
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
-msgstr ""
-"Ei saa luua ühendust POP serveriga %s.\n"
-"Viga kasutajanime saatmisel: %s"
-
-#: 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:37
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: 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:114
-msgid "Could not parse recipient list"
-msgstr "Saajate nimekirja ei õnnestu analüüsida"
-
-#: 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: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"
-
-#: 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: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: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: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:260
-msgid "sendmail"
-msgstr "sendmail"
-
-#: 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:38
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:40
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "E-posti saatmiseks SMTP protokolli kaudu välisele mailhub serverile."
-
-#: 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:167
-msgid "Syntax error in parameters or arguments"
-msgstr "Süntaksi viga parameetrites või argumentides"
-
-#: 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:171
-msgid "Command parameter not implemented"
-msgstr "Käsu parameeter ei ole veel teostatud"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "System status, or system help reply"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Help message"
-msgstr "Abiteade"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Service ready"
-msgstr "Teenus on valmis"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Service closing transmission channel"
-msgstr "Teenus sulgeb ülekandekanali"
-
-#: 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:183
-msgid "Requested mail action okay, completed"
-msgstr "Nõutud kirjategevus korras, lõpetatud"
-
-#: 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: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: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:191
-msgid "Requested action aborted: error in processing"
-msgstr "Nõutud tegevus nurjatud: viga töötlemisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:193
-msgid "User not local; please try <forward-path>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:195
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Nõutud toimingut ei teostatud: kirjakasti nimi ei ole lubatud"
-
-#: camel/providers/smtp/camel-smtp-transport.c:201
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:203
-msgid "Transaction failed"
-msgstr "Tõrge transaktsiooni läbiviimisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:207
-msgid "A password transition is needed"
-msgstr ""
-
-#: 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:211
-msgid "Encryption required for requested authentication mechanism"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:213
-msgid "Temporary authentication failure"
-msgstr "Ajutine autentimise tõrge"
-
-#: camel/providers/smtp/camel-smtp-transport.c:215
-msgid "Authentication required"
-msgstr "Autentimine on vajalik"
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-msgid "Welcome response error"
-msgstr "Tervitusvastuse viga"
-
-#: 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 "Tõrge turvalisel ühendumisel SMTP serverisse %s: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:331
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Tõrge STARTTLS käsu täitmisel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:346
-msgid "STARTTLS command failed"
-msgstr "Tõrge STARTTLS käsu täitmisel"
-
-#: 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:517
-#, c-format
-msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%sPalun sisesta kasutaja %s SMTP parool hostile %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:536
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Autentimine SMPT serverisse nurjus.\n"
-"%s\n"
-"\n"
-
-#: 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:662
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP posti saatmine %s kaudu"
-
-#: camel/providers/smtp/camel-smtp-transport.c:680
-msgid "Cannot send message: service not connected."
-msgstr "Sõnumit ei saa saata: teenusega ei saa ühendust"
-
-#: 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:690
-msgid "Sending message"
-msgstr "Sõnumi saatmine"
-
-#: 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:716
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Sõnumit ei saa saata: saajate aadress või aadressid on vigased."
-
-#: camel/providers/smtp/camel-smtp-transport.c:885
-msgid "SMTP Greeting"
-msgstr "SMTP Tervitus"
-
-#: camel/providers/smtp/camel-smtp-transport.c:911
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Tõrge HELO käsu täitmisel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:928
-msgid "HELO command failed"
-msgstr "Tõrge HELO käsu täitmisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:994
-msgid "SMTP Authentication"
-msgstr "SMTP autentimine"
-
-#: 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:1017
-#: camel/providers/smtp/camel-smtp-transport.c:1028
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Tõrge AUTH käsu täitmisel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1034
-msgid "AUTH command failed"
-msgstr "Tõrge AUTH käsu täitmisel"
-
-#: 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:1121
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Tõrge MAIL FROM käsu täitmisel: %s: sõnum jäi saatmata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1138
-msgid "MAIL FROM command failed"
-msgstr "Tõrge MAIL FROM käsu täitmisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1162
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Tõrge RCPT TO käsu täitmisel: %s: sõnum jäi saatmata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1181
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "Tõrge RCPT TO <%s> käsu täitmisel"
-
-#: 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 "Tõrge DATA käsu täitmisel: %s: sõnum jäi saatmata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1237
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-msgid "DATA command failed"
-msgstr "Tõrge DATA käsu täitmisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1336
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Tõrge RSET käsu täitmisel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1352
-msgid "RSET command failed"
-msgstr "Tõrge RSET käsu täitmisel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1375
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Tõrge QUIT käsu täitmisel: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1389
-msgid "QUIT command failed"
-msgstr "Tõrge QUIT käsu täitmisel"
-
-#: composer/e-msg-composer-attachment-bar.c:101
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: composer/e-msg-composer-attachment-bar.c:107
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: composer/e-msg-composer-attachment-bar.c:293
-#: mail/em-utils.c:436
-msgid "attachment"
-msgstr "manus"
-
-#: 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:443
-msgid "_Add attachment..."
-msgstr "_Lisa manus..."
-
-#: 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:182
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Manuse omadused"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Faili nimi:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME tüüp:"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:93
-#: composer/e-msg-composer-select-file.c:112
-msgid "Suggest automatic display of attachment"
-msgstr "Manuse automaatkuvamise soovitamine"
-
-#: composer/e-msg-composer.c:727
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
-"signeerimissertifikaati määratud."
-
-#: composer/e-msg-composer.c:734
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr ""
-"Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
-"krüptimissertifikaati määratud."
-
-#: composer/e-msg-composer.c:1291
-msgid "Could not open file"
-msgstr "Tõrge faili avamisel"
-
-#: composer/e-msg-composer.c:1299
-msgid "Unable to retrieve message from editor"
-msgstr "Ei saa sõnumit redaktorist kätte"
-
-#: 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 koostatud"
-
-#: composer/e-msg-composer.c:2105
-msgid "Si_gnature:"
-msgstr "_Signatuur:"
-
-#: composer/e-msg-composer.c:2315
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> fail manusena"
-msgstr[1] "<b>%d</b> faili manusena"
-
-#: 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
-#, c-format
-msgid "Attached message - %s"
-msgstr ""
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2678
-#: composer/e-msg-composer.c:2841
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: 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
-msgid "Cancel _Drag"
-msgstr ""
-
-#: composer/e-msg-composer.c:4538
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
-msgstr ""
-"<b>(Redaktor sisaldab mittetekstilist sõnumit ja seda ei ole võimalik "
-"redigeerida.)<b>"
-
-#: composer/e-msg-composer-hdrs.c:512
+#: composer/e-msg-composer-hdrs.c:519
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:520
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:554
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
+#.
 #. * Reply-To:
-#: composer/e-msg-composer-hdrs.c:577
+#. *
+#. * 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:584
 msgid "_Reply-To:"
 msgstr "_Vasta-kellele:"
 
+#.
 #. * From
-#: composer/e-msg-composer-hdrs.c:584
+#.
+#: composer/e-msg-composer-hdrs.c:591
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
+#.
 #. * Subject
-#: composer/e-msg-composer-hdrs.c:591
+#.
+#: composer/e-msg-composer-hdrs.c:598
 msgid "S_ubject:"
 msgstr "_Teema:"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:608
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:609
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:605
+#: composer/e-msg-composer-hdrs.c:612
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: composer/e-msg-composer-hdrs.c:606
+#: composer/e-msg-composer-hdrs.c:613
 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:609
+#: composer/e-msg-composer-hdrs.c:616
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:610
+#: composer/e-msg-composer-hdrs.c:617
 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
-#: composer/e-msg-composer-hdrs.c:617
+#.
+#: composer/e-msg-composer-hdrs.c:624
 msgid "_Post To:"
 msgstr "_Postita kellele:"
 
-#: composer/e-msg-composer-hdrs.c:622
+#: composer/e-msg-composer-hdrs.c:629
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: composer/e-msg-composer-hdrs.c:628
+#: composer/e-msg-composer-hdrs.c:635
 #, fuzzy
 msgid "Post To:"
 msgstr "Postita kellele:"
 
-#: composer/e-msg-composer-select-file.c:187
-msgid "Attach file(s)"
-msgstr "Faili(de) manustamine"
+#: composer/e-msg-composer.c:730
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole signeerimissertifikaati määratud."
+
+#: composer/e-msg-composer.c:737
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole krüptimissertifikaati määratud."
+
+#: composer/e-msg-composer.c:1222
+#: composer/e-msg-composer.c:1255
+msgid "Unknown reason"
+msgstr "Tundmatu põhjus"
+
+#: composer/e-msg-composer.c:1292
+msgid "Could not open file"
+msgstr "Tõrge faili avamisel"
+
+#: composer/e-msg-composer.c:1300
+msgid "Unable to retrieve message from editor"
+msgstr "Ei saa sõnumit redaktorist kätte"
+
+#: composer/e-msg-composer.c:1570
+msgid "Untitled Message"
+msgstr "Pealkirjata sõnum"
+
+#. NB: This function is never used anymore
+#: composer/e-msg-composer.c:1604
+#, fuzzy
+msgid "Open File"
+msgstr "Ava fail"
+
+#: composer/e-msg-composer.c:2001
+#: mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623
+#: mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "Automaatselt koostatud"
+
+#: composer/e-msg-composer.c:2100
+msgid "Si_gnature:"
+msgstr "_Signatuur:"
+
+#: composer/e-msg-composer.c:2359
+#: composer/e-msg-composer.c:3360
+#: composer/e-msg-composer.c:3361
+msgid "Compose a message"
+msgstr "Sõnumi koostamine"
+
+#: composer/e-msg-composer.c:4541
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgstr "<b>(Redaktor sisaldab mittetekstilist sõnumit ja seda ei ole võimalik redigeerida.)<b>"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
@@ -12530,10 +9595,15 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr ""
 
 #. 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
+#: mail/mail-errors.xml.h:105
+#: mail/mail-errors.xml.h:117
 #: widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
@@ -12580,15 +9650,12 @@ msgstr "Hoiatus: salvestamata sõnum"
 #. 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?"
-msgstr ""
-"Kas sa tõesti soovid tühistada sõnumit '{0}', mille koostamine on pooleli?"
+msgstr "Kas sa tõesti soovid tühistada sõnumit '{0}', mille koostamine on pooleli?"
 
 #. 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."
-msgstr ""
-"Selle redaktoriakna sulgemine tühistab sõnumi lõplikult. Kui sa tahad sõnumi "
-"koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
+msgstr "Selle redaktoriakna sulgemine tühistab sõnumi lõplikult. Kui sa tahad sõnumi koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
 
 #: composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
@@ -12624,6 +9691,7 @@ msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
 #. 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."
@@ -12762,34 +9830,40 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: e-util/eggtrayicon.c:119
-msgid "The orientation of the tray."
-msgstr ""
-
-#: e-util/e-passwords.c:468
+#: e-util/e-passwords.c:472
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: e-util/e-passwords.c:469
+#: e-util/e-passwords.c:473
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 
+#. 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
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
+#. 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
 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.
 #: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 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.
 #: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y"
@@ -12804,34 +9878,49 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
+#. 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"
 
+#. 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"
 
+#. 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"
 
+#. 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"
 
+#. 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
 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
 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:1431
@@ -12840,6 +9929,9 @@ 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:1428
@@ -12852,6 +9944,10 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
+#: e-util/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr ""
+
 #: filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
@@ -12935,6 +10031,7 @@ 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
 msgid "You must specify a file name."
@@ -12956,8 +10053,9 @@ 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
+#: mail/mail-errors.xml.h:219
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -12980,6 +10078,80 @@ 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:75
+#: mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Tähtis"
+
+#. forest green
+#: filter/filter-label.c:124
+#: mail/em-migrate.c:1014
+#: mail/mail-config.c:78
+#: mail/mail-config.glade.h:140
+msgid "To Do"
+msgstr "Ülesanne"
+
+#. blue
+#: filter/filter-label.c:125
+#: mail/em-migrate.c:1015
+#: mail/mail-config.c:79
+#: mail/mail-config.glade.h:93
+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:818
+msgid "<b>If</b>"
+msgstr "<b>Kui</b>"
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "kõik tingimused on täidetud"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "üks tingimustest on täidetud"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "Tegevused täidetakse juhul, kui"
+
+#: 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
+msgid "Replies and parents"
+msgstr "Vastused ja eelnenud"
+
+#: filter/filter-rule.c:880
+msgid "Include threads"
+msgstr "Lõimedest kaasatakse"
+
+#: filter/filter-rule.c:975
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Sissetulev"
+
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "Väljaminev"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filtri reeglid</b>"
@@ -12988,11 +10160,6 @@ msgstr "<b>_Filtri reeglid</b>"
 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 "Näita filtreid sõnumitele:"
@@ -13034,7 +10201,7 @@ msgid "months"
 msgstr "kuud"
 
 #: filter/filter.glade.h:18
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "seconds"
 msgstr "sekundit"
 
@@ -13050,86 +10217,80 @@ msgstr "sinu poolt määratud aeg"
 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"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Reegli lisamine"
 
-#. 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"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Muuda reeglit"
 
-#. 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/rule-editor.c:685
+msgid "Rule name"
+msgstr "Reegli nimi"
 
-#: filter/filter-part.c:532
-#: shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Sõnumikoostaja eelistused"
 
-#: filter/filter-rule.c:790
-msgid "_Rule name:"
-msgstr "_Reegli nimi:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/filter-rule.c:818
-msgid "<b>If</b>"
-msgstr "<b>Kui</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/filter-rule.c:855
-msgid "if all criteria are met"
-msgstr "kõik tingimused on täidetud"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Säti oma e-posti kontosid siin"
 
-#: filter/filter-rule.c:855
-msgid "if any criteria are met"
-msgstr "üks tingimustest on täidetud"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolutioni e-posti klient"
 
-#: filter/filter-rule.c:857
-msgid "Execute actions"
-msgstr "Tegevused täidetakse juhul, kui"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutioni e-posti kontode seadistuste juhtimine"
 
-#: filter/filter-rule.c:878
-msgid "All related"
-msgstr "Kõik seonduvad"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution'i e-posti komponent"
 
-#: filter/filter-rule.c:878
-msgid "Replies"
-msgstr "Vastused"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutioni sõnumikoostaja"
 
-#: filter/filter-rule.c:878
-msgid "Replies and parents"
-msgstr "Vastused ja eelnenud"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
 
-#: filter/filter-rule.c:880
-msgid "Include threads"
-msgstr "Lõimedest kaasatakse"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr ""
 
-#: filter/filter-rule.c:975
-msgid "Outgoing"
-msgstr "Väljaminev"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/em-folder-view.c:471
+#: mail/importers/elm-importer.c:418
+#: mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474
+#: mail/mail-component.c:536
+#: mail/mail-component.c:587
+msgid "Mail"
+msgstr "E-post"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Reegli lisamine"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "Postikontod"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Muuda reeglit"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/mail-config.glade.h:95
+msgid "Mail Preferences"
+msgstr "E-posti eelistused"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Reegli nimi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_Post"
 
 #: mail/em-account-editor.c:377
 #, c-format
@@ -13151,67 +10312,74 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: mail/em-account-editor.c:1808
+#: mail/em-account-editor.c:1817
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2077
-#: mail/em-account-editor.c:2155
+#: mail/em-account-editor.c:2086
+#: mail/em-account-editor.c:2164
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: mail/em-account-editor.c:2500
-#: mail/mail-config.glade.h:34
+#: mail/em-account-editor.c:2087
+#: mail/em-account-editor.c:2165
+msgid "Checking for New Mail"
+msgstr "Uute kirjade kontroll"
+
+#: mail/em-account-editor.c:2509
+#: mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: mail/em-account-editor.c:2500
-#: mail/mail-config.glade.h:80
+#: mail/em-account-editor.c:2509
+#: mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoabiline"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:422
+#: mail/em-account-prefs.c:412
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:476
+#: mail/em-account-prefs.c:466
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:478
+#: mail/em-account-prefs.c:468
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:306
-#: mail/em-composer-prefs.c:425
-#: mail/mail-config.c:935
+#: mail/em-composer-prefs.c:429
+#: mail/mail-config.c:934
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: mail/em-composer-prefs.c:949
+#: mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:995
+#: mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: mail/em-composer-prefs.c:1015
+#: mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:897
+#: mail/em-composer-utils.c:910
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1513
+#: mail/em-composer-utils.c:1526
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
-#: mail/em-composer-utils.c:1560
+#. * 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:1573
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
@@ -13344,12 +10512,18 @@ msgstr "ei ole"
 msgid "is not Flagged"
 msgstr "ei ole tähistatud"
 
+#: mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:92
+#: ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "Rämpspost"
+
 #: mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr ""
 
 #: mail/em-filter-i18n.h:37
-#: mail/em-folder-view.c:960
+#: mail/em-folder-view.c:997
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -13461,13 +10635,13 @@ msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
 #: mail/em-filter-i18n.h:65
-#: mail/em-format.c:853
-#: mail/em-format-html.c:1534
+#: mail/em-format-html.c:1533
 #: mail/em-format-quote.c:306
+#: mail/em-format.c:853
 #: 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
+#: plugins/shared-folder/properties.glade.h:7
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Teema"
@@ -13482,28 +10656,29 @@ msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
 #: mail/em-folder-browser.c:133
-msgid "Create _Virtual Folder From Search..."
+#, fuzzy
+msgid "Create _vFolder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:143
+#: mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
-#: mail/em-folder-properties.c:155
+#: mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
 msgstr[1] "Lugemata sõnumeid:"
 
-#: mail/em-folder-properties.c:269
-#: plugins/shared-folder/properties.glade.h:9
+#: mail/em-folder-properties.c:278
+#: plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kausta omadused"
 
-#: mail/em-folder-selection-button.c:121
+#: mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
@@ -13512,9 +10687,10 @@ msgid "Create New Folder"
 msgstr "Uue kausta loomine"
 
 #: 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
+#: mail/em-folder-tree.c:2527
+#: mail/mail-component.c:739
+#: plugins/shared-folder/install-shared.c:144
+#: plugins/shared-folder/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
@@ -13526,564 +10702,578 @@ msgstr "Loo"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree.c:670
+#: mail/em-folder-tree-model.c:201
+#: mail/em-folder-tree-model.c:203
+#: mail/mail-vfolder.c:899
+#: mail/mail-vfolder.c:969
+msgid "vFolders"
+msgstr "VKaustad"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:209
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:468
+#: mail/mail-component.c:139
+msgid "Drafts"
+msgstr "Mustandid"
+
+#. translators: standard local mailbox names
+#: mail/em-folder-tree-model.c:471
+#: mail/mail-component.c:138
+msgid "Inbox"
+msgstr "Sisendkast"
+
+#: mail/em-folder-tree-model.c:474
+#: mail/mail-component.c:140
+msgid "Outbox"
+msgstr "Väljundkast"
+
+#: mail/em-folder-tree-model.c:476
+#: mail/mail-component.c:141
+msgid "Sent"
+msgstr "Saadetud"
+
+#: mail/em-folder-tree-model.c:495
+#: mail/em-folder-tree-model.c:799
+msgid "Loading..."
+msgstr "Laadimine..."
+
+#: mail/em-folder-tree.c:688
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: mail/em-folder-tree.c:903
+#: mail/em-folder-tree.c:921
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:905
+#: mail/em-folder-tree.c:923
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:912
+#: mail/em-folder-tree.c:930
 #: mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:914
+#: mail/em-folder-tree.c:932
 #: mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:930
+#: mail/em-folder-tree.c:948
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1026
-#: ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1044
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:1027
-#: ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1045
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:1726
-#: mail/mail-ops.c:1017
+#: mail/em-folder-tree.c:1750
+#: mail/mail-ops.c:1026
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: 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/em-folder-tree.c:2023
+#, fuzzy, c-format
+msgid "Copying `%s' to `%s'"
+msgstr "Sõnumite kopeerimine %s kausta"
+
+#: mail/em-folder-tree.c:2297
+#: mail/em-folder-tree.c:2311
+#: mail/em-folder-view.c:860
+#: mail/em-folder-view.c:875
 #: mail/importers/evolution-mbox-importer.c:120
 #: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: mail/em-folder-tree.c:2233
-#: mail/em-folder-view.c:838
+#: mail/em-folder-tree.c:2297
+#: mail/em-folder-view.c:875
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: mail/em-folder-tree.c:2274
-#: plugins/shared-folder/share-folder-common.c:115
+#: mail/em-folder-tree.c:2338
+#: plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2463
-#: mail/mail-component.c:732
-#: plugins/shared-folder/share-folder-common.c:311
+#: mail/em-folder-tree.c:2527
+#: mail/mail-component.c:739
+#: plugins/shared-folder/install-shared.c:144
+#: plugins/shared-folder/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Kausta loomine"
 
-#: mail/em-folder-tree.c:2656
+#: mail/em-folder-tree.c:2720
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2658
+#: mail/em-folder-tree.c:2722
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2734
+#: mail/em-folder-tree.c:2728
+#, fuzzy
+msgid "Folder names cannot contain '/'"
+msgstr "Kausta nimi ei tohi sisaldada \"/\" sümbolit."
+
+#: mail/em-folder-tree.c:2802
 #: ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 #: 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:2735
+#: mail/em-folder-tree.c:2803
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2739
+#: mail/em-folder-tree.c:2807
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: mail/em-folder-tree.c:2740
+#: mail/em-folder-tree.c:2808
 msgid "_Move..."
 msgstr "_Liiguta..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2744
+#: mail/em-folder-tree.c:2812
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2747
+#: mail/em-folder-tree.c:2815
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: 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
-#: mail/em-folder-tree-model.c:206
-#: mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr ""
-
-#: 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"
-
-#: mail/em-folder-view.c:928
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:965
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:930
+#: mail/em-folder-view.c:967
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:933
-#: ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:970
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:934
-#: mail/em-popup.c:502
+#: mail/em-folder-view.c:971
+#: mail/em-popup.c:497
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
-#: mail/em-folder-view.c:935
-#: mail/em-popup.c:503
+#: mail/em-folder-view.c:972
+#: mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:936
-#: mail/em-popup.c:505
-#: ui/evolution-mail-message.xml.h:114
+#: mail/em-folder-view.c:973
+#: mail/em-popup.c:500
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:976
 msgid "Follo_w Up..."
 msgstr "_Jälgi..."
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:977
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:978
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:981
 #: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:982
 msgid "Mark as _Unread"
 msgstr "Märgi _mitteloetuks"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:983
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:984
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:985
 #: ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:986
 #: ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:990
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:956
+#: mail/em-folder-view.c:993
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:957
+#: mail/em-folder-view.c:994
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:965
+#: mail/em-folder-view.c:1002
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: mail/em-folder-view.c:968
+#: mail/em-folder-view.c:1005
 msgid "Appl_y Filters"
 msgstr "Rakenda _filtrid"
 
-#: mail/em-folder-view.c:969
+#: mail/em-folder-view.c:1006
 msgid "F_ilter Junk"
 msgstr "_Rämpsu filtreerimine"
 
-#: mail/em-folder-view.c:972
+#: mail/em-folder-view.c:1009
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:973
-msgid "VFolder on _Subject"
+#: mail/em-folder-view.c:1010
+#, fuzzy
+msgid "vFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:974
-msgid "VFolder on Se_nder"
+#: mail/em-folder-view.c:1011
+#, fuzzy
+msgid "vFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:975
-msgid "VFolder on _Recipients"
+#: mail/em-folder-view.c:1012
+#, fuzzy
+msgid "vFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:976
-msgid "VFolder on Mailing _List"
+#: mail/em-folder-view.c:1013
+#, fuzzy
+msgid "vFolder on Mailing _List"
 msgstr "VKaust _postiloendi järgi"
 
-#: mail/em-folder-view.c:980
+#: mail/em-folder-view.c:1017
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:981
+#: mail/em-folder-view.c:1018
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:982
+#: mail/em-folder-view.c:1019
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:983
+#: mail/em-folder-view.c:1020
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1760
-#: mail/em-folder-view.c:1803
+#: mail/em-folder-view.c:1797
+#: mail/em-folder-view.c:1841
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1900
+#: mail/em-folder-view.c:1940
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2179
+#: mail/em-folder-view.c:2229
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2462
+#: mail/em-folder-view.c:2515
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliki, et saata sõnumit aadressile %s"
 
-#: 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 "%s attachment"
-msgstr "\"%s\" tüüpi manus"
-
-#: 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.c:1266
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: 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
+#. message-search popup match count string
+#: mail/em-format-html-display.c:412
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' tõmbamine"
+msgid "Matches: %d"
+msgstr "Sobivaid: %d"
 
-#: mail/em-format-html.c:580
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:680
+#: mail/em-format-html.c:579
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html.c:581
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:680
+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-html-display.c:681
+#: mail/em-format-html.c:580
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html.c:582
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:681
+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:682
+#: mail/em-format-html.c:581
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html.c:583
-msgid "Valid signature but cannot verify sender"
-msgstr "Signatuur kehtib kuid saatjat ei saa tuvastada"
+#: mail/em-format-html-display.c:682
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "Selle sõnumi signatuuri ei saa verifitseerida. See võib olla sõnumi kohaletoimetamise käigus asendatud."
 
-#: mail/em-format-html.c:589
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:683
+msgid "Valid signature, cannot verify sender"
+msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
+
+#: mail/em-format-html-display.c:683
+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:689
+#: mail/em-format-html.c:588
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: mail/em-format-html.c:590
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:689
+msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
+msgstr "See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt ja see võis näha olla ka kolmandale osapoolele."
+
+#: mail/em-format-html-display.c:690
+#: mail/em-format-html.c:589
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html.c:591
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:690
+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 "See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi krüpteering lahti murda."
+
+#: mail/em-format-html-display.c:691
+#: mail/em-format-html.c:590
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html.c:592
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:691
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
+
+#: mail/em-format-html-display.c:692
+#: mail/em-format-html.c:591
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: mail/em-format-html.c:841
+#: mail/em-format-html-display.c:692
+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 "See sõnum on krüptitud tugeva krüptoalgoritmiga.  Võimalikul ründajal peaks olema väga raske mõistliku aja jooksul sõnumi krüpteering lahti murda."
+
+#: mail/em-format-html-display.c:793
+#: smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Sertifikaadi kuvamine"
+
+#: mail/em-format-html-display.c:808
+msgid "This certificate is not viewable"
+msgstr "See sertifikaat ei ole kuvatav"
+
+#: mail/em-format-html-display.c:1037
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1045
+msgid "Overdue:"
+msgstr "Tähtaja ületanud:"
+
+#: mail/em-format-html-display.c:1048
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1095
+msgid "_View Inline"
+msgstr "_Sisekuva"
+
+#: mail/em-format-html-display.c:1096
+msgid "_Hide"
+msgstr "_Peida"
+
+#: mail/em-format-html-display.c:1340
+msgid "Attachment Button"
+msgstr "Manuse nupp"
+
+#: 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:472
+#: mail/em-format-html.c:474
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' tõmbamine"
+
+#: mail/em-format-html.c:582
+msgid "Valid signature but cannot verify sender"
+msgstr "Signatuur kehtib kuid saatjat ei saa tuvastada"
+
+#: mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:871
+#: mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/em-format-html.c:882
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:905
+#: mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:916
+#: mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1138
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
+#: mail/em-format-html.c:1424
+#: mail/em-format-quote.c:193
+#: mail/em-format.c:848
+#: 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-html.c:1424
+#: mail/em-format-quote.c:193
+#: mail/em-format.c:849
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "Vastus-Kuhu"
+
+#: mail/em-format-html.c:1424
+#: mail/em-format-quote.c:193
+#: mail/em-format.c:850
+#: mail/em-mailer-prefs.c:85
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kellele"
+
+#: mail/em-format-html.c:1424
+#: mail/em-format-quote.c:193
+#: mail/em-format.c:851
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "Koopia"
+
+#: mail/em-format-html.c:1424
+#: mail/em-format-quote.c:193
+#: mail/em-format.c:852
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "Pimekoopia"
+
 #. pseudo-header
-#: mail/em-format-html.c:1538
+#: mail/em-format-html.c:1537
 #: mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:984
+#: mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1565
+#: mail/em-format-html.c:1564
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1568
+#: mail/em-format-html.c:1567
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#. 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-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-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-html-display.c:640
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr ""
-"Selle sõnumi signatuuri ei saa verifitseerida. See võib olla sõnumi "
-"kohaletoimetamise käigus asendatud."
-
-#: 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-html.c:1577
+#: mail/em-format-quote.c:322
+#: mail/em-format.c:854
+#: mail/em-mailer-prefs.c:89
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Kuupäev"
 
-#: mail/em-format-html-display.c:647
-msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
-msgstr ""
-"See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt "
-"ja see võis näha olla ka kolmandale osapoolele."
+#: mail/em-format-html.c:1600
+#: mail/em-format.c:855
+#: mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "Uudisegrupid"
 
-#: 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 ""
-"See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks "
-"olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi "
-"krüpteering lahti murda."
+#: mail/em-format.c:1104
+#, c-format
+msgid "%s attachment"
+msgstr "\"%s\" tüüpi manus"
 
-#: 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 ""
-"See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
+#: 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: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."
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
-"See sõnum on krüptitud tugeva krüptoalgoritmiga.  Võimalikul ründajal peaks "
-"olema väga raske mõistliku aja jooksul sõnumi krüpteering lahti murda."
-
-#: 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-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-html-display.c:1054
-msgid "_Hide"
-msgstr "_Peida"
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "Toetamata allkirjavorming"
 
-#: mail/em-format-html-display.c:1298
-msgid "Attachment Button"
-msgstr "Manuse nupp"
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "Viga allkirja tõestamisel"
 
-#: mail/em-format-html-print.c:130
-#, c-format
-msgid "Page %d of %d"
-msgstr "Lehekülg %d %d-st"
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "Tundmatu viga allkirja tõestamisel"
 
 #: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
@@ -14111,8 +11301,7 @@ msgid ""
 "\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..."
 
@@ -14161,58 +11350,58 @@ msgstr "Ei saa luua kohalikku mailikausta asukohas `%s': %s"
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:386
+#: mail/em-popup.c:381
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: mail/em-popup.c:405
+#: mail/em-popup.c:400
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: mail/em-popup.c:499
+#: mail/em-popup.c:494
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: mail/em-popup.c:501
+#: mail/em-popup.c:496
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: mail/em-popup.c:553
+#: mail/em-popup.c:548
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: mail/em-popup.c:554
+#: mail/em-popup.c:549
 msgid "Se_nd message to..."
 msgstr "S_aada sõnum..."
 
-#: mail/em-popup.c:555
+#: mail/em-popup.c:550
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:681
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/em-subscribe-editor.c:613
+#: mail/em-subscribe-editor.c:611
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: mail/em-subscribe-editor.c:642
+#: mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:646
+#: mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:861
+#: mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/em-subscribe-editor.c:882
+#: mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
@@ -14243,11 +11432,13 @@ msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
 #: mail/em-vfolder-editor.c:104
-msgid "Virtual _Folders"
-msgstr "Virtuaalsed _kaustad"
+#, fuzzy
+msgid "v_Folders"
+msgstr "VKaustad"
 
 #: mail/em-vfolder-rule.c:574
-msgid "VFolder source"
+#, fuzzy
+msgid "vFolder source"
 msgstr "VKausta allikas"
 
 #: mail/evolution-mail.schemas.in.in.h:1
@@ -14355,383 +11546,371 @@ 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 a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:28
+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:29
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 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
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 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
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
 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."
+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
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Märgi Nähtud staatusega peale määratud taimauti"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Märgi Nähtud staatusega peale määratud taimauti."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Vaikimisi sõnumiakna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Sõnumi kuvamise laad (tavaline, kõik päised, lähtekood)"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Helifail uutest sõnumitest teatamiseks"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Uuest sõnumist teatamise tüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Tühja teema korral küsi kinnitust"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:56
 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
+#: mail/evolution-mail.schemas.in.in.h:57
 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
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Kinnituse küsimine, kui kasutaja määrab ainult pimekoopia"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:60
+#, fuzzy
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat ega pimekoopa saajat määratud."
+
+#: mail/evolution-mail.schemas.in.in.h:61
 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 ei soovi HTML "
-"sisuga sõnumeid vastu võtta."
+msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes ei soovi HTML sisuga sõnumeid vastu võtta."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
-"ega pimekoopa saajat määratud."
+msgstr "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat ega pimekoopa saajat määratud."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Vaikimisi kirjade saatmine HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Vaikimisi kirjade saatmine HTML formaadis."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
 #: mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "\"Eelvaatlus\" paani kuvamine"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "\"Eelvaatlus\" paani kuvamine."
+
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 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
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: mail/evolution-mail.schemas.in.in.h:89
-msgid "Use Spamasssassin daemon and client"
+#: mail/evolution-mail.schemas.in.in.h:91
+#, fuzzy
+msgid "Use Spamassassin daemon and client"
 msgstr "Kasuta Spamassassini deemonit ja klienti"
 
-#: mail/evolution-mail.schemas.in.in.h:90
-msgid "Use Spamasssassin daemon and client (spamc/spamd)"
+#: mail/evolution-mail.schemas.in.in.h:92
+#, fuzzy
+msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Kasuta Spamassassini deemonit ja klienti (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumi näitamisel"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Kasuta ainult lokaalseid spämmiteste."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: mail/evolution-mail.schemas.in.in.h:108
 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
+#: mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Sõnumikoostaja eelistused"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Säti oma e-posti kontosid siin"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolutioni e-posti klient"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutioni e-posti kontode seadistuste juhtimine"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution'i e-posti komponent"
+#: 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:8
-msgid "Evolution Mail composer"
-msgstr "Evolutioni sõnumikoostaja"
+#: 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:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
+#: 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:10
-msgid "Evolution Mail preferences control"
-msgstr ""
+#: 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:12
-msgid "Mail Accounts"
-msgstr "Postikontod"
+#: 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:13
-#: mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-posti eelistused"
+#: 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:14
-msgid "_Mail"
-msgstr "_Post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Expressi 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14791,34 +11970,6 @@ msgstr "'%s' importimine"
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutioni Elm'i importija"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutioni Netscape Mail'i importija"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutioni Outlook Express 4 importija"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutioni Pine'i importija"
-
-#: 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"
@@ -14920,27 +12071,15 @@ msgstr "Teema on %s"
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: mail/mail-autofilter.c:271
+#: mail/mail-autofilter.c:273
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postiloend"
 
-#: mail/mail-autofilter.c:326
+#: mail/mail-autofilter.c:328
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:139
-msgid "Drafts"
-msgstr "Mustandid"
-
-#: mail/mail-component.c:140
-msgid "Outbox"
-msgstr "Väljundkast"
-
-#: mail/mail-component.c:141
-msgid "Sent"
-msgstr "Saadetud"
-
 #: mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
@@ -14990,31 +12129,31 @@ msgid_plural ", %d unread"
 msgstr[0] ", %d lugemata"
 msgstr[1] ", %d lugemata"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:691
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:692
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: mail/mail-component.c:686
+#: mail/mail-component.c:693
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:699
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:700
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:701
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: mail/mail-component.c:841
+#: mail/mail-component.c:848
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
@@ -15027,225 +12166,225 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_Allkirjad</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Teave konto kohta</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmid</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentimise tüüp</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sõnumite koostamine</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Seadistused</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad _kirjapäised</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri valikud</span>"
 
-#: mail/mail-config.glade.h:19
-#: plugins/itip-formatter/itip-formatter.c:1249
+#: mail/mail-config.glade.h:18
+#: plugins/itip-formatter/itip-formatter.c:1667
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Märgid ja värvid</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Piltide laadimine</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Sõnumikuva</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uutest sõnumitest teatamine</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslik teave</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Valikud</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 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:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslik teave</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Turvaline MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvalisus</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri seaded</span>"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr "Lisa _uus allkiri..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 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
+#: mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati saada koopia (cc):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati saada _pimekoopia (cc):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Minu võtmerõngas olevad võtmed _usaldatakse alati"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Krüptitud sõnumi saatmisel krüptida alati ka enda jaoks"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Algupärase sõnumi manustamine"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Automatically _insert smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
 msgstr "_Piiksu uue sõnumi saabumisel"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Check _incoming mail for junk"
 msgstr "Sissetulevas posti _rämpsukontroll"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr "Kon_trolli õigekirja sisestamise ajal"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Kontrolli sissetulevate kirjade seest rämpsu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Cle_ar"
 msgstr "_Puhasta"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Clea_r"
 msgstr "_Puhasta"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "_Värvus õigekirjakontrolli probleemsetele sõnade jaoks:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Colors"
 msgstr "Värvid"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Kinnituse küsimine enne kataloogi puhastamist"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15261,252 +12400,254 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "_Vaikekodeering:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "Algupärast sõnumit ei tsiteerita"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #: shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "E-posti kontod"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Email _Address:"
 msgstr "E-posti _aadress:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikaustad"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr "_Krüptimissertifikaat:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Execute Command..."
 msgstr "Käsu käivitamine..."
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML'is"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
 msgid "HTML Mail"
 msgstr "HTML post"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
 msgid "Headers"
 msgstr "Päised"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
 msgstr "Rõhuta _tsiteeringuid"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "I_nclude remote tests"
 msgstr "Väliste testide _kaasamine"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "Inline"
 msgstr "Samal joonel"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Mail Configuration"
 msgstr "E-posti seadistused"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Mailbox location"
 msgstr "Kirjakasti asukoht"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 msgid "Play sound file when new mail arri_ves"
 msgstr "Mängi uue _sõnumi saabumisel heli"
 
-#: mail/mail-config.glade.h:105
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+#: mail/mail-config.glade.h:104
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
 msgstr ""
-"Palun sisesta teave oma e-posti väljasaatmise kohta. Kui sa ei tea, mida "
-"siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
-"teenusepakkujalt."
 
 #: mail/mail-config.glade.h:106
-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 võib täita siis, kui sa soovid nendes väljades "
-"olevat teavet lisada enda saadetud sõnumitesse."
+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 teave oma e-posti väljasaatmise kohta. Kui sa ei tea, mida siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti teenusepakkujalt."
 
 #: mail/mail-config.glade.h:107
-msgid "Please select among the following options"
-msgstr ""
+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 võib täita siis, kui sa soovid nendes väljades olevat teavet lisada enda saadetud sõnumitesse."
 
 #: mail/mail-config.glade.h:108
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Please select among the following options"
 msgstr ""
-"_Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
 
 #: mail/mail-config.glade.h:109
+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:110
 msgid "Quote original message"
 msgstr "Algupärase sõnumi tsiteerimine"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Re_member password"
 msgstr "_Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Re_ply-To:"
 msgstr "_Vasta-kellele:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Remember _password"
 msgstr "Parooli _meeldejätmine"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "S_elect..."
 msgstr "_Vali..."
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "S_tandard Font:"
 msgstr "_Tavaline kirjatüüp:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Se_lect..."
 msgstr "V_ali..."
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Security"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali trükkimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid "Select HTML variable width font for printing"
 msgstr "Vali trükkimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:127
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid "Server _Type: "
 msgstr "_Serveri tüüp:"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:130
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:132
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:133
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "T_erminal Font:"
 msgstr "T_erminali kirjatüüp"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid "T_ype: "
 msgstr "_Tüüp:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:137
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15515,11 +12656,7 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: 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:140
+#: mail/mail-config.glade.h:141
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15527,15 +12664,15 @@ msgstr ""
 "Sisesta nimi, millega sa soovid seda kontot kutsuda.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15545,14 +12682,6 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: 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 ""
-"E-posti konto seadistamine on peaaegu lõppenud. Sinu poolt määratud "
-"identiteet, siseneva ja väljuva posti serverid koondatakse ühe nime alla ja "
-"sellest saab Evolution'i postikonto. Palun anna sellele kontole nimi. Nime "
-"kasutatakse hiljem ainult kuvamise eesmärgil."
-
 #: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
@@ -15570,71 +12699,70 @@ msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
 #: mail/mail-config.glade.h:154
-msgid "_Enable"
-msgstr "_Lubamine"
-
-#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:155
+msgid "_Full Name:"
+msgstr "Täis_nimi:"
+
+#: mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "_Load images if sender is in address book"
 msgstr "_Piltide laadimine, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Määra see konto minu vaikimisi kontoks"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Never load images from the Internet"
 msgstr "_Kunagi ära lae ühtegi pilti Internetist"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:163
 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"
+msgstr "Täpsustus, kui _püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 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:166
+#: mail/mail-config.glade.h:165
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
 msgid "_Show animated images"
 msgstr "_Animeeritud piltide kuvamine"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Use Secure Connection:"
 msgstr "_Turvalise ühenduse kasutamine:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Use the same fonts as other applications"
 msgstr "_Kasuta sama kirjatüüpi, mis teisedki rakendused"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "color"
 msgstr "värvusega"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
 msgid "description"
 msgstr "kirjeldus"
 
@@ -15757,9 +12885,7 @@ 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."
+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
@@ -15769,10 +12895,7 @@ msgstr "Tõrge serverisse \"{0}\" sisselogimisel kasutajana \"{0}\"."
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
 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 sisestatud.  Kuna paroolid on üldiselt "
-"tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse "
-"lülitatud."
+msgstr "Kontrolli, kas parool on õigesti sisestatud.  Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse lülitatud."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -15798,11 +12921,11 @@ msgid "Adding a meaningful Subject line to your messages will give your recipien
 msgstr ""
 
 #. 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
 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
@@ -15825,9 +12948,7 @@ msgstr "Seda sõnumit ei saa saata kuna sa pole määranud ühtegi sõnumi saaja
 #. 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."
-msgstr ""
-"Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
-"nupule \"Kellele:\"."
+msgstr "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad nupule \"Kellele:\"."
 
 #. mail:ask-default-drafts primary
 #: mail/mail-errors.xml.h:38
@@ -15846,11 +12967,10 @@ msgstr "Kasuta _vaikekodeeringut"
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
 msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
-msgstr ""
-"Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
-"\"{0}\"?"
+msgstr "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast \"{0}\"?"
 
 #. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
 #: 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."
@@ -15863,287 +12983,305 @@ msgstr "_Puhasta"
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
 msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr ""
-"Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
-"kaustadest?"
+msgstr "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest kaustadest?"
 
 #: mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
-#. mail:exit-unsaved primary
+#. mail:ask-open-many primary
 #: mail/mail-errors.xml.h:53
+#, fuzzy
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+
+#. mail:ask-open-many secondary
+#: mail/mail-errors.xml.h:55
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: mail/mail-errors.xml.h:56
+#, fuzzy
+msgid "_Open Messages"
+msgstr "_Ava sõnum"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:55
+#: mail/mail-errors.xml.h:60
 msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr ""
-"Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
-"Evolution'i uuesti käivitad."
+msgstr "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa Evolution'i uuesti käivitad."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:57
+#: mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:59
+#: mail/mail-errors.xml.h:64
 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."
 msgstr ""
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:62
+#: mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:64
+#: mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:66
+#: mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
 #. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:68
+#: mail/mail-errors.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:82
+#: mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Sisesta parool."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:86
+#: mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:90
+#: mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
 #. mail:no-create-path primary
-#: mail/mail-errors.xml.h:94
-#: mail/mail-errors.xml.h:102
-#: mail/mail-errors.xml.h:106
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
+#: mail/mail-errors.xml.h:99
+#: mail/mail-errors.xml.h:107
+#: mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa salvestada."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:96
+#: mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Salvestuskataloogi ei saa luua, sest \"{1}\""
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:98
+#: mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi ei saa luua."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:104
+#: mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda ei saa üle kirjutada."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:108
+#: mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:110
+#: mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kausta \"{0}\" ei saa kustutada."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:114
+#: mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
 #. mail:no-delete-special-folder secondary
-#: mail/mail-errors.xml.h:116
-#: mail/mail-errors.xml.h:120
+#. mail:no-rename-special-folder secondary
+#: mail/mail-errors.xml.h:121
+#: mail/mail-errors.xml.h:125
 msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr ""
-"Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
-"ei saa ümber nimetada, ümber tõsta või kustutada."
+msgstr "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid ei saa ümber nimetada, ümber tõsta või kustutada."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:118
+#: mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa ümber nimetada ega liigutada."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
+#: mail/mail-errors.xml.h:127
 msgid "Delete \"{0}\"?"
 msgstr "Kustuta \"{0}\"?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
+#: mail/mail-errors.xml.h:129
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
+#: mail/mail-errors.xml.h:131
 msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-msgstr ""
-"Kui sa slle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
-"sõnumid ja alamkaustad."
+msgstr "Kui sa slle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad sõnumid ja alamkaustad."
 
 #. mail:no-rename-folder-exists primary
-#: mail/mail-errors.xml.h:128
-#: mail/mail-errors.xml.h:132
+#. mail:no-rename-folder primary
+#: mail/mail-errors.xml.h:133
+#: mail/mail-errors.xml.h:137
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
 
 #. mail:no-rename-folder-exists secondary
-#: mail/mail-errors.xml.h:130
-#: mail/mail-errors.xml.h:192
+#. mail:vfolder-notunique secondary
+#: mail/mail-errors.xml.h:135
+#: mail/mail-errors.xml.h:197
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" on juba olemas. Palun kasuta teistsugust nime."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
+#: mail/mail-errors.xml.h:139
 msgid "Because \"{2}\"."
 msgstr "Kuna \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#: mail/mail-errors.xml.h:136
-#: mail/mail-errors.xml.h:140
+#. mail:no-move-folder-to-nostore primary
+#: mail/mail-errors.xml.h:141
+#: mail/mail-errors.xml.h:145
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
 
 #. mail:no-move-folder-nostore secondary
-#: mail/mail-errors.xml.h:138
-#: mail/mail-errors.xml.h:146
+#. mail:no-copy-folder-nostore secondary
+#: mail/mail-errors.xml.h:143
+#: mail/mail-errors.xml.h:151
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" ei saa avada."
 
 #. mail:no-move-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142
-#: mail/mail-errors.xml.h:150
+#. mail:no-copy-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:147
+#: mail/mail-errors.xml.h:155
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" ei saa avada."
 
 #. mail:no-copy-folder-nostore primary
-#: mail/mail-errors.xml.h:144
-#: mail/mail-errors.xml.h:148
+#. mail:no-copy-folder-to-nostore primary
+#: mail/mail-errors.xml.h:149
+#: mail/mail-errors.xml.h:153
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
+#: mail/mail-errors.xml.h:157
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kausta \"{0}\" ei saa luua."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
+#: mail/mail-errors.xml.h:159
 msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" ei saa avada"
 
 #. mail:account-incomplete primary
-#: mail/mail-errors.xml.h:156
-#: mail/mail-errors.xml.h:160
+#. mail:account-notunique primary
+#: mail/mail-errors.xml.h:161
+#: mail/mail-errors.xml.h:165
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi ei saa salvestada."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
+#: mail/mail-errors.xml.h:163
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
+#: mail/mail-errors.xml.h:167
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua ühe nimega kahte kontot."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
+#: mail/mail-errors.xml.h:169
 msgid "Delete account?"
 msgstr "Kustuta konto?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
+#: mail/mail-errors.xml.h:171
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
+#: mail/mail-errors.xml.h:173
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto kohta käiv teave kustutatakse jäädavalt."
 
-#: mail/mail-errors.xml.h:169
+#: mail/mail-errors.xml.h:174
 msgid "Don't delete"
 msgstr "Ära kustuta"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
+#: mail/mail-errors.xml.h:176
 msgid "Could not save signature file."
 msgstr "Signatuurifaili ei saa salvestada."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
+#: mail/mail-errors.xml.h:178
 msgid "Because \"{0}\"."
 msgstr "Kuna \"{0}\"."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
+#: mail/mail-errors.xml.h:180
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Signatuuriskripti \"{0}\" pole võimalik määrata."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
+#: mail/mail-errors.xml.h:182
 msgid "The script file must exist and be executable."
 msgstr ""
 
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
+#: mail/mail-errors.xml.h:184
 msgid "Discard changed?"
 msgstr "Loobu muudatustest?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
+#: mail/mail-errors.xml.h:186
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:183
+#: mail/mail-errors.xml.h:188
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: mail/mail-errors.xml.h:184
+#: mail/mail-errors.xml.h:189
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
+#: mail/mail-errors.xml.h:191
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei ole olemas."
 
 #. 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."
+#: mail/mail-errors.xml.h:193
+msgid "This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:190
+#: mail/mail-errors.xml.h:195
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "vKausta \"{0}\" ei saa lisada."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
+#: mail/mail-errors.xml.h:199
 msgid "vFolders automatically updated."
 msgstr "vKaustad automaatselt uuendatud."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
+#: mail/mail-errors.xml.h:201
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -16153,12 +13291,12 @@ msgid ""
 msgstr ""
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
+#: mail/mail-errors.xml.h:207
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
+#: mail/mail-errors.xml.h:209
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -16168,27 +13306,27 @@ msgid ""
 msgstr ""
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
+#: mail/mail-errors.xml.h:215
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:217
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:221
 msgid "You must name this vFolder."
 msgstr "Sa pead sellele vKaustale nime andma."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:223
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
+#: mail/mail-errors.xml.h:225
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -16196,38 +13334,38 @@ msgid ""
 msgstr ""
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
+#: mail/mail-errors.xml.h:229
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
+#: mail/mail-errors.xml.h:231
 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"
 msgstr ""
 
-#: mail/mail-errors.xml.h:230
+#: mail/mail-errors.xml.h:235
 msgid "Ignore"
 msgstr "Eira"
 
-#: mail/mail-errors.xml.h:231
+#: mail/mail-errors.xml.h:236
 #: widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
-#: mail/mail-errors.xml.h:232
+#: mail/mail-errors.xml.h:237
 msgid "_Append"
 msgstr "_Lisa"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:234
+#: mail/mail-errors.xml.h:239
 msgid "Unable to read license file."
 msgstr "Litsentsifaili ei saa lugeda"
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:236
+#: mail/mail-errors.xml.h:241
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider until\n"
@@ -16235,29 +13373,29 @@ msgid ""
 msgstr ""
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:240
+#: mail/mail-errors.xml.h:245
 msgid "Querying server"
 msgstr ""
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:242
+#: mail/mail-errors.xml.h:247
 msgid "Please wait."
 msgstr "Palun oota."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:244
+#: mail/mail-errors.xml.h:249
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:246
+#: mail/mail-errors.xml.h:251
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
 msgstr ""
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:249
+#: mail/mail-errors.xml.h:254
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
@@ -16276,12 +13414,8 @@ msgstr "Filtreerin kausta"
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:556
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Tõrge väljundfiltrite rakendamisel: %s"
-
-#: mail/mail-ops.c:581
+#: mail/mail-ops.c:542
+#: mail/mail-ops.c:585
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16290,111 +13424,122 @@ msgstr ""
 "Tõrge lisamisel kasuta %s: %s\n"
 "Selle asemel lisan kausta `Saadetud'."
 
-#: mail/mail-ops.c:590
+#. sending mail, filtering failed
+#: mail/mail-ops.c:564
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Tõrge väljundfiltrite rakendamisel: %s"
+
+#: mail/mail-ops.c:602
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: mail/mail-ops.c:687
+#: mail/mail-ops.c:702
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:727
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:729
+#: mail/mail-send-recv.c:613
+msgid "Cancelled."
+msgstr "Loobutud."
+
+#: mail/mail-ops.c:731
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:819
+#: mail/mail-ops.c:828
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:1130
+#: mail/mail-ops.c:1139
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1182
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1245
+#: mail/mail-ops.c:1254
 #, c-format
 msgid "Opening store %s"
 msgstr "Avan hoidlat %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1332
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1417
+#: mail/mail-ops.c:1426
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1482
+#: mail/mail-ops.c:1491
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1492
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1538
+#: mail/mail-ops.c:1547
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1574
-#: mail/mail-ops.c:1625
+#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1634
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1631
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1632
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1706
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1778
+#: mail/mail-ops.c:1787
 #, 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:1864
+#: mail/mail-ops.c:1873
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1923
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16403,7 +13548,7 @@ msgstr ""
 "Väljundfaili ei saa luua: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1942
+#: mail/mail-ops.c:1951
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16412,11 +13557,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2022
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2025
+#: mail/mail-ops.c:2034
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16425,22 +13570,22 @@ msgstr ""
 "Ei saa luua väljundfaili: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2044
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: mail/mail-ops.c:2301
+#: mail/mail-ops.c:2310
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
@@ -16467,16 +13612,16 @@ msgstr "Tüüp: %s  "
 msgid "Send & Receive Mail"
 msgstr "Posti saatmine ja vastuvõtmine"
 
-#: mail/mail-send-recv.c:323
+#: mail/mail-send-recv.c:327
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: mail/mail-send-recv.c:410
+#: mail/mail-send-recv.c:416
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:410
-#: mail/mail-send-recv.c:462
+#: mail/mail-send-recv.c:416
+#: mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Ootamine..."
 
@@ -16493,16 +13638,16 @@ msgstr "Parooli sisestamine"
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: mail/mail-signature-editor.c:411
+#: mail/mail-signature-editor.c:412
 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
+#: mail/mail-signature-editor.c:415
+#: plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -16530,31 +13675,27 @@ msgstr "Edastatud sõnum"
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
 
-#: mail/mail-vfolder.c:87
-#, c-format
-msgid "Setting up vfolder: %s"
+#: mail/mail-vfolder.c:90
+#, fuzzy, c-format
+msgid "Setting up vFolder: %s"
 msgstr "vKausta ülesseadmine: %s"
 
-#: mail/mail-vfolder.c:235
+#: mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "'%s:%s' vkaustade uuendamine"
 
-#: mail/mail-vfolder.c:242
+#: mail/mail-vfolder.c:246
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:950
-msgid "vFolders"
-msgstr "VKaustad"
-
-#: mail/mail-vfolder.c:989
-msgid "Edit VFolder"
+#: mail/mail-vfolder.c:1008
+msgid "Edit vFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1073
-msgid "New VFolder"
+#: mail/mail-vfolder.c:1092
+msgid "New vFolder"
 msgstr "Uus vKaust"
 
 #: mail/message-list.c:999
@@ -16597,9 +13738,10 @@ msgstr "Kõrgeim"
 msgid "?"
 msgstr "?"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
 #: mail/message-list.c:1348
-#: plugins/itip-formatter/itip-view.c:149
+#: plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
@@ -16619,11 +13761,11 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:2044
+#: mail/message-list.c:2046
 msgid "Message List"
 msgstr ""
 
-#: mail/message-list.c:3409
+#: mail/message-list.c:3386
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -16699,48 +13841,25 @@ msgid "Body contains"
 msgstr "Sisu sisaldab"
 
 #: mail/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Sisu ei sisalda"
-
-#: mail/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Sisu või teema sisaldab"
-
-#: mail/searchtypes.xml.h:4
 msgid "Message contains"
 msgstr "Sõnum sisaldab"
 
-#: mail/searchtypes.xml.h:5
+#: mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Saaja sisaldab"
 
-#: mail/searchtypes.xml.h:6
+#: mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Saatja sisaldab"
 
-#: mail/searchtypes.xml.h:7
+#: mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Teema sisaldab"
 
-#: mail/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Teema ei sisalda"
-
-#: plugins/backup-restore/backup.c:109
-msgid "Backup Evolution directory"
-msgstr "Evolution'i kataloogi varundamine"
-
-#: plugins/backup-restore/backup.c:111
-msgid "Restore Evolution directory"
-msgstr "Evolution'i kataloogi taastamine"
-
-#: plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
-msgstr "Evolution'i arhiivi kontrollimine"
-
-#: plugins/backup-restore/backup.c:115
-msgid "Restart Evolution"
-msgstr "Evolution'i taaskäivitamine"
+#: mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Sender contains"
+msgstr "Teema sisaldab"
 
 #: plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
@@ -16758,6 +13877,22 @@ msgstr "Evolution'i arhiivi valimine taastamiseks"
 msgid "_Restart Evolution after restore"
 msgstr "_Peale taastamist taaskäivitatakse Evolution"
 
+#: plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr "Evolution'i kataloogi varundamine"
+
+#: plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr "Evolution'i kataloogi taastamine"
+
+#: plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr "Evolution'i arhiivi kontrollimine"
+
+#: plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr "Evolution'i taaskäivitamine"
+
 #: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Varundamise sätted..."
@@ -16770,243 +13905,570 @@ msgstr "Evolutioni andmete ja seadistuste varundamine"
 msgid "Restore Settings..."
 msgstr "Taastamise sätted..."
 
-#: plugins/bbdb/bbdb.c:387
+#: plugins/bbdb/bbdb.c:388
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
-#: plugins/bbdb/bbdb.c:396
+#: plugins/bbdb/bbdb.c:397
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automaatsed kontaktid</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:409
+#: plugins/bbdb/bbdb.c:410
 msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:427
+#: plugins/bbdb/bbdb.c:428
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kiirsuhtluse kontaktid</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:440
+#: plugins/bbdb/bbdb.c:441
 msgid "Periodically synchronize contact information and images from my _instant messenger"
 msgstr ""
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:447
+#: plugins/bbdb/bbdb.c:448
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
+#: plugins/calendar-weather/calendar-weather.c:54
+#: plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr "Ilm: Vihmane"
+
+#: plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Ilm"
+
+#: plugins/calendar-weather/calendar-weather.c:268
+msgid "Select a location"
+msgstr "Vali asukoht"
+
+#: plugins/calendar-weather/calendar-weather.c:655
+msgid "_Units:"
+msgstr "Ühikud:"
+
+#: plugins/calendar-weather/calendar-weather.c:662
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: plugins/calendar-weather/calendar-weather.c:663
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: plugins/default-source/default-source.c:82
+#, fuzzy
+msgid "Mark  as default folder"
+msgstr "Vaikekausta kasutamine mustandite jaoks?"
+
+#: plugins/default-source/default-source.c:108
+#, fuzzy
+msgid "Mark as default folder"
+msgstr "Vaikekausta kasutamine mustandite jaoks?"
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: plugins/exchange-account-setup/exchange-account-setup.c:53
+#, fuzzy
+msgid "Secure Password"
+msgstr "Parooli sisestamine"
+
+#. i18n: "NTLM" probably doesn't translate
+#: plugins/exchange-account-setup/exchange-account-setup.c:56
+#, fuzzy
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:64
+#, fuzzy
+msgid "Plaintext Password"
+msgstr "Parooli sisestamine"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:66
+#, fuzzy
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "See valik loob ühenduse IMAPv4rev1 serveriga kasutades tavalist parooli."
+
+#. Description section
+#: plugins/exchange-account-setup/exchange-account-setup.c:113
+#, fuzzy
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+"<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
+"kes saadab sulle kirja ajal kui sa puhkusel oled.</small>"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:140
+#, fuzzy
+msgid "I am in the office"
+msgstr "Olen praegu tööl"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:154
+#, fuzzy
+msgid "I am out of the office"
+msgstr "Olen praegu puhkusel"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:168
+#, fuzzy
+msgid "Out of office Message:"
+msgstr "<b>Puhkuseteade:</b>"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:194
+#, fuzzy
+msgid "Exchange Settings"
+msgstr "Seaded"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:332
+#: plugins/exchange-account-setup/exchange-ask-password.c:200
+msgid "_OWA Url:"
+msgstr ""
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:340
+#: plugins/exchange-account-setup/exchange-ask-password.c:193
+#, fuzzy
+msgid "A_uthenticate"
+msgstr "Autentimine"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:457
+#, fuzzy
+msgid "Authentication Type"
+msgstr "Autentimine"
+
+#: plugins/exchange-account-setup/exchange-account-setup.c:471
+#, fuzzy
+msgid "Ch_eck for Supported Types"
+msgstr "_Toetatavate tüüpide tuvastus"
+
 #: plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Kausta \"%s\" tellimusest loobumine"
 
-#: plugins/itip-formatter/itip-formatter.c:650
+#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+msgid "Checklist"
+msgstr "Kontroll-loend"
+
+#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: widgets/misc/e-send-options.glade.h:20
+#, fuzzy
+msgid "Send Options"
+msgstr "<b>Saatmise valikud</b>"
+
+#: plugins/itip-formatter/itip-formatter.c:704
+#, fuzzy
+msgid "Unable to parse item"
+msgstr "Litsentsifaili ei saa lugeda"
+
+#: plugins/itip-formatter/itip-formatter.c:757
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:663
+#: plugins/itip-formatter/itip-formatter.c:768
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:667
+#: plugins/itip-formatter/itip-formatter.c:772
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:672
+#: plugins/itip-formatter/itip-formatter.c:777
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:677
+#: plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:725
+#: plugins/itip-formatter/itip-formatter.c:833
 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"
 
-#: 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:844
+#, fuzzy, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Kalendrit `%s' ei saa siirdada"
 
-#: plugins/itip-formatter/itip-formatter.c:740
+#: plugins/itip-formatter/itip-formatter.c:848
 msgid "Attendee status updated"
 msgstr "Osavõtja olek uuendatud"
 
-#: plugins/itip-formatter/itip-formatter.c:1240
-msgid "Meetings"
-msgstr "Koosolekud"
+#: plugins/itip-formatter/itip-formatter.c:973
+#, fuzzy
+msgid "The calendar attached is not valid"
+msgstr ""
+"Kontaktandmed on vigased:\n"
+"\n"
+
+#: plugins/itip-formatter/itip-formatter.c:974
+msgid "The message claims to contain a calendar, but the calendar is not valid iCalendar."
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1008
+#: plugins/itip-formatter/itip-formatter.c:1064
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1009
+#: plugins/itip-formatter/itip-formatter.c:1065
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1020
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1021
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr ""
+
+#: plugins/itip-formatter/itip-formatter.c:1658
+#, fuzzy
+msgid "Meetings and Tasks"
+msgstr "Kalender ja ülesanded"
 
 #. Delete message after acting
-#: plugins/itip-formatter/itip-formatter.c:1263
+#. FIXME Need a schema for this
+#: plugins/itip-formatter/itip-formatter.c:1681
 msgid "_Delete message after acting"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1273
+#: plugins/itip-formatter/itip-formatter.c:1691
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr ""
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1286
+#: plugins/itip-formatter/itip-formatter.c:1704
 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
+#: plugins/itip-formatter/itip-view.c:175
 #: 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
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:180
 msgid "Today %H:%M"
 msgstr "Täna %H:%M"
 
-#: plugins/itip-formatter/itip-view.c:144
+#. strftime format of a time,
+#. in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:184
 msgid "Today %H:%M:%S"
 msgstr "Täna %H:%M:%S"
 
-#: plugins/itip-formatter/itip-view.c:153
+#. strftime format of a time,
+#. in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:193
 msgid "Today %l:%M:%S %p"
 msgstr "Täna %l:%M:%S %p"
 
-#: plugins/itip-formatter/itip-view.c:161
-#: plugins/itip-formatter/itip-view.c:213
-msgid "%A, %B %e"
-msgstr "%A, %e. %B"
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:203
+msgid "Tomorrow"
+msgstr "Homme"
 
-#: plugins/itip-formatter/itip-view.c:166
-#: plugins/itip-formatter/itip-view.c:218
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e. %B %H:%M"
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:208
+#, fuzzy
+msgid "Tomorrow %H:%M"
+msgstr "Täna %H:%M"
 
-#: plugins/itip-formatter/itip-view.c:170
-#: plugins/itip-formatter/itip-view.c:222
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e. %B %H:%M:%S"
+#. strftime format of a time,
+#. in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:212
+#, fuzzy
+msgid "Tomorrow %H:%M:%S"
+msgstr "Täna %H:%M:%S"
 
-#: plugins/itip-formatter/itip-view.c:175
-#: plugins/itip-formatter/itip-view.c:227
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e. %B %l:%M %p"
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:217
+#, fuzzy
+msgid "Tomorrow %l:%M %p"
+msgstr "Täna %l:%M %p"
 
-#: plugins/itip-formatter/itip-view.c:179
-#: plugins/itip-formatter/itip-view.c:231
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e. %B %l:%M:%S %p"
+#. strftime format of a time,
+#. in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:221
+#, fuzzy
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Täna %l:%M:%S %p"
 
-#: plugins/itip-formatter/itip-view.c:187
+#. strftime format of a weekday.
+#: plugins/itip-formatter/itip-view.c:240
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: plugins/itip-formatter/itip-view.c:192
+#. strftime format of a weekday and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:245
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
-#: plugins/itip-formatter/itip-view.c:196
+#. strftime format of a weekday and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
-#: plugins/itip-formatter/itip-view.c:201
+#. strftime format of a weekday and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:254
 msgid "%A %l:%M %p"
 msgstr "%A, %l:%M %p"
 
-#: plugins/itip-formatter/itip-view.c:205
+#. strftime format of a weekday and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:258
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
-#: plugins/itip-formatter/itip-view.c:237
+#. strftime format of a weekday and a date
+#. without a year.
+#: plugins/itip-formatter/itip-view.c:267
+msgid "%A, %B %e"
+msgstr "%A, %e. %B"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:273
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e. %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:277
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e. %B %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:282
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e. %B %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:286
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e. %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: plugins/itip-formatter/itip-view.c:242
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H:%M"
 
-#: plugins/itip-formatter/itip-view.c:246
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a, %e. %B %Y %H:%M:%S"
 
-#: plugins/itip-formatter/itip-view.c:251
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y, %l:%M %p"
 
-#: plugins/itip-formatter/itip-view.c:255
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#: plugins/itip-formatter/itip-view.c:280
+#: plugins/itip-formatter/itip-view.c:335
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas läbi %s teabe järgneva koosoleku kohta:"
 
-#: plugins/itip-formatter/itip-view.c:282
+#: plugins/itip-formatter/itip-view.c:337
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas teabe järgneva koosoleku kohta:"
 
-#: plugins/itip-formatter/itip-view.c:287
+#: plugins/itip-formatter/itip-view.c:342
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
 msgstr "<b>%s</b> taotleb, et %s osaleks järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:290
+#: plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:292
+#: plugins/itip-formatter/itip-view.c:347
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:298
+#: plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
 
-#: plugins/itip-formatter/itip-view.c:300
+#: plugins/itip-formatter/itip-view.c:355
 #, 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
+#: plugins/itip-formatter/itip-view.c:358
 #, 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 järgneva koosoleku "
-"kohta:"
+msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta järgneva koosoleku kohta:"
 
-#: plugins/itip-formatter/itip-view.c:306
-#, c-format
-msgid "<b>%s</b> has accepted the following meeting:"
+#: plugins/itip-formatter/itip-view.c:361
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
 
-#: plugins/itip-formatter/itip-view.c:310
-#: plugins/itip-formatter/itip-view.c:316
-#, c-format
-msgid "<b>%s</b> through %s has cancelled the follow meeting:"
+#: plugins/itip-formatter/itip-view.c:365
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: plugins/itip-formatter/itip-view.c:312
-#: plugins/itip-formatter/itip-view.c:318
+#: plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> tühistas järgneva koosoleku."
 
-#: plugins/itip-formatter/itip-view.c:1265
-msgid "_Calendar:"
-msgstr "_Kalender:"
+#: plugins/itip-formatter/itip-view.c:370
+#, fuzzy, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
+
+#: plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
+
+#: plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr "<b>%s</b> tühistas järgneva koosoleku."
+
+#: plugins/itip-formatter/itip-view.c:403
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr "<b>%s</b> avalikustas läbi %s teabe järgneva koosoleku kohta:"
+
+#: plugins/itip-formatter/itip-view.c:405
+#, fuzzy, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr "<b>%s</b> avalikustas teabe järgneva koosoleku kohta:"
+
+#: plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr "<b>%s</b> taotleb, et %s osaleks järgneval koosolekul:"
+
+#: plugins/itip-formatter/itip-view.c:413
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
+
+#: plugins/itip-formatter/itip-view.c:415
+#, fuzzy, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr "<b>%s</b> katkestas ülesande."
+
+#: plugins/itip-formatter/itip-view.c:421
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
+
+#: plugins/itip-formatter/itip-view.c:423
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele."
+
+#: plugins/itip-formatter/itip-view.c:426
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta järgneva koosoleku kohta:"
+
+#: plugins/itip-formatter/itip-view.c:429
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
+
+#: plugins/itip-formatter/itip-view.c:433
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
+
+#: plugins/itip-formatter/itip-view.c:435
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled the following assigned task:"
+msgstr "<b>%s</b> tühistas järgneva koosoleku."
+
+#: plugins/itip-formatter/itip-view.c:438
+#, fuzzy, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
+
+#: plugins/itip-formatter/itip-view.c:442
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
+
+#: plugins/itip-formatter/itip-view.c:444
+#, fuzzy, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
+
+#. Comment
+#: plugins/itip-formatter/itip-view.c:892
+#: plugins/itip-formatter/itip-view.c:942
+msgid "Comment:"
+msgstr "Kommentaar:"
 
 #. org.gnome.mailing-list-actions:no-header primary
 #: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
@@ -17075,57 +14537,11 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact list _owner"
-msgstr "Võta postilendi _omanikuga ühendust"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-
-#: 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 "Hangi postilendi _arhiiv"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get list _usage information"
-msgstr "_Hangi postilendi kasutusteave"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "_Postiloend"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post message to list"
-msgstr "_Sõnumi saatmine loendisse"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to list"
-msgstr "_Telli postiloend"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Un-subscribe to list"
-msgstr "_Lõpeta postiloendi tellimus"
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/new-mail-notify/new-mail-notify.c:66
+#, fuzzy
+msgid "_Generates a D-BUS message when new mail arrives"
+msgstr "_Uutest sõnumitest ei teavitata"
 
 #: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
@@ -17254,65 +14670,82 @@ msgstr "Vali sihtfail"
 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
+#: plugins/send-options/send-options.c:82
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+
+#. org.gnome.evolution.mail_shared_folder:invalid-user primary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
+msgid "Invalid user"
+msgstr "Vigane kasutaja"
+
+#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
 msgid ""
 "\n"
-"Share List"
+"You cannot share folder with specified user \"{0}\" \n"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:4
-msgid "Ad_d"
-msgstr "_Lisa"
+#. org.gnome.evolution.mail_shared_folder:no-user primary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
+msgid "Specify User"
+msgstr "Määra kasutaja"
 
-#: plugins/shared-folder/properties.glade.h:5
-msgid "Additional Access"
+#. org.gnome.evolution.mail_shared_folder:no-user secondary
+#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
+msgid ""
+"\n"
+"\tYou have to specify a user name whom you want to add to the list \n"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:7
-msgid "Delet_e"
-msgstr "_Kustuta"
-
-#: plugins/shared-folder/properties.glade.h:8
-msgid "Edi_t"
-msgstr "_Redigeermine"
+#: plugins/shared-folder/properties.glade.h:2
+msgid "<b>Users :</b>"
+msgstr "<b>Kasutajad :</b>"
 
-#: plugins/shared-folder/properties.glade.h:10
+#: plugins/shared-folder/properties.glade.h:4
 msgid "Message"
 msgstr "Sõnum"
 
-#: plugins/shared-folder/properties.glade.h:12
-msgid "Sen_d Custom Notification"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:13
+#: plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:15
+#: plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:18
+#: plugins/shared-folder/properties.glade.h:11
+#, fuzzy
+msgid "_Contacts..."
+msgstr "Kontaktid..."
+
+#: plugins/shared-folder/properties.glade.h:12
+#, fuzzy
+msgid "_Cutomize notification message"
+msgstr "Sõnumit ei saa luua."
+
+#: plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:20
+#: plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:21
+#: plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:282
+#: plugins/shared-folder/share-folder-common.c:315
 msgid "Users"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:283
+#: plugins/shared-folder/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:361
+#: plugins/shared-folder/share-folder-common.c:401
 msgid "Sharing"
 msgstr ""
 
@@ -17321,17 +14754,31 @@ msgstr ""
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
+#: 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
+msgid "Evolution Test component"
+msgstr "Evolution'i testkomponent"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "Button style"
-msgstr "Nuppude stiil"
+msgid "A GNOME Print description of the current printer settings"
+msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Buttons are visible"
-msgstr "Nupud on nähtavad"
+#, fuzzy
+msgid "Configuration version"
+msgstr "E-posti seadistused"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
-msgid "Default width of the folder bar pane"
-msgstr "Vaikimisi kaustariba paani laius"
+#, fuzzy
+msgid "Default sidebar width"
+msgstr "Vaikimisi akna laius."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
@@ -17342,53 +14789,89 @@ msgid "Default window width"
 msgstr "Vaikimisi akna laius."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:6
-msgid "Evolution configuration version"
+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 "ID or alias of the component to be shown by default at start-up."
+msgid "Last upgraded configuration version"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "If set to true, Evolution will start up in offline mode instead of online mode."
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 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 ""
+#, fuzzy
+msgid "Printer settings"
+msgstr "P_ilot'i sätted..."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Last upgraded Evolution configuration version"
+msgid "Skip development warning dialog"
 msgstr ""
 
 #: 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/main.c:475
+msgid "Start in offline mode"
+msgstr "Alustamine autonoomses režiimis"
 
 #: 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."
+msgid "The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Toolbar is visible"
-msgstr "Tööriistariba on nähtav"
+#, fuzzy
+msgid "The default height for the main window, in pixels."
+msgstr "Vaikimisi sõnumiakna kõrgus"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Whether Evolution should start up in offline mode"
-msgstr ""
+#, fuzzy
+msgid "The default width for the main window, in pixels."
+msgstr "Vaikimisi sõnumiakna laius"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Whether the buttons should be visible."
-msgstr "Millal nupud peaksid olema nähtavad."
+#, fuzzy
+msgid "The default width for the sidebar, in pixels."
+msgstr "Vaikimisi kaustariba paani laius"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buutons is determined by the GNOME toolbar setting."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Toolbar is visible"
+msgstr "Tööriistariba on nähtav"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks olema nähtav."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Whether to skip the development warning dialog"
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether the window buttons should be visible."
+msgstr "Millal nupud peaksid olema nähtavad."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+#, fuzzy
+msgid "Window button style"
+msgstr "Akna _nupud"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "Window buttons are visible"
+msgstr "Nupud on nähtavad"
+
 #: shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktiivsed ühendused</b>"
@@ -17403,63 +14886,32 @@ msgstr ""
 "Kui soovid neid ühendusi sulgeda ja autonoomsesse\n"
 "olekusse siirduda, vajuta \"Olgu\""
 
-#: 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 seadistuste andmebaasi"
-
-#: 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)"
 
-#: shell/e-shell-importer.c:146
+#: shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: shell/e-shell-importer.c:149
+#: shell/e-shell-importer.c:150
 msgid ""
 "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."
 msgstr ""
 
-#: shell/e-shell-importer.c:155
+#: shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:158
+#: shell/e-shell-importer.c:159
 #: shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige teave, mida soovite importida:"
 
-#: shell/e-shell-importer.c:161
+#: shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -17467,8 +14919,8 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:232
-#: shell/e-shell-importer.c:266
+#: shell/e-shell-importer.c:233
+#: shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17477,32 +14929,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:340
+#: shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:461
-#: shell/e-shell-importer.c:1073
+#: shell/e-shell-importer.c:462
+#: shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
 
-#: shell/e-shell-importer.c:469
+#: shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:477
+#: shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:487
 #: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
 
-#: shell/e-shell-importer.c:506
+#: shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -17511,31 +14963,31 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:582
+#: shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: shell/e-shell-importer.c:694
+#: shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: shell/e-shell-importer.c:697
+#: shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
-#: shell/e-shell-importer.c:765
+#: shell/e-shell-importer.c:766
 #: shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
@@ -17544,26 +14996,26 @@ msgstr ""
 "Palun oota...\n"
 "Üritan tuvastada olemasolevate programmide seadistusi"
 
-#: shell/e-shell-importer.c:772
+#: shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:898
+#: shell/e-shell-importer.c:899
 #: shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1092
+#: shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Faili %s jaoks ei ühtegi importijat saadaval"
 
-#: shell/e-shell-importer.c:1106
+#: shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Importijat ei saa käivitada"
 
-#: shell/e-shell-importer.c:1220
+#: shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "_Importimine"
 
@@ -17585,9 +15037,7 @@ msgid ""
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
-"Kui sa praegu Evolution'i seadistusabilise sulged, lähevad kõik sisestatud "
-"andmed kaotsi. Sel juhul pead sa Evolution'i järgmisel käivitamisel uuesti "
-"ka seadistusabilise käivitama.\n"
+"Kui sa praegu Evolution'i seadistusabilise sulged, lähevad kõik sisestatud andmed kaotsi. Sel juhul pead sa Evolution'i järgmisel käivitamisel uuesti ka seadistusabilise käivitama.\n"
 "\n"
 "Kas sa soovid seadistusabilist sulgeda?"
 
@@ -17611,26 +15061,6 @@ 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
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
-"vajuta seda nuppu."
-
-#: shell/e-shell-window.c:349
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution siirdub autonoomsesse olekusse."
-
-#: shell/e-shell-window.c:356
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda nuppu."
-
-#: shell/e-shell-window.c:708
-#, c-format
-msgid "Switch to %s"
-msgstr "Lülitub ümber: %s"
-
 #: 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."
@@ -17649,7 +15079,9 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
 #. The translator-credits string is for translators to list
-#: shell/e-shell-window-commands.c:425
+#. * per language credits for translation, displayed in the
+#. * about box
+#: shell/e-shell-window-commands.c:426
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001\n"
@@ -17661,24 +15093,72 @@ msgstr ""
 "http://et-gnome.sourceforge.net\n"
 "Veateated, parandused: <gnome-et@linux.ee>"
 
-#: shell/e-shell-window-commands.c:439
+#: shell/e-shell-window-commands.c:440
 msgid "Groupware Suite"
 msgstr "Grupitöö vahend"
 
-#: shell/e-shell-window-commands.c:680
+#: shell/e-shell-window-commands.c:681
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:693
+#: shell/e-shell-window-commands.c:694
 #: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:706
+#: shell/e-shell-window-commands.c:707
 #: ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
+#: shell/e-shell-window.c:341
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks vajuta seda nuppu."
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution siirdub autonoomsesse olekusse."
+
+#: shell/e-shell-window.c:356
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda nuppu."
+
+#: shell/e-shell-window.c:708
+#, c-format
+msgid "Switch to %s"
+msgstr "Lülitub ümber: %s"
+
+#: shell/e-shell.c:597
+msgid "Uknown system error."
+msgstr "Tundmatu süsteemi viga."
+
+#: shell/e-shell.c:805
+#: shell/e-shell.c:806
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:1249
+#: widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "Olgu"
+
+#: shell/e-shell.c:1251
+msgid "Invalid arguments"
+msgstr "Vigased argumendid"
+
+#: shell/e-shell.c:1253
+msgid "Cannot register on OAF"
+msgstr "OAF'i ei saa registreerida"
+
+#: shell/e-shell.c:1255
+msgid "Configuration Database not found"
+msgstr "Ei leia seadistuste andmebaasi"
+
+#: shell/e-shell.c:1257
+msgid "Generic error"
+msgstr "Üldine viga"
+
 #: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Uus"
@@ -17725,18 +15205,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Loob uue testikirje"
 
-#: 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
-msgid "Evolution Test component"
-msgstr "Evolution'i testkomponent"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -17830,10 +15298,6 @@ msgstr "Ära küsi enam uuesti"
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution'i käivitamine koos määratud komponendi aktiveerimisega"
 
-#: shell/main.c:475
-msgid "Start in offline mode"
-msgstr "Alustamine autonoomses režiimis"
-
 #: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
@@ -17879,8 +15343,7 @@ msgid ""
 "\n"
 "You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid sul on "
-"saadaval ainult {1}.\n"
+"Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid sul on saadaval ainult {1}.\n"
 "\n"
 "Enne jätkamise pead Sa oma kodukataloogi looma rohkem vaba ruumi."
 
@@ -17902,14 +15365,14 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele "
-"andmetele.\n"
+"Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele andmetele.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Jätka"
 
 #. shell:upgrade-remove-1-4 title
+#. shell:upgrade-remove-1-4 primary
 #: shell/shell-errors.xml.h:17
 #: shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
@@ -17924,9 +15387,7 @@ msgid ""
 msgstr ""
 "Evolution'i eelmine versioon hoidis andmeid teises kohas.\n"
 "\n"
-"Kui sa valid andmete eemaldamise, siis eemaldatakse kogu \"evolution\" "
-"kataloogi jäädavalt. Kui sa valid andmete säilitamise, siis võid sa hiljem "
-"omal vabal valikul käsitsi eemaldada kataloogi  \"evolution\".\n"
+"Kui sa valid andmete eemaldamise, siis eemaldatakse kogu \"evolution\" kataloogi jäädavalt. Kui sa valid andmete säilitamise, siis võid sa hiljem omal vabal valikul käsitsi eemaldada kataloogi  \"evolution\".\n"
 
 #: shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
@@ -17937,6 +15398,7 @@ msgid "_Keep Data"
 msgstr "_Säilita andmed"
 
 #. 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
 msgid "Really delete old data?"
@@ -17953,12 +15415,14 @@ msgid ""
 msgstr ""
 
 #. shell:noshell title
+#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:39
 #: shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Ei saa käivitada Evolution'i"
 
 #. shell:noshell primary
+#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:41
 #: shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
@@ -17982,7 +15446,7 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/ca-trust-dialog.c:91
+#: smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17993,6 +15457,14 @@ msgstr ""
 "\n"
 "Muuda usaldussätteid:"
 
+#: 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
@@ -18032,14 +15504,6 @@ 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'"
@@ -18107,8 +15571,7 @@ msgstr "<b>Omanik</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
-"<b>See sertifikaat on verifitseeritud järgnevate toimingute tarbeks:</b>"
+msgstr "<b>See sertifikaat on verifitseeritud järgnevate toimingute tarbeks:</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -18128,10 +15591,7 @@ msgstr "Varunda kõik"
 
 #: 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)."
-msgstr ""
-"Enne selle sertifitseerimiskeskuse (SK) usaldamist ükskõik mis eesmärgil, "
-"peaksid sa selle SK kasutamisreeglitega ja protseduuridega (kui need on "
-"saadaval)."
+msgstr "Enne selle sertifitseerimiskeskuse (SK) usaldamist ükskõik mis eesmärgil, peaksid sa selle SK kasutamisreeglitega ja protseduuridega (kui need on saadaval)."
 
 #: smime/gui/smime-ui.glade.h:14
 #: smime/lib/e-cert.c:1076
@@ -18256,6 +15716,11 @@ msgstr ""
 msgid "dialog1"
 msgstr "dialog1"
 
+#. 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-cert.c:238
 #: smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
@@ -18460,11 +15925,6 @@ msgstr "Teema unikaalne ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#. 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"
@@ -18501,6 +15961,9 @@ msgstr ""
 msgid "Default subject for the message."
 msgstr "Vaikimisi sõnumi teema."
 
+#. 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"
@@ -18603,10 +16066,10 @@ msgstr "Kuva käesolev kontakt"
 
 #: ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 #: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:103
 #: 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"
@@ -18621,7 +16084,7 @@ msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
 #: ui/evolution-addressbook.xml.h:39
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:16
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -18800,7 +16263,8 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Loob või muudab uute sõnumite filtreerimisreegleid"
 
 #: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit virtual folder definitions"
+#, fuzzy
+msgid "Create or edit vFolder definitions"
 msgstr "Loob või muudab virtuaalsete kaustade kirjeldusi"
 
 #: ui/evolution-mail-global.xml.h:6
@@ -18835,14 +16299,15 @@ msgstr "Näitab sõnumi eelvaate akent"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:14
-msgid "Virtual Folder _Editor..."
-msgstr "Virtuaalse kausta _redaktor..."
-
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtrid..."
 
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "vFolder _Editor..."
+msgstr "Virtuaalse kausta _redaktor..."
+
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
@@ -18943,38 +16408,6 @@ msgstr "_Inverdi 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 "Lisa saatja _aadressiraamatusse"
@@ -19012,8 +16445,9 @@ msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
 #: ui/evolution-mail-message.xml.h:12
-msgid "Create _Virtual Folder From Message"
-msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
+#, fuzzy
+msgid "Create _vFolder From Message"
+msgstr "_Loo sõnumi baasil filter"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
@@ -19032,19 +16466,23 @@ msgid "Create a rule to filter messages with this subject"
 msgstr "Loob reegli filtreerimaks selle teemaga sõnumeid"
 
 #: ui/evolution-mail-message.xml.h:17
-msgid "Create a virtual folder for these recipients"
+#, fuzzy
+msgid "Create a vFolder for these recipients"
 msgstr "Loob virtuaalse kausta selle sõnumi adressaatide järgi"
 
 #: ui/evolution-mail-message.xml.h:18
-msgid "Create a virtual folder for this mailing list"
+#, fuzzy
+msgid "Create a vFolder for this mailing list"
 msgstr "Loob virtuaalse kausta selle sõnumi postiloendi järgi"
 
 #: ui/evolution-mail-message.xml.h:19
-msgid "Create a virtual folder for this sender"
+#, fuzzy
+msgid "Create a vFolder for this sender"
 msgstr "Loob virtuaalse kausta selle sõnumi saatja järgi"
 
 #: ui/evolution-mail-message.xml.h:20
-msgid "Create a virtual folder for this subject"
+#, fuzzy
+msgid "Create a vFolder for this subject"
 msgstr "Loob virtuaalse kausta selle sõnumi teema järgi"
 
 #: ui/evolution-mail-message.xml.h:23
@@ -19307,75 +16745,111 @@ msgstr "Teksti _suurus"
 msgid "Un-delete the selected messages"
 msgstr "Taastab valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "VFolder on Mailing _List..."
-msgstr "VKaust _postiloendi järgi..."
-
 #: ui/evolution-mail-message.xml.h:104
-msgid "VFolder on Se_nder..."
-msgstr "VKaust _saatja järgi..."
-
-#: ui/evolution-mail-message.xml.h:105
-msgid "VFolder on _Recipients..."
-msgstr "VKaust _adressaatide järgi..."
-
-#: ui/evolution-mail-message.xml.h:106
-msgid "VFolder on _Subject..."
-msgstr "VKaust _teema järgi..."
-
-#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "_Manustatud"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Loo sõnumi baasil filter"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "Samal _joonel"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Message Display"
 msgstr "_Sõnumi kuvamine"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Normal Display"
 msgstr "_Tavaline kuva"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Open Message"
 msgstr "_Ava sõnum"
 
-#: ui/evolution-mail-message.xml.h:124
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129
+#: ui/evolution-mail-message.xml.h:125
 #: ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "T_ööriistad"
 
-#: ui/evolution-mail-message.xml.h:130
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Taasta"
 
+#: ui/evolution-mail-message.xml.h:127
+#, fuzzy
+msgid "vFolder on Mailing _List..."
+msgstr "VKaust _postiloendi järgi..."
+
+#: ui/evolution-mail-message.xml.h:128
+#, fuzzy
+msgid "vFolder on Se_nder..."
+msgstr "VKaust _saatja järgi..."
+
+#: ui/evolution-mail-message.xml.h:129
+#, fuzzy
+msgid "vFolder on _Recipients..."
+msgstr "VKaust _adressaatide järgi..."
+
+#: ui/evolution-mail-message.xml.h:130
+#, fuzzy
+msgid "vFolder on _Subject..."
+msgstr "VKaust _teema järgi..."
+
+#: 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-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -19915,15 +17389,8 @@ msgstr "_Käesolev vaade"
 msgid "Save Custom View..."
 msgstr "Salvesta kohandatud vaade..."
 
-#: widgets/misc/e-calendar.c:177
-#: widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Eelmine nupp"
-
-#: widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Kuu kalender"
-
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
@@ -19933,6 +17400,15 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
+#: widgets/misc/e-calendar.c:177
+#: widgets/misc/e-calendar.c:201
+msgid "Previous Button"
+msgstr "Eelmine nupp"
+
+#: widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Kuu kalender"
+
 #: widgets/misc/e-cell-date-edit.c:232
 #: widgets/misc/e-dateedit.c:444
 msgid "Now"
@@ -20087,11 +17563,10 @@ msgid "Evolution Query"
 msgstr "Evolutioni küsimus"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:436
+#: widgets/misc/e-error.c:438
 #, 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>"
+msgstr "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -20197,35 +17672,184 @@ msgstr "Privaatkirjete sünkroniseerimine"
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
-#: widgets/misc/e-search-bar.c:540
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: widgets/misc/e-search-bar.c:343
+#, fuzzy
+msgid "Search Text Entry"
+msgstr "Otsinguredaktor"
+
+#: widgets/misc/e-search-bar.c:547
 msgid "_Search"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:546
+#: widgets/misc/e-search-bar.c:553
 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:554
+#: widgets/misc/e-search-bar.c:941
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:645
+msgid "Search Type"
+msgstr "Otsingu tüüp"
+
+#: widgets/misc/e-search-bar.c:849
 msgid "Item ID"
 msgstr "Elemendi (id_ID)"
 
-#: widgets/misc/e-search-bar.c:844
+#: widgets/misc/e-search-bar.c:856
 msgid "Subitem ID"
 msgstr "Alamelemendi (ID)"
 
-#: widgets/misc/e-search-bar.c:851
+#: widgets/misc/e-search-bar.c:863
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:931
+#: widgets/misc/e-search-bar.c:943
 msgid "Find _Now"
 msgstr "_Otsing"
 
+#: widgets/misc/e-send-options.c:505
+#, fuzzy
+msgid "When de_leted:"
+msgstr "%d kustutatut"
+
+#: widgets/misc/e-send-options.glade.h:1
+#, fuzzy
+msgid "<b>Delivery Options</b>"
+msgstr "<b>Saatmise valikud</b>"
+
+#: widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>Vastused</b>"
+
+#: widgets/misc/e-send-options.glade.h:3
+#, fuzzy
+msgid "<b>Return Notification</b>"
+msgstr "<b>Autentimine</b>"
+
+#: widgets/misc/e-send-options.glade.h:4
+#, fuzzy
+msgid "<b>Status Tracking</b>"
+msgstr "<b>Otsimine</b>"
+
+#: widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:6
+#, fuzzy
+msgid "C_lassification"
+msgstr "_Liigitamine"
+
+#: widgets/misc/e-send-options.glade.h:7
+#, fuzzy
+msgid "Creat_e a sent item to track information"
+msgstr "CMS Vastuvõtja teavet ei saa luua"
+
+#: widgets/misc/e-send-options.glade.h:8
+#, fuzzy
+msgid "Deli_vered and opened"
+msgstr "Vastused ja eelnenud"
+
+#: widgets/misc/e-send-options.glade.h:9
+#, fuzzy
+msgid "Gene_ral Options"
+msgstr "Üldine"
+
+#: widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:12
+msgid ""
+"None\n"
+"Mail Receipt\n"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:15
+#, fuzzy
+msgid ""
+"Public\n"
+"Private\n"
+"Confidential\n"
+msgstr "Salajane"
+
+#: widgets/misc/e-send-options.glade.h:19
+#, fuzzy
+msgid "R_eply requested"
+msgstr "_Vastamise stiil:"
+
+#: widgets/misc/e-send-options.glade.h:21
+msgid "Sta_tus  Tracking"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:22
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:26
+#, fuzzy
+msgid "W_ithin"
+msgstr "Laius"
+
+#: widgets/misc/e-send-options.glade.h:27
+msgid "When acce_pted: "
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:28
+#, fuzzy
+msgid "When co_mpleted:"
+msgstr "_Lõpetamise kuupäev:"
+
+#: widgets/misc/e-send-options.glade.h:29
+msgid "When decli_ned:    "
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:30
+msgid "_After:"
+msgstr "Pärast:"
+
+#: widgets/misc/e-send-options.glade.h:31
+#, fuzzy
+msgid "_All information"
+msgstr "Teave ülesande kohta"
+
+#: widgets/misc/e-send-options.glade.h:32
+#, fuzzy
+msgid "_Delay message delivery"
+msgstr "Jäta sõnumid serverisse"
+
+#: widgets/misc/e-send-options.glade.h:33
+#, fuzzy
+msgid "_Delivered"
+msgstr "_Kustuta"
+
+#: widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration  date"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr "_Kuni:"
+
+#: widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr ""
+
+#: widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:     "
+msgstr ""
+
 #. system:ask-save-file-exists-overwrite primary
 #: widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
@@ -20255,3 +17879,1349 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
+
+#: widgets/misc/e-url-entry.c:107
+#, fuzzy
+msgid "click here to go to url"
+msgstr "<kausta valimiseks kliki siia>"
+
+#~ msgid "have "
+#~ msgstr "omab"
+#~ msgid "has "
+#~ msgstr "omab"
+#~ msgid " cards"
+#~ msgstr " kaarti"
+#~ msgid " card"
+#~ msgstr " kaart"
+#~ msgid "alarm "
+#~ msgstr "alarm "
+#~ msgid "time-zone "
+#~ msgstr "ajavöönd"
+#~ msgid "meeting "
+#~ msgstr "koosolek"
+#~ msgid ", %d events"
+#~ msgstr ", %d sündmust"
+#~ msgid "work week view :"
+#~ msgstr "töönädala vaade :"
+#~ msgid "day view :"
+#~ msgstr "päeva vaade :"
+#~ msgid "month view :"
+#~ msgstr "kuu vaade :"
+#~ msgid "week view :"
+#~ msgstr "nädala vaade :"
+#~ msgid ")"
+#~ msgstr ")"
+#~ msgid "Position of the vertical pane in main view."
+#~ msgstr "Vertikaalpaani asukoht põhivaates."
+#~ 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 "Address:"
+#~ msgstr "Aadress:"
+#~ msgid "Calendar:"
+#~ msgstr "Kalender:"
+#~ msgid "PO Box:"
+#~ msgstr "Sidejaoskonna postkast:"
+#~ msgid "State/Province:"
+#~ msgstr "Maakond/Provints:"
+#~ msgid "Title:"
+#~ msgstr "Tiitel:"
+#~ msgid "This contact belongs to these categories:"
+#~ msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
+#~ msgid "Edit Contact Info"
+#~ msgstr "Muuda kontakti andmeid"
+#~ msgid "Add to Contacts"
+#~ msgstr "Lisa kontaktide hulka"
+#~ msgid "Days that are work days"
+#~ msgstr "Päevad, mis on tööpäevad"
+#~ msgid "Default timezone for meetings"
+#~ msgstr "Vaikimisi ajavöönd koosolekute jaoks"
+#~ msgid "Position of the horizontal pane in the month view"
+#~ msgstr "Horisontaalpaani asukoht kuuvaates"
+#~ msgid "Position of the vertical pane"
+#~ msgstr "Vertikaalpaani asukoht"
+#~ msgid "Show where events end in week and month views"
+#~ msgstr "Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
+#~ msgid "Whether to ask for confirmation when folder is expunged"
+#~ msgstr "Kas küsida nõusolekut kausta puhastamisel"
+#~ msgid "<span weight=\"bold\">Basics</span>"
+#~ msgstr "<span weight=\"bold\">Põhiline</span>"
+#~ msgid "<span weight=\"bold\">Date and Time</span>"
+#~ msgstr "<span weight=\"bold\">Kuupäev ja aeg</span>"
+#~ msgid "Free/Busy Editor"
+#~ msgstr "Vaba/Hõivatud teabe redaktor"
+#~ msgid "Print Setup"
+#~ msgstr "Trükkimise seaded"
+#~ msgid "Signing is not supported by this cipher"
+#~ msgstr "See šiffer ei toeta allkirjastamist"
+#~ msgid "Signing message"
+#~ msgstr "Sõnumi signeerimine"
+#~ msgid "Verifying is not supported by this cipher"
+#~ msgstr "See šiffer ei toeta kontrolli"
+#~ msgid "Verifying message"
+#~ msgstr "Sõnumi verifitseerimine"
+#~ msgid "Encryption is not supported by this cipher"
+#~ msgstr "See šiffer ei toeta krüptimist"
+#~ msgid "Encrypting message"
+#~ msgstr "Sõnumi krüptimine"
+#~ msgid "Decryption is not supported by this cipher"
+#~ msgstr "See šiffer ei toeta dekrüptimist"
+#~ msgid "Decrypting message"
+#~ msgstr "Sõnumi dekrüptimine"
+#~ msgid "You may not import keys with this cipher"
+#~ msgstr "Sa ei tohi importida selle šifriga võtmeid"
+#~ msgid "You may not export keys with this cipher"
+#~ msgstr "Sa ei tohi eksportida selle šifriga võtmeid"
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "Ei olnud võimalik kirjutada logisse kirjet: %s\n"
+#~ "Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
+#~ "taastad ühenduse võrguga."
+#~ msgid ""
+#~ "Could not open `%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "Ei ole võimalik avada `%s':\n"
+#~ "%s\n"
+#~ "Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
+#~ msgid "Resynchronizing with server"
+#~ msgstr "Taassünkroniseeritakse serveriga"
+#~ msgid "You must be working online to complete this operation"
+#~ msgstr "Selle operatsiooni täitmiseks pead olema võrku ühendatud"
+#~ msgid "Failed to create pipe to '%s': %s"
+#~ msgstr "Tõrge toru loomisel -> '%s': %s"
+#~ msgid "Failed to create child process '%s': %s"
+#~ msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
+#~ msgid "Invalid message stream received from %s: %s"
+#~ msgstr "Vastu võetud vigane sõnum %s'lt: %s"
+#~ msgid "Syncing folders"
+#~ msgstr "Kaustade sünkroniseerimine"
+#~ msgid "Error parsing filter: %s: %s"
+#~ msgstr "Viga filtri analüüsil: %s: %s"
+#~ msgid "Error executing filter: %s: %s"
+#~ msgstr "Viga filtri täitmisel: %s: %s"
+#~ msgid "Unable to open spool folder"
+#~ msgstr "Puhverkausta pole võimalik avada"
+#~ msgid "Unable to process spool folder"
+#~ msgstr "Puhverkausta pole võimalik töödelda"
+#~ msgid "Getting message %d (%d%%)"
+#~ msgstr "Võetakse vastu teadet %d (%d%%)"
+#~ msgid "Cannot open message"
+#~ msgstr "Sõnumit ei saa avada"
+#~ msgid "Failed on message %d"
+#~ msgstr "Tõrge sõnumi %d juures"
+#~ msgid "Syncing folder"
+#~ msgstr "Kausta sünkroniseerimine"
+#~ msgid "Getting message %d of %d"
+#~ msgstr "Tõmban %d. sõnumit %dst"
+#~ msgid "Failed at message %d of %d"
+#~ msgstr "Tõrge sõnumi %d juures (kokku sõnumeid: %d)"
+#~ msgid "Failed to retrieve message"
+#~ msgstr "Tõrge sõnumi vastuvõtmisel"
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
+#~ msgid "Error executing filter search: %s: %s"
+#~ msgstr "Viga filterotsingu täitmisel: %s: %s"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Toetamata operatsioon: lisa sõnum: %s"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
+#~ msgid "Unsupported operation: search by uids: for %s"
+#~ msgstr "Toetamata operatsioon: otsing UID järgi: %s"
+#~ msgid "Moving messages"
+#~ msgstr "Sõnumite liigutamine"
+#~ msgid "Copying messages"
+#~ msgstr "Sõnumite kopeerimine"
+#~ msgid "Learning junk"
+#~ msgstr "Rämpsposti tundmaõppimine"
+#~ msgid "Learning non-junk"
+#~ msgstr "Mitte-rämpsposti tundmaõppimine"
+#~ msgid "Filtering new message(s)"
+#~ msgstr "Uute sõnumite filtreerimine"
+#~ msgid ""
+#~ "Cannot parse search expression: %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
+#~ "%s"
+#~ msgid ""
+#~ "Error executing search expression: %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Viga otsinguavaldise täitmisel: %s:\n"
+#~ "%s"
+#~ msgid "(match-all) requires a single bool result"
+#~ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
+#~ msgid "Performing query on unknown header: %s"
+#~ msgstr "Täidetakse päringut tundmatul päisel: %s"
+#~ msgid ""
+#~ "Unexpected GnuPG status message encountered:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ootamatu GnuPG olekusõnum:\n"
+#~ "\n"
+#~ "%s"
+#~ msgid "Failed to parse gpg userid hint."
+#~ msgstr "Tõrge gpg kasutaja ID vihje analüüsimisel."
+#~ msgid "Failed to parse gpg passphrase request."
+#~ msgstr "Tõrge gpg paroolipäringu analüüsimisel."
+#~ msgid ""
+#~ "You need a passphrase to unlock the key for\n"
+#~ "user: \"%s\""
+#~ msgstr "Sul on kasutaja \"%s\" võtme lahtilukustamiseks vaja parooli"
+#~ msgid "Failed to unlock secret key: 3 bad passphrases given."
+#~ msgstr "Tõrge salajase võtme avamisel: sisestati 3 valet parooli."
+#~ msgid "Unexpected response from GnuPG: %s"
+#~ msgstr "Ootamatu vastus GnuPG'lt: %s"
+#~ msgid "Failed to encrypt: No valid recipients specified."
+#~ msgstr "Tõrge sõnumi krüptimisel: Saajate aadressid on määramata."
+#~ msgid ""
+#~ "Failed to GPG %s: %s\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tõrge GPG töötlemisel %s: %s\n"
+#~ "\n"
+#~ "%s"
+#~ msgid "Failed to GPG %s: %s\n"
+#~ msgstr "Tõrge %s GPG töötlemisel: %s\n"
+#~ msgid "Could not generate signing data: %s"
+#~ msgstr "Signeerimisandmete genereerimine ei õnnestunud: %s"
+#~ msgid "Failed to execute gpg: %s"
+#~ msgstr "gpg käivitamine nurjus: %s"
+#~ msgid "Failed to execute gpg."
+#~ msgstr "Tõrge gpg käivitamisel."
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "See on sõnumi digitaalselt allkirjastatud osa"
+#~ msgid "Cannot verify message signature: Incorrect message format"
+#~ msgstr "Ei saa kontrollida sõnumi signatuuri: Sõnum on vigaselt vormindatud"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Ei saa kontrollida sõnumi signatuuri: ajutise faili loomine nurjus: %s"
+#~ msgid "This is a digitally encrypted message part"
+#~ msgstr "See on sõnumi digitaalselt krüptitud osa"
+#~ msgid "Failed to decrypt MIME part: protocol error"
+#~ msgstr "Tõrge MIME osa dekrüptimisel: protokolli viga"
+#~ msgid "Encrypted content"
+#~ msgstr "Krüpteeritud sisu"
+#~ msgid "Could not create lock file for %s: %s"
+#~ msgstr "Ei suuda luua lukufaili %s jaoks: %s"
+#~ msgid "Timed out trying to get lock file on %s. Try again later."
+#~ msgstr ""
+#~ "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
+#~ msgid "Failed to get lock using fcntl(2): %s"
+#~ msgstr "Tõrge fcntl(2) abil lukustamisel: %s"
+#~ msgid "Failed to get lock using flock(2): %s"
+#~ msgstr "Tõrge flock(2) abil lukustamisel: %s"
+#~ msgid "Cannot build locking helper pipe: %s"
+#~ msgstr "Ei suuda luua lukustamisabilise toru: %s"
+#~ msgid "Could not lock '%s': protocol error with lock-helper"
+#~ msgstr ""
+#~ "'%s' ei lukustamine ei õnnestunud, protokolli viga lukustamisabilises"
+#~ msgid "Could not lock '%s'"
+#~ msgstr "Ei saa lukustada '%s'"
+#~ msgid "Could not open mail file %s: %s"
+#~ msgstr "Sõnumifaili %s ei saa avada: %s"
+#~ msgid "Could not open temporary mail file %s: %s"
+#~ msgstr "Ei saa avada ajutist sõnumifaili %s: %s"
+#~ msgid "Failed to store mail in temp file %s: %s"
+#~ msgstr "Tõrge sõnumi salvestamisel ajutisse faili %s: %s"
+#~ msgid "Could not create pipe: %s"
+#~ msgstr "Soklit ei saa luua: %s"
+#~ msgid "Could not fork: %s"
+#~ msgstr "Ei saa forkida: %s"
+#~ msgid "Movemail program failed: %s"
+#~ msgstr "Tõrge Movemail programmis: %s"
+#~ msgid "(Unknown error)"
+#~ msgstr "(tundmatu viga)"
+#~ msgid "Error reading mail file: %s"
+#~ msgstr "Viga sõnumifaili lugemisel: %s"
+#~ msgid "Error writing mail temp file: %s"
+#~ msgstr "Viga ajutise sõnumifaili kirjutamisel: %s"
+#~ msgid "Error copying mail temp file: %s"
+#~ msgstr "Viga ajutise sõnumifaili kopeerimisel: %s"
+#~ msgid "parse error"
+#~ msgstr "analüüsimisviga"
+#~ msgid "cannot create thread"
+#~ msgstr "lõime ei saa luua"
+#~ msgid "Resolving: %s"
+#~ msgstr "Lahendan: %s"
+#~ msgid "Host lookup failed"
+#~ msgstr "Hostinime lahendamine nurjus"
+#~ msgid "Host lookup failed: %s: %s"
+#~ msgstr "Hostinime lahendamine nurjus: %s: %s"
+#~ msgid "Resolving address"
+#~ msgstr "Aadressi lahendamine"
+#~ msgid "Name lookup failed"
+#~ msgstr "Tõrge nime lahendamisel"
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "Tõrge nime lahendamisel: %s"
+#~ msgid "Could not load %s: Module loading not supported on this system."
+#~ msgstr "Ei saa laadida %s: süsteem ei toeta moodulite laadimist."
+#~ msgid "Could not load %s: %s"
+#~ msgstr "Ei saa laadida '%s': %s"
+#~ msgid "Could not load %s: No initialization code in module."
+#~ msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
+#~ msgid "Anonymous"
+#~ msgstr "Anonüümne"
+#~ msgid "This option will connect to the server using an anonymous login."
+#~ msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
+#~ msgid "Authentication failed."
+#~ msgstr "Autentimine nurjus."
+#~ msgid ""
+#~ "Invalid email address trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ebakorrektne e-posti aadressi jälitusinfo:\n"
+#~ "%s"
+#~ msgid ""
+#~ "Invalid trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Vigane jälitusinfo:\n"
+#~ "%s"
+#~ msgid "CRAM-MD5"
+#~ msgstr "CRAM-MD5"
+#~ 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."
+#~ msgid "DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+#~ 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."
+#~ msgid "Server challenge too long (>2048 octets)\n"
+#~ msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
+#~ msgid "Server challenge invalid\n"
+#~ msgstr "Vigane serveri kutsung\n"
+#~ msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+#~ msgstr "Serveri kutsung sisaldas vigast \"Quality of Protection\" lipikut\n"
+#~ msgid "Server response did not contain authorization data\n"
+#~ msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
+#~ msgid "Server response contained incomplete authorization data\n"
+#~ msgstr "Serveri vastus sisaldas puudulikku autoriseerimisinfot\n"
+#~ msgid "Server response does not match\n"
+#~ msgstr "Serveri vastus oli vigane\n"
+#~ msgid "GSSAPI"
+#~ msgstr "GSSAPI"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 5 authentication."
+#~ msgstr ""
+#~ "See valik loob ühenduse serverisse kasutades Kerberos 5 autentimist."
+#~ msgid "The consistency checks performed on the input_token failed."
+#~ msgstr "Tõrge input_token'i kooskõlalisuse kontrollimisel."
+#~ msgid "The consistency checks performed on the credential failed."
+#~ msgstr "Tõrge volituste kooskõlalisuse kontrollimisel."
+#~ msgid "The referenced credentials have expired."
+#~ msgstr "Osutatud volitused on aegunud."
+#~ msgid "Bad authentication response from server."
+#~ msgstr "Serverilt saadi vigane autentimise vastus."
+#~ msgid "Unsupported security layer."
+#~ msgstr "Toetamata turvakiht."
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kerberose piletit ei saa hankida:\n"
+#~ "%s"
+#~ msgid "Login"
+#~ msgstr "Kasutajanimi"
+#~ msgid "This option will connect to the server using a simple password."
+#~ msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
+#~ msgid "Unknown authentication state."
+#~ msgstr "Teadmata autentimisseisund"
+#~ msgid "NTLM / SPA"
+#~ msgstr "NTLM / SPA"
+#~ msgid ""
+#~ "This option will connect to a Windows-based server using NTLM / Secure "
+#~ "Password Authentication."
+#~ msgstr ""
+#~ "See valik loob ühenduse Windowsil baseeruvasse serverisse kasutades "
+#~ "NTLM / Secure Password Authentication autentimist."
+#~ msgid "POP before SMTP"
+#~ msgstr "POP enne SMTPd"
+#~ msgid "This option will authorise a POP connection before attempting SMTP"
+#~ msgstr "See valik lubab POP ühenduse enne SMTP ühenduse üritamist"
+#~ msgid "POP Source URI"
+#~ msgstr "POP allika URI"
+#~ msgid "Regular expression compilation failed: %s: %s"
+#~ msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
+#~ msgid "URL '%s' needs a username component"
+#~ msgstr "URL '%s' vajab kasutajanime osa"
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s' vajab hosti osa"
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s' vajab kataloogitee osa"
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ei suuda luua kataloogi %s:\n"
+#~ "%s"
+#~ msgid "Cannot find certificate for '%s'"
+#~ msgstr "Ei leia sertifikaato '%s' jaoks"
+#~ msgid "Cannot create CMS message"
+#~ msgstr "CMS sõnumit ei saa luua"
+#~ msgid "Cannot create CMS signed data"
+#~ msgstr "CMS sõnumi signeeritud andmeid ei saa luua"
+#~ msgid "Cannot attach CMS signed data"
+#~ msgstr "CMS signeeritud andmeid ei saa manustada"
+#~ msgid "Cannot attach CMS data"
+#~ msgstr "CMS andmeid ei saa manustada"
+#~ msgid "Cannot create CMS Signer information"
+#~ msgstr "CMS Signeerija teavet ei saa luua"
+#~ msgid "Cannot find certificate chain"
+#~ msgstr "Sertifikaadiahelat ei leitud"
+#~ msgid "Cannot add CMS Signing time"
+#~ msgstr "CMS Signeerimise aega ei saa lisada"
+#~ msgid "Encryption certificate for '%s' does not exist"
+#~ msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas"
+#~ msgid "Cannot add SMIMEEncKeyPrefs attribute"
+#~ msgstr "Attribuuti SMIMEEncKeyPrefs ei saa lisada"
+#~ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+#~ msgstr "Attribuuti MS SMIMEEncKeyPrefs ei saa lisada"
+#~ msgid "Cannot add encryption certificate"
+#~ msgstr "Krüptimissertifikaati ei saa lisada"
+#~ msgid "Cannot add CMS Signer information"
+#~ msgstr "CMS Signeerija teavet ei saa lisada"
+#~ msgid "Failed to add data to CMS encoder"
+#~ msgstr "Tõrge andmete lisamisel CMS kodeerijasse"
+#~ msgid "Failed to encode data"
+#~ msgstr "Tõrge andmete kodeerimisel"
+#~ msgid "Unverified"
+#~ msgstr "Määramata"
+#~ msgid "Good signature"
+#~ msgstr "Hea allkiri"
+#~ msgid "Bad signature"
+#~ msgstr "Halb allkiri"
+#~ msgid "Signing certificate not found"
+#~ msgstr "Allkirjastamissertifikaati ei leitud"
+#~ msgid "Signing certificate not trusted"
+#~ msgstr "Signeerimissertifikaat ei ole usaldusväärne"
+#~ msgid "Signature algorithm unknown"
+#~ msgstr "Tundmatu signeerimisalgoritm"
+#~ msgid "Signature algorithm unsupported"
+#~ msgstr "Toetamata signeerimisalgoritm"
+#~ msgid "Processing error"
+#~ msgstr "Vea töötlemine"
+#~ msgid "Digests missing from enveloped data"
+#~ msgstr "Andmeümbrikus puudub sõnumilühend"
+#~ msgid "Cannot calculate digests"
+#~ msgstr "Sõnumilühendeid pole võimalik arvutada"
+#~ msgid "Cannot set message digests"
+#~ msgstr "Sõnumilühendit pole võimalik määrata"
+#~ msgid "Certificate import failed"
+#~ msgstr "Tõrge sertifikaadi importimisel"
+#~ msgid "Cannot find signature digests"
+#~ msgstr "Ei leia signatuurilühendit"
+#~ msgid "Signer: %s <%s>: %s\n"
+#~ msgstr "Allkirjastaja: %s <%s>: %s\n"
+#~ msgid "Decoder failed"
+#~ msgstr "Tõrge dekodeerimisel"
+#~ msgid "Cannot find certificate for `%s'"
+#~ msgstr "Ei leia sertifikaati `%s' jaoks"
+#~ msgid "Cannot create CMS Message"
+#~ msgstr "CMS sõnumit ei saa luua"
+#~ msgid "Cannot create CMS Enveloped data"
+#~ msgstr "CMS Ümbriku andmeid ei saa luua"
+#~ msgid "Cannot attach CMS Enveloped data"
+#~ msgstr "CMS Ümbriku andmeid ei saa manustada"
+#~ msgid "Cannot attach CMS data object"
+#~ msgstr "CMS andmeobjekti ei saa manustada"
+#~ msgid "Cannot add CMS Recipient information"
+#~ msgstr "CMS Vastuvõtja teavet ei saa lisada"
+#~ msgid "Failed to add data to encoder"
+#~ msgstr "Tõrge andmete lisamisel enkooderile"
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "Tõrge dekodeerimisel, viga %d"
+#~ msgid "S/MIME Decrypt: No encrypted content found"
+#~ msgstr "S/MIME dekrüptimine: Krüptitud sisu ei leitud"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "võtmete importimine: pole veel teostatud"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "võtmete eksportimine: pole veel teostatud"
+#~ msgid "Cannot create folder `%s': folder exists"
+#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
+#~ msgid "Cannot create folder: %s: folder exists"
+#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
+#~ msgid "Cannot delete folder: %s: Invalid operation"
+#~ msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
+#~ msgid "Cannot rename folder: %s: Invalid operation"
+#~ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
+#~ msgid "Trash"
+#~ msgstr "Prügikast"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Ei saa dekrüptida sertifikaadi signatuuri"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Väljaandja avalikku võtit ei saa dekodeerida"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Sertifikaadi signatuuri tõrge"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Sertifikaadi tühistusnimekirja (CRL) tõrge"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Sertifikaat ei ole veel kehtiv"
+#~ msgid "Certificate has expired"
+#~ msgstr "Sertifikaat on aegunud"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL ei ole veel kehtiv"
+#~ msgid "CRL has expired"
+#~ msgstr "CRL on aegunud."
+#~ msgid "Error in CRL"
+#~ msgstr "Viga CRL'is"
+#~ msgid "Out of memory"
+#~ msgstr "Mälu puudujääk"
+#~ msgid "Certificate chain too long"
+#~ msgstr "Sertifitseerimisahel on liiga pikk"
+#~ msgid "Certificate Revoked"
+#~ msgstr "Sertifikaat on tühistatud"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Vigane sertifitseerimiskeskus"
+#~ msgid "Path length exceeded"
+#~ msgstr "Otsingutee pikkus ületatud"
+#~ msgid "Certificate untrusted"
+#~ msgstr "Sertifikaat ei ole usaldatav"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID mittesobivus"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Kasutusala ei sisalda sertifikaatide signeerimist"
+#~ msgid "Error in application verification"
+#~ msgstr "Viga rakenduse verifitseerimisel"
+#~ msgid ""
+#~ "Issuer:            %s\n"
+#~ "Subject:           %s\n"
+#~ "Fingerprint:       %s\n"
+#~ "Signature:         %s"
+#~ msgstr ""
+#~ "Väljastaja:            %s\n"
+#~ "Teema:           %s\n"
+#~ "Sõrmejälg:       %s\n"
+#~ "Signatuur:       %s"
+#~ msgid "GOOD"
+#~ msgstr "HEA"
+#~ msgid "BAD"
+#~ msgstr "HALB"
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Halb sertifikaat %s isikult:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Kas soovid seda siiski vastu võtta?"
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "SSL sertifikaadi kontrollimine %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Kas soovida vastu võtta?"
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Probleem sertifikaadiga: %s\n"
+#~ "Väljastaja: %s"
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Sertifikaat on aegunud: %s\n"
+#~ "Väljastaja: %s"
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Sertifikaatide tühistusnimekiri on aegunud: %s\n"
+#~ "Väljaandja: %s"
+#~ msgid "Could not parse URL `%s'"
+#~ msgstr "URL'i `%s' ei saa töödelda"
+#~ msgid "Error storing `%s': %s"
+#~ msgstr "Viga `%s' salvestamisel: %s"
+#~ msgid "No such message %s in %s"
+#~ msgstr "Sõnumit %s ei ole %s seas"
+#~ msgid "Cannot copy or move messages into a Virtual Folder"
+#~ msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
+#~ msgid "Cannot delete folder: %s: No such folder"
+#~ msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
+#~ msgid "Cannot rename folder: %s: No such folder"
+#~ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
+#~ msgid "Cannot copy messages to the Trash folder"
+#~ msgstr "Sõnumeid ei saa kopeerida Prügi kausta"
+#~ msgid "Cannot copy messages to the Junk folder"
+#~ msgstr "Sõnumeid ei saa kopeerida Rämpsu kausta"
+#~ msgid "Checking for new mail"
+#~ msgstr "Kontrollin uusi sõnumeid"
+#~ msgid "Check for new messages in all folders"
+#~ msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+#~ msgid "Apply filters to new messages in Inbox on this server"
+#~ msgstr ""
+#~ "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
+#~ "sõnumitele "
+#~ msgid "Check new messages for Junk contents"
+#~ msgstr "Kontrolli, kas uued sõnumid on rämpspost"
+#~ msgid "Only check for Junk messages in the INBOX folder"
+#~ msgstr "Rämpssõnumeid kontrollitakse ainult sisendkaustas"
+#~ msgid "Automatically synchronize account locally"
+#~ msgstr "Automaatne konto kohalik sünkroniseerimine"
+#~ msgid "Address Book and Calendar"
+#~ msgstr "Aadressiraamat ja kalender"
+#~ msgid "Use Secure Connection (SSL)"
+#~ msgstr "Turvalise ühenduse (SSL) kasutamine"
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell Groupwise"
+#~ msgid "For accessing Novell Groupwise servers"
+#~ msgstr "Novell Groupwise serveri kasutamiseks"
+#~ msgid "Password"
+#~ msgstr "Parool"
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Tõrge käsu saatmisel IMAP serverisse %s: %s"
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Ootamatu vastus IMAP serverilt %s: %s"
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Ootamatu tervitus IMAP serverilt: %s"
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Ühendus IMAP4 serverisse %s suleti ootamatult: %s"
+#~ msgid "Cannot access folder `%s': %s"
+#~ msgstr "Kaustale `%s' ei pääse ligi: %s"
+#~ msgid "Cannot expunge folder `%s': Unknown"
+#~ msgstr "Kausta `%s' ei saa tühjendada: Tundmatu"
+#~ msgid "Cannot expunge folder `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa tühjendada: Puudulik käsk"
+#~ msgid "User cancelled"
+#~ msgstr "Kasutaja tühistas"
+#~ msgid "Cannot get message %s: %s"
+#~ msgstr "Sõnumit %s ei saadud: %s"
+#~ msgid "This message is not available in offline mode."
+#~ msgstr "See sõnum ei ole autonoomses režiimis kättesaadav."
+#~ 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"
+#~ msgid "Cannot get message %s from folder `%s': Bad command"
+#~ msgstr "Ei saa võtta sõnumit %s kaustast `%s': Vigane käsk"
+#~ msgid "Cannot append messages to IMAP folders in offline mode."
+#~ msgstr "IMAP kausta ei saa autonoomses režiimis sõnumeid lisada."
+#~ msgid "Cannot append message to folder `%s': Unknown error"
+#~ msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+#~ msgid "Cannot append message to folder `%s': Bad command"
+#~ msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+#~ msgid "Cannot move messages to or from IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid liigutada."
+#~ msgid "Cannot copy messages to or from IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid kopeerida."
+#~ msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+#~ msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
+#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+#~ msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+#~ 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"
+#~ 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"
+#~ msgid "Folders"
+#~ msgstr "Kaustad"
+#~ msgid "Show only subscribed folders"
+#~ msgstr "Näita ainult tellitud kaustu"
+#~ msgid "Override server-supplied folder namespace"
+#~ msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
+#~ msgid "Namespace"
+#~ msgstr "Nimeruum"
+#~ msgid "Apply filters to new messages in INBOX on this server"
+#~ msgstr "Rakenda filtreid kõikidele sisendkausta uutele sõnumitele"
+#~ msgid "Automatically synchronize remote mail locally"
+#~ msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
+#~ msgid "IMAPv4rev1"
+#~ msgstr "IMAPv4rev1"
+#~ msgid "IMAP server %s"
+#~ msgstr "IMAP server %s"
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "Ei saa ühenduda hosti %s: %s"
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL ei ole saadaval"
+#~ msgid "Connection cancelled"
+#~ msgstr "Ühendus katkestatud"
+#~ msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#~ msgstr "Tõrge turvalisel ühendumisel IMAP serveriga %s: %s"
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "IMAP serverisse %s ei saa autentimistüüpi %s kasutades autentida"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta luua."
+#~ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+#~ msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
+#~ msgstr "Kausta nimi \"%s\" on lubamatu kuna see sisaldab \"%c\" kirjamärki"
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta kustutada."
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
+#~ msgid "Cannot rename folder `%s' to `%s': Special folder"
+#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: kaust on eritähenduslik"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta ümber nimetada."
+#~ msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Vigane kirjakasti nimi"
+#~ msgid "Cannot rename folder `%s' to `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Puudulik käsk"
+#~ msgid "Bad command"
+#~ msgstr "Puudulik käsk"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta tellida."
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "Autonoomses olekus ei saa IMAP kausta tellimisest loobuda."
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "Kausta `%s' tellimisest ei saa loobuda: Vigane kirjakasti nimi"
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "Kaustast `%s' ei saa loobuda: Puudulik käsk"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Kontrollin muudetud sõnumite olemasolu"
+#~ msgid "Fetching envelopes for new messages"
+#~ msgstr "Uute sõnumite ümbrikute vastuvõtmine"
+#~ msgid "No data"
+#~ msgstr "Andmeid pole"
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP server %s katkestas ootamatult ühenduse: %s"
+#~ msgid "Operation cancelled"
+#~ msgstr "Operatsioon katekstatud"
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "Server katkestas ootamatult: %s"
+#~ msgid ""
+#~ "Alert from IMAP server %s@%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Häire IMAP serverilt %s@%s:\n"
+#~ "%s"
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "Ootamatu vastus IMAP serverilt: %s"
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAPi käsk nurjus: %s"
+#~ msgid "Server response ended too soon."
+#~ msgstr "Serveri vastus lõppes liiga vara."
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP serveri vastus ei sisalda %s teavet"
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "Ootamatu OK vastus IMAP serverilt: %s"
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "Kataloogi %s ei saa luua: %s"
+#~ msgid "Could not load summary for %s"
+#~ msgstr "%s kokkuvõtet ei saa laadida"
+#~ msgid "Folder was destroyed and recreated on server."
+#~ msgstr "Kaust hävitati ja taasloodi serveris."
+#~ msgid "Unable to retrieve message: %s"
+#~ msgstr "Sõnumite ei saa vastu võtta: %s"
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "Sõnumit %s ei saadud: \n"
+#~ "  %s"
+#~ msgid "No such message"
+#~ msgstr "Sõnumit ei leitud"
+#~ msgid "This message is not currently available"
+#~ msgstr "See sõnum ei ole hetkel kättesaadav"
+#~ msgid "Fetching summary information for new messages"
+#~ msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "Ei leia sõnumi sisu FETCH vastuses."
+#~ msgid "Could not open cache directory: %s"
+#~ msgstr "Puhvermälu kausta ei saa avada: %s "
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "Tõrge sõnumi %s puhverdamisel: %s"
+#~ msgid "Failed to cache %s: %s"
+#~ msgstr "Tõrge %s puhverdamisel: %s"
+#~ msgid "C_heck for new messages in all folders"
+#~ msgstr "_Kontrolli uusi sõnumeid kõikides kaustades"
+#~ msgid "Connection to Server"
+#~ msgstr "Ühendus serveriga"
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "_Proxyserveriga ühendumiseks kasutatakse kohandatud käsku"
+#~ msgid "_Show only subscribed folders"
+#~ msgstr "_Näita ainult tellitud kaustu"
+#~ msgid "O_verride server-supplied folder namespace"
+#~ msgstr "Kasuta serveri pakutava kaustade _nimeruumi asemel enda oma"
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "Rakenda _filtreid kõikidele Sisendkasti uutele sõnumitele"
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Uute sõnumite _rämpspostikontroll"
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Rämpssõnumeid kontrollitakse _ainult sisendkaustas"
+#~ msgid "Automatically synchroni_ze remote mail locally"
+#~ msgstr "Automaatne kohaliku posti _sünkroniseerimine kaugpostiga"
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+#~ msgid "For reading and storing mail on IMAP servers."
+#~ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
+#~ msgid "STARTTLS not supported"
+#~ msgstr "STARTTLS ei ole toetatud."
+#~ msgid "IMAP server %s does not support requested authentication type %s"
+#~ msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
+#~ msgid "No support for authentication type %s"
+#~ msgstr "Autentimistüübi %s tugi puudub"
+#~ msgid "%sPlease enter the IMAP password for %s@%s"
+#~ msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
+#~ msgid "You didn't enter a password."
+#~ msgstr "Sa ei sisestanud parooli."
+#~ msgid ""
+#~ "Unable to authenticate to IMAP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ei saa autentimida IMAP serverisse.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgid "No such folder %s"
+#~ msgstr "Kausta %s ei leitud"
+#~ msgid "Cannot create folder `%s': folder exists."
+#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas."
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "Tundmatu ülemkaust: %s"
+#~ msgid "Message storage"
+#~ msgstr "Sõnumite säilitamine"
+#~ msgid "IMAP+"
+#~ msgstr "IMAP+"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! 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"
+#~ "\n"
+#~ " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "Ei saa ühenduda %s (port: %s): %s"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "Ei saa luua ühendust POP serveriga %s"
+#~ msgid "Index message body data"
+#~ msgstr "Sõnumite sisu indekseerimine"
+#~ msgid "~%s (%s)"
+#~ msgstr "~%s (%s)"
+#~ msgid "mailbox:%s (%s)"
+#~ msgstr "postkast:%s (%s)"
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+#~ msgid "Use the `.folders' folder summary file (exmh)"
+#~ msgstr "Kasuta `.folders' kaustakokkuvõttefaili (exmh)"
+#~ msgid "MH-format mail directories"
+#~ msgstr "MH-vormingus postikataloogid"
+#~ msgid "For storing local mail in MH-like mail directories."
+#~ msgstr "Kohalikku posti hoitakse MH vorminguga kataloogides."
+#~ msgid "Local delivery"
+#~ msgstr "Kohalik postijagaja"
+#~ 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 ja "
+#~ "tõstetakse Evolution'i poolt hallatavatesse kaustadesse."
+#~ msgid "Apply filters to new messages in INBOX"
+#~ msgstr "Rakenda filtreid Sisendkasti uutele sõnumitele"
+#~ msgid "Maildir-format mail directories"
+#~ msgstr "\"Maildir\" vormingus postikataloog"
+#~ msgid "For storing local mail in maildir directories."
+#~ msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
+#~ msgid "Store status headers in Elm/Pine/Mutt format"
+#~ msgstr "Salvesta olekupäised Elm/Pine/Mutt vormingus"
+#~ msgid "Standard Unix mbox spool or directory"
+#~ msgstr "Standardne Unix'i \"mbox\" puhverfail või -kataloog"
+#~ 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 salvestatakse standardsetes välistes \"mbox"
+#~ "\" vorminguga puhverfailides. Võib kasutada ka juhul, kui soovitakse "
+#~ "kasutada programmide Elm, Pine või Mutt postikaustu."
+#~ msgid "Store root %s is not an absolute path"
+#~ msgstr "Hoidla juurikas %s ei ole absoluutne tee"
+#~ msgid "Cannot get folder: %s: %s"
+#~ msgstr "Kausta `%s' ei saadud: %s"
+#~ msgid "Local mail file %s"
+#~ msgstr "Kohaliku posti fail %s"
+#~ msgid "Could not rename folder %s to %s: %s"
+#~ msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
+#~ msgid "Could not rename '%s': %s"
+#~ msgstr "Ei saa ümber nimetada '%s': %s"
+#~ msgid "Could not delete folder summary file `%s': %s"
+#~ msgstr "Kausta kokkuvõttefaili `%s' ei saa kustutada: %s"
+#~ msgid "Could not delete folder index file `%s': %s"
+#~ msgstr "Kausta indeksfaili `%s' ei saa kustutada: %s"
+#~ msgid "Could not delete folder meta file `%s': %s"
+#~ msgstr "Kausta üldistusfaili `%s' ei saa kustutada: %s"
+#~ msgid "Could not save summary: %s: %s"
+#~ msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr "Sõnumite ei saa lisada kokkuvõttesse: tundmatu põhjus"
+#~ msgid "Maildir append message cancelled"
+#~ msgstr "Sõnumi lisamine maildir kausta katkestati"
+#~ msgid "Cannot append message to maildir folder: %s: %s"
+#~ msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
+#~ msgid ""
+#~ "Cannot get message: %s from folder %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "Ei saa kätte sõnumit %s kaustast %s\n"
+#~ "  %s"
+#~ msgid "Invalid message contents"
+#~ msgstr "Vigane sõnumi sisu"
+#~ msgid "Cannot get folder `%s': %s"
+#~ msgstr "Kausta `%s' ei saadud: %s"
+#~ msgid "Cannot get folder `%s': folder does not exist."
+#~ msgstr "Kausta `%s' ei saadud: seda ei ole olemas."
+#~ msgid "Cannot create folder `%s': %s"
+#~ msgstr "Kausta `%s' ei saa luua: %s"
+#~ msgid "Cannot get folder `%s': not a maildir directory."
+#~ msgstr "Kausta `%s' ei saadud: see ei ole maildir kataloog."
+#~ msgid "Could not delete folder `%s': %s"
+#~ msgstr "Kausta `%s' ei saa kustutada: %s"
+#~ msgid "not a maildir directory"
+#~ msgstr "ei ole maildir vormingus kataloog"
+#~ msgid "Could not scan folder `%s': %s"
+#~ msgstr "Kausta `%s' ei saa läbi vaadata: %s"
+#~ msgid "Cannot open maildir directory path: %s: %s"
+#~ msgstr "Maildir kataloogi ei saa avada %s: %s"
+#~ msgid "Checking folder consistency"
+#~ msgstr "Kausta kooskõlalisuse kontrollimine"
+#~ msgid "Checking for new messages"
+#~ msgstr "Uute sõnumite kontrollimine"
+#~ msgid "Storing folder"
+#~ msgstr "Kausta salvestamine"
+#~ msgid "Cannot create folder lock on %s: %s"
+#~ msgstr "%s lukustamine nurjus: %s"
+#~ msgid "Cannot open mailbox: %s: %s\n"
+#~ msgstr "Ei saa avada kirjakasti: %s: %s\n"
+#~ msgid "Mail append cancelled"
+#~ msgstr "E-posti lisamine katkestati"
+#~ msgid "Cannot append message to mbox file: %s: %s"
+#~ msgstr "Sõnumit ei saa mbox faili lisada: %s: %s"
+#~ msgid "The folder appears to be irrecoverably corrupted."
+#~ msgstr "Kaust tundub olevad parandamatult rikutud."
+#~ msgid "Message construction failed."
+#~ msgstr "Tõrge sõnumi kokkupanekul."
+#~ msgid "Cannot create a folder by this name."
+#~ msgstr "Sellise nimega kausta ei saa luua."
+#~ msgid "Cannot get folder `%s': not a regular file."
+#~ msgstr "Kausta `%s' ei saadud: see ei ole tavaline fail."
+#~ msgid ""
+#~ "Could not delete folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kataloogi `%s' ei saa kustutada:\n"
+#~ "%s"
+#~ msgid "`%s' is not a regular file."
+#~ msgstr "`%s' ei ole tavaline fail."
+#~ msgid "Folder `%s' is not empty. Not deleted."
+#~ msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
+#~ msgid "Cannot create directory `%s': %s."
+#~ msgstr "Kataloogi %s ei saa luua: %s"
+#~ msgid "Cannot create folder: %s: %s"
+#~ msgstr "Kausta %s ei saa luua: %s"
+#~ msgid "Folder already exists"
+#~ msgstr "Kaust on juba olemas"
+#~ msgid "The new folder name is illegal."
+#~ msgstr "Uus kaustanimi on lubamatu!"
+#~ msgid "Could not rename `%s': `%s': %s"
+#~ msgstr "Ei saa ümber nimetada '%s': `%s': %s"
+#~ msgid "Could not rename '%s' to %s: %s"
+#~ msgstr "Kausta '%s' ei saa ümber nimetada '%s'-ks: %s"
+#~ msgid "Could not open folder: %s: %s"
+#~ msgstr "Kausta ei saa avada: %s: %s"
+#~ msgid "Fatal mail parser error near position %ld in folder %s"
+#~ msgstr "Pöördumatu postianalüüsija viga positsioonil %ld kaustad %s"
+#~ msgid "Cannot check folder: %s: %s"
+#~ msgstr "Kausta ei saa kontrollida: %s: %s"
+#~ msgid "Could not open file: %s: %s"
+#~ msgstr "Faili %s ei saa avada: %s"
+#~ msgid "Cannot open temporary mailbox: %s"
+#~ msgstr "Ajutist kirjakasti ei saa avada: %s"
+#~ msgid "Could not close source folder %s: %s"
+#~ msgstr "Lähtekausta ei saa sulgeda %s: %s"
+#~ msgid "Could not close temp folder: %s"
+#~ msgstr "Ajutist kausta ei saa sulgeda: %s"
+#~ msgid "Could not rename folder: %s"
+#~ msgstr "Kataloogi ei saa ümber nimetada: %s"
+#~ msgid "Summary and folder mismatch, even after a sync"
+#~ msgstr "Kokkuvõtte ja kausta ebavõrdlus, isegi peale sünkroniseerimist"
+#~ msgid "Unknown error: %s"
+#~ msgstr "Tundmatu viga: %s"
+#~ msgid "Could not store folder: %s"
+#~ msgstr "Kausta ei saa salvestada: %s"
+#~ msgid "Error writing to temp mailbox: %s"
+#~ msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
+#~ msgid "Writing to tmp mailbox failed: %s: %s"
+#~ msgstr "Tõrge ajutisse kirjakasti kirjutamisel: %s: %s"
+#~ msgid "MH append message cancelled"
+#~ msgstr "MH sõnumi lisamine katkestatud"
+#~ msgid "Cannot append message to mh folder: %s: %s"
+#~ msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
+#~ msgid "Could not create folder `%s': %s"
+#~ msgstr "Kataloogi `%s' ei saa luua: %s"
+#~ msgid "Cannot get folder `%s': not a directory."
+#~ msgstr "Kausta `%s' ei saa lugeda: see ei ole kataloog."
+#~ msgid "Cannot open MH directory path: %s: %s"
+#~ msgstr "Ei saa avada MH kataloogi: %s: %s"
+#~ msgid "Spool `%s' cannot be opened: %s"
+#~ msgstr "Puhvrit `%s' ei saa avada: %s"
+#~ msgid "Spool `%s' is not a regular file or directory"
+#~ msgstr "Puhver '%s' pole tavaline fail ega kataloog"
+#~ msgid "Folder `%s/%s' does not exist."
+#~ msgstr "Kausta `%s/%s' ei ole olemas."
+#~ msgid ""
+#~ "Could not open folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kausta `%s' ei saa avada:\n"
+#~ "%s"
+#~ msgid "Folder `%s' does not exist."
+#~ msgstr "Kataloogi '%s' pole olema."
+#~ msgid ""
+#~ "Could not create folder `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kausta `%s' ei saa luua:\n"
+#~ "%s"
+#~ msgid "`%s' is not a mailbox file."
+#~ msgstr "`%s' ei ole kirjakasti fail."
+#~ msgid "Spool mail file %s"
+#~ msgstr "E-posti puhverfail %s"
+#~ msgid "Spool folders cannot be renamed"
+#~ msgstr "Puhverkaustu ei saa ümber nimetada"
+#~ msgid "Spool folders cannot be deleted"
+#~ msgstr "Puhverkaustu ei saa kustutada"
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Palun sisesta NNTP parool %s@%s jaoks"
+#~ msgid "Server rejected username"
+#~ msgstr "Server keeldus kasutajanime vastu võtmast"
+#~ msgid "Failed to send username to server"
+#~ msgstr "Tõrge kasutajanime saatmisel serverile"
+#~ msgid "Server rejected username/password"
+#~ msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Sisemine viga: uid on vigases vormingus: %s"
+#~ msgid "Posting failed: %s"
+#~ msgstr "Postitamine nurjus: %s"
+#~ msgid "You cannot copy messages from a NNTP folder!"
+#~ msgstr "Sõnumeid ei saa NNTP kaustast kopeerida!"
+#~ msgid "Could not get group list from server."
+#~ msgstr "Gruppide nimekirja serverist ei saadud."
+#~ msgid ""
+#~ "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#~ msgstr "Kaustanimede näitamine lühendatult (comp.os.linux asemel c.o.linux)"
+#~ msgid "In the subscription dialog, show relative folder names"
+#~ msgstr "Kaustade tellimisdialoogis näita kaustade suhtnimesid"
+#~ msgid "USENET news"
+#~ msgstr "USENETi uudised"
+#~ msgid "This is a provider for reading from and posting toUSENET newsgroups."
+#~ msgstr ""
+#~ "Selle kaudu on võimalik lugeda ja kirjutada USENET'i uudistegruppidesse."
+#~ msgid "NNTP server %s returned error code %d: %s"
+#~ msgstr "NNTP server %s tagastas veakoodi %d: %s"
+#~ msgid "USENET News via %s"
+#~ msgstr "USENETi uudised üle %s"
+#~ msgid ""
+#~ "Error retrieving newsgroups:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Viga uudistegrupi vastuvõtmisel:\n"
+#~ "\n"
+#~ "%s"
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "Nõutakse autentimist kuid kasutajanime ei ole sisestatud"
+#~ msgid "Cannot authenticate to server: %s"
+#~ msgstr "Ei saa autentida serverisse: %s"
+#~ msgid "NNTP Command failed: %s"
+#~ msgstr "Tõrge NNTP käsu täitmisel: %s"
+#~ msgid "Not connected."
+#~ msgstr "Ühendamata."
+#~ msgid "No such folder: %s"
+#~ msgstr "Kausta ei leitud: %s"
+#~ msgid "%s: Scanning new messages"
+#~ msgstr "%s: uute kirjade skannimine"
+#~ msgid "Operation failed: %s"
+#~ msgstr "Tõrge toimingu läbiviimisel: %s"
+#~ msgid "Retrieving POP summary"
+#~ msgstr "Võtan vastu POP kokkuvõtet"
+#~ msgid "Cannot get POP summary: %s"
+#~ msgstr "Ei saa võtta POP kokkuvõtet: %s"
+#~ msgid "Expunging deleted messages"
+#~ msgstr "Hävitan kustutatud sõnumid"
+#~ msgid "No message with uid %s"
+#~ msgstr "Sõnumit uid'iga %s ei ole"
+#~ msgid "Retrieving POP message %d"
+#~ msgstr "POP sõnumi %d vastuvõtt"
+#~ msgid "Delete after %s day(s)"
+#~ msgstr "Kustuta %s päeva möödumisel"
+#~ msgid "Disable support for all POP3 extensions"
+#~ msgstr "Keela kõigi POP3 laienduste toetus"
+#~ msgid "POP"
+#~ msgstr "POP"
+#~ msgid "For connecting to and downloading mail from POP servers."
+#~ msgstr "E-posti laetakse alla POP serverist"
+#~ 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."
+#~ msgid "Failed to read a valid greeting from POP server %s"
+#~ msgstr "POP serverilt %s ei saa korrektset tervitust"
+#~ msgid "Failed to connect to POP server %s in secure mode: %s"
+#~ msgstr "Tõrge turvalisel ühendumisel POP serverisse %s: %s"
+#~ msgid "STLS not supported"
+#~ msgstr "STLS ei ole toetatud."
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "Ei saa luua ühendust POP serveriga %s"
+#~ msgid "SASL `%s' Login failed for POP server %s: %s"
+#~ msgstr "Tõrge SASL `%s' sisselogimisel POP serverisse %s: %s"
+#~ msgid "Cannot login to POP server %s: SASL Protocol error"
+#~ msgstr "POP serverisse %s ei saa sisse logida: SASL protokolli viga"
+#~ msgid "Failed to authenticate on POP server %s: %s"
+#~ msgstr "Tõrge autentimisel POP serverisse %s: %s"
+#~ msgid "%sPlease enter the POP password for %s on host %s"
+#~ msgstr "%sPalun sisesta kasutaja %s POP parool hostile %s"
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending password: %s"
+#~ msgstr ""
+#~ "Ei saa luua ühendust POP serveriga %s.\n"
+#~ "Viga parooli saatmisel: %s"
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending username: %s"
+#~ msgstr ""
+#~ "Ei saa luua ühendust POP serveriga %s.\n"
+#~ "Viga kasutajanime saatmisel: %s"
+#~ msgid "No such folder `%s'."
+#~ msgstr "Kausta '%s' ei ole olemas."
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+#~ 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."
+#~ msgid "Could not parse recipient list"
+#~ msgstr "Saajate nimekirja ei õnnestu analüüsida"
+#~ msgid "Could not create pipe to sendmail: %s: mail not sent"
+#~ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
+#~ msgid "Could not fork sendmail: %s: mail not sent"
+#~ msgstr ""
+#~ "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+#~ msgid "Could not send message: %s"
+#~ msgstr "Sõnumit ei saa saata: %s"
+#~ msgid "sendmail exited with signal %s: mail not sent."
+#~ msgstr "sendmail lõpetas töö signaaliga %s: sõnumit ei saadetud."
+#~ msgid "Could not execute %s: mail not sent."
+#~ msgstr "Ei saa käivitada %s: sõnumit ei saadetud."
+#~ msgid "sendmail exited with status %d: mail not sent."
+#~ msgstr "sendmail lõpetas töö staatusega %d: sõnumit ei saadetud."
+#~ msgid "sendmail"
+#~ msgstr "sendmail"
+#~ msgid "Mail delivery via the sendmail program"
+#~ msgstr "Sõnumite trantsport sendmail programmiga"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+#~ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#~ msgstr ""
+#~ "E-posti saatmiseks SMTP protokolli kaudu välisele mailhub serverile."
+#~ msgid "Syntax error, command unrecognized"
+#~ msgstr "Viga süntaksis, tundmatu käsk"
+#~ msgid "Syntax error in parameters or arguments"
+#~ msgstr "Süntaksi viga parameetrites või argumentides"
+#~ msgid "Command not implemented"
+#~ msgstr "Käsku ei ole veel teostatud"
+#~ msgid "Command parameter not implemented"
+#~ msgstr "Käsu parameeter ei ole veel teostatud"
+#~ msgid "Help message"
+#~ msgstr "Abiteade"
+#~ msgid "Service ready"
+#~ msgstr "Teenus on valmis"
+#~ msgid "Service closing transmission channel"
+#~ msgstr "Teenus sulgeb ülekandekanali"
+#~ msgid "Service not available, closing transmission channel"
+#~ msgstr "Teenus ei ole saadaval, sulgen ülekandekanali"
+#~ msgid "Requested mail action okay, completed"
+#~ msgstr "Nõutud kirjategevus korras, lõpetatud"
+#~ msgid "Requested mail action not taken: mailbox unavailable"
+#~ msgstr "Nõutud kirjategevust ei tehtud: kirjakast ei ole saadaval"
+#~ msgid "Requested action not taken: mailbox unavailable"
+#~ msgstr "Nõutud tegevust ei tehtud: kirjakast ei ole saadaval"
+#~ msgid "Requested action aborted: error in processing"
+#~ msgstr "Nõutud tegevus nurjatud: viga töötlemisel"
+#~ msgid "Requested action not taken: mailbox name not allowed"
+#~ msgstr "Nõutud toimingut ei teostatud: kirjakasti nimi ei ole lubatud"
+#~ msgid "Transaction failed"
+#~ msgstr "Tõrge transaktsiooni läbiviimisel"
+#~ msgid "Authentication mechanism is too weak"
+#~ msgstr "Autentimismehhanism on liiga nõrk"
+#~ msgid "Temporary authentication failure"
+#~ msgstr "Ajutine autentimise tõrge"
+#~ msgid "Authentication required"
+#~ msgstr "Autentimine on vajalik"
+#~ msgid "Welcome response error"
+#~ msgstr "Tervitusvastuse viga"
+#~ msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#~ msgstr "Tõrge turvalisel ühendumisel SMTP serverisse %s: %s"
+#~ msgid "STARTTLS command failed: %s"
+#~ msgstr "Tõrge STARTTLS käsu täitmisel: %s"
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Tõrge STARTTLS käsu täitmisel"
+#~ msgid "SMTP server %s does not support requested authentication type %s."
+#~ msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s."
+#~ msgid "%sPlease enter the SMTP password for %s on host %s"
+#~ msgstr "%sPalun sisesta kasutaja %s SMTP parool hostile %s"
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Autentimine SMPT serverisse nurjus.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgid "SMTP server %s"
+#~ msgstr "SMTP server %s"
+#~ msgid "SMTP mail delivery via %s"
+#~ msgstr "SMTP posti saatmine %s kaudu"
+#~ msgid "Cannot send message: service not connected."
+#~ msgstr "Sõnumit ei saa saata: teenusega ei saa ühendust"
+#~ msgid "Cannot send message: sender address not valid."
+#~ msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
+#~ msgid "Sending message"
+#~ msgstr "Sõnumi saatmine"
+#~ msgid "Cannot send message: no recipients defined."
+#~ msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
+#~ msgid "Cannot send message: one or more invalid recipients"
+#~ msgstr "Sõnumit ei saa saata: saajate aadress või aadressid on vigased."
+#~ msgid "SMTP Greeting"
+#~ msgstr "SMTP Tervitus"
+#~ msgid "HELO command failed: %s"
+#~ msgstr "Tõrge HELO käsu täitmisel: %s"
+#~ msgid "HELO command failed"
+#~ msgstr "Tõrge HELO käsu täitmisel"
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP autentimine"
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "Viga SASL autentimisobjekti loomise."
+#~ msgid "AUTH command failed: %s"
+#~ msgstr "Tõrge AUTH käsu täitmisel: %s"
+#~ msgid "AUTH command failed"
+#~ msgstr "Tõrge AUTH käsu täitmisel"
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Halb autentimisvastus serverilt.\n"
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Tõrge MAIL FROM käsu täitmisel: %s: sõnum jäi saatmata"
+#~ msgid "MAIL FROM command failed"
+#~ msgstr "Tõrge MAIL FROM käsu täitmisel"
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Tõrge RCPT TO käsu täitmisel: %s: sõnum jäi saatmata"
+#~ msgid "RCPT TO <%s> failed"
+#~ msgstr "Tõrge RCPT TO <%s> käsu täitmisel"
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Tõrge DATA käsu täitmisel: %s: sõnum jäi saatmata"
+#~ msgid "DATA command failed"
+#~ msgstr "Tõrge DATA käsu täitmisel"
+#~ msgid "RSET command failed: %s"
+#~ msgstr "Tõrge RSET käsu täitmisel: %s"
+#~ msgid "RSET command failed"
+#~ msgstr "Tõrge RSET käsu täitmisel"
+#~ msgid "QUIT command failed: %s"
+#~ msgstr "Tõrge QUIT käsu täitmisel: %s"
+#~ msgid "QUIT command failed"
+#~ msgstr "Tõrge QUIT käsu täitmisel"
+#~ msgid "VFolders"
+#~ msgstr "VKaustad"
+#~ msgid "Virtual _Folders"
+#~ msgstr "Virtuaalsed _kaustad"
+#~ 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 ""
+#~ "E-posti konto seadistamine on peaaegu lõppenud. Sinu poolt määratud "
+#~ "identiteet, siseneva ja väljuva posti serverid koondatakse ühe nime alla "
+#~ "ja sellest saab Evolution'i postikonto. Palun anna sellele kontole nimi. "
+#~ "Nime kasutatakse hiljem ainult kuvamise eesmärgil."
+#~ msgid "_Enable"
+#~ msgstr "_Lubamine"
+#~ msgid "Body does not contain"
+#~ msgstr "Sisu ei sisalda"
+#~ msgid "Body or subject contains"
+#~ msgstr "Sisu või teema sisaldab"
+#~ msgid "Subject does not contain"
+#~ msgstr "Teema ei sisalda"
+#~ msgid "Meetings"
+#~ msgstr "Koosolekud"
+#~ msgid "Contact list _owner"
+#~ msgstr "Võta postilendi _omanikuga ühendust"
+#~ msgid "Get list _archive"
+#~ msgstr "Hangi postilendi _arhiiv"
+#~ msgid "Get list _usage information"
+#~ msgstr "_Hangi postilendi kasutusteave"
+#~ msgid "Mailing _List"
+#~ msgstr "_Postiloend"
+#~ msgid "_Post message to list"
+#~ msgstr "_Sõnumi saatmine loendisse"
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Telli postiloend"
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "_Lõpeta postiloendi tellimus"
+#~ msgid "Ad_d"
+#~ msgstr "_Lisa"
+#~ msgid "Delet_e"
+#~ msgstr "_Kustuta"
+#~ msgid "Edi_t"
+#~ msgstr "_Redigeermine"
+#~ msgid "Button style"
+#~ msgstr "Nuppude stiil"
+#~ msgid "Create _Virtual Folder From Message"
+#~ msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
+
author	Priit Laes <plaes@cvs.gnome.org>	2005-02-13 00:08:25 +0800
committer	Priit Laes <plaes@src.gnome.org>	2005-02-13 00:08:25 +0800
commit	b2b84e8e04aea849d4b2192c63d8143f77ec7e84 (patch)
tree	5370e9f5ea45f53ba110cde7a81365b2aead3bb9
parent	383a33137aff2f683177cb30ce9c3ce205fa4c9e (diff)
download	gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.gz gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.bz2 gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.lz gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.xz gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.tar.zst gsoc2013-evolution-b2b84e8e04aea849d4b2192c63d8143f77ec7e84.zip