Translation updated.

2004-03-27  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated.

svn path=/trunk/; revision=25207

1 files changed, 2937 insertions, 2895 deletions

diff --git a/po/et.po b/po/et.po
index 89b48c4c12..5ede24e6fe 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.4.5\n"
 "POT-Creation-Date: 2004-02-27 03:15+0100\n"
-"PO-Revision-Date: 2004-03-27 13:22+0300\n"
+"PO-Revision-Date: 2004-03-27 16:12+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Vaikimisi sünkroniseerimisaadress:"
 #: addressbook/conduit/address-conduit.c:1151
 #, fuzzy
 msgid "Could not load addressbook"
-msgstr "Aadressiraamatu avamine ebaõnnestus"
+msgstr "Ei suuda laadida faili: %s"
 
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
@@ -39,23 +39,22 @@ msgstr ""
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 #, fuzzy
 msgid "Autocompletion"
-msgstr "Lõpetamise kuupäev"
+msgstr "Automaatne lõpetamine"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
 msgid "Certificates"
-msgstr "_Sertifikaadi ID:"
+msgstr "<b>Sertifikaadid</b>"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 #, fuzzy
 msgid "Configure autocomple here"
-msgstr "Loob või muudab mailikontosid ja muid sätteid"
+msgstr "_Salvesta värv siia"
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#. Create the contacts group
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
@@ -71,20 +70,24 @@ msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
 msgid "Evolution Addressbook address viewer"
-msgstr ""
+msgstr "Factory for the Addressbook's address displayer"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
 msgid "Evolution Addressbook card viewer"
-msgstr ""
+msgstr "Control that displays an Evolution addressbook minicard."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
 msgid "Evolution Addressbook component"
-msgstr ""
+msgstr "Evolution component for handling contacts."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
 msgid "Evolution Addressbook folder viewer"
-msgstr ""
+msgstr "Control that displays an Evolution addressbook minicard."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 #, fuzzy
@@ -99,20 +102,19 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:269
+#: addressbook/gui/component/addressbook-component.c:308
 #: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
 msgid "New Address Book"
-msgstr "Aadressiraamat"
+msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: calendar/gui/calendar-component.c:362
+#: addressbook/gui/component/addressbook-component.c:309
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: calendar/gui/calendar-component.c:374
 #: calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11
 #: mail/em-account-prefs.c:236
@@ -124,70 +126,70 @@ msgstr "Aadressiraamat"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-component.c:271
-#: calendar/gui/calendar-component.c:363
+#: addressbook/gui/component/addressbook-component.c:310
+#: calendar/gui/calendar-component.c:375
 #: calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: addressbook/gui/component/addressbook-component.c:342
+#: addressbook/gui/component/addressbook-component.c:554
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:343
+#: addressbook/gui/component/addressbook-component.c:555
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:344
+#: addressbook/gui/component/addressbook-component.c:556
 msgid "Create a new contact"
 msgstr "Loo uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:349
+#: addressbook/gui/component/addressbook-component.c:561
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:350
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:351
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Create a new contact list"
 msgstr "Loo uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-config.c:398
+#: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: addressbook/gui/component/addressbook-config.c:450
+#: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:774
+#: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1185
+#: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1207
+#: addressbook/gui/component/addressbook-config.c:1220
+#, fuzzy
 msgid "Error retrieving schema information"
-msgstr ""
+msgstr "VIGA: info pole veel saadaval"
 
-#: addressbook/gui/component/addressbook-config.c:1215
+#: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:57
 #: calendar/gui/migration.c:128
 #: mail/em-migrate.c:1071
-#, fuzzy
 msgid "Migrating..."
-msgstr "Laen..."
+msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:65
 msgid ""
@@ -199,49 +201,48 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:99
 #: calendar/gui/migration.c:175
 #: mail/em-migrate.c:1112
-#, fuzzy, c-format
+#, c-format
 msgid "Migrating `%s':"
-msgstr "Kontrollin %s"
+msgstr "Siirdamine `%s':"
 
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
+#  create the local source group
+#  On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:426
 #: calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:159
-#: mail/em-folder-tree-model.c:161
-#: mail/mail-component.c:173
+#: mail/em-folder-tree-model.c:192
+#: mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
-msgstr ""
+msgstr "Selles arvutis"
 
-#. Create the default Person addressbook
-#. orange
+#  Create the default Person addressbook
+#  orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:434
 #: calendar/gui/migration.c:511
 #: filter/filter-label.c:123
 #: mail/em-migrate.c:925
 #: mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
-#, fuzzy
+#: mail/mail-config.glade.h:88
 msgid "Personal"
-msgstr "Pownal"
+msgstr "Isiklik"
 
-#. Create the LDAP source group
+#  Create the LDAP source group
 #: addressbook/gui/component/addressbook-migrate.c:425
-#, fuzzy
 msgid "On LDAP Servers"
-msgstr "LDAP server"
+msgstr "LDAP serveris"
 
 #: addressbook/gui/component/addressbook-migrate.c:553
-#, fuzzy
 msgid "LDAP Servers"
-msgstr "LDAP server"
+msgstr "LDAP serverid"
 
 #: addressbook/gui/component/addressbook-migrate.c:673
 #, fuzzy
 msgid "Autocompletion Settings"
-msgstr "Lõpetamise kuupäev"
+msgstr "Vaikimisi sätted"
 
 #: addressbook/gui/component/addressbook.c:275
 msgid ""
@@ -308,8 +309,9 @@ msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine ebaõnnestus"
 
 #: addressbook/gui/component/addressbook.c:716
+#, fuzzy
 msgid "Accessing LDAP Server anonymously"
-msgstr ""
+msgstr "Ühendan uuesti LDAP serveriga..."
 
 #: addressbook/gui/component/addressbook.c:785
 msgid "Failed to authenticate.\n"
@@ -328,7 +330,7 @@ msgstr "URI, mida kalender näitab"
 #: addressbook/gui/component/addressbook.c:1121
 #, fuzzy
 msgid "The URI that the address book will display"
-msgstr "URI, mida kalender näitab"
+msgstr "URI, mida kaustalehitseja näitab"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -353,8 +355,9 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
 msgid "  S_how Supported Bases "
-msgstr ""
+msgstr "Mitte toetatud protokoll"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -372,7 +375,7 @@ msgstr ""
 #: 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:7
+#: mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1
 #: mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -405,23 +408,20 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "Address Book Creation Assistant"
-msgstr "LDAP konfigureerimise abimees"
+msgstr "Aadressiraamatu loomise assistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "Address Book Properties"
-msgstr "Aadressiraamatu allikas"
+msgstr "Aadressiraamatu omadused"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "Address Book Sources"
-msgstr "Aadressiraamatu allikas"
+msgstr "Aadressiraamatu allikad"
 
 #: addressbook/gui/component/ldap-config.glade.h:14
 #: mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alati"
 
@@ -446,9 +446,8 @@ msgid "Distinguished _name:"
 msgstr "_Eraldusnimi:"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
 msgid "Email address:"
-msgstr "E-posti _aadress:"
+msgstr "E-posti aadress: "
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
@@ -473,13 +472,12 @@ msgstr "Üldine"
 
 #: addressbook/gui/component/ldap-config.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
-#, fuzzy
 msgid "Group:"
-msgstr "Grupp"
+msgstr "Grupp:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 #: mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -548,22 +546,19 @@ msgstr ""
 #: addressbook/gui/component/ldap-config.glade.h:51
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
-msgstr ""
+msgstr "1. samm: Kausta omadused"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
 msgid "Step 2: Server Information"
-msgstr "Samm 1: serveri info"
+msgstr "2. samm: Serveri informatsioon"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
 msgid "Step 3: Connecting to Server"
-msgstr "Samm 2: serverisse ühendumine"
+msgstr "3. samm: Serveriga ühendamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
-#, fuzzy
 msgid "Step 4: Searching the Directory"
-msgstr "Samm 3: kataloogist otsimine"
+msgstr "4. samm: Kausta otsimine"
 
 # !PARANDA! - LDAP serveri kehtivuspiirkond
 #: addressbook/gui/component/ldap-config.glade.h:55
@@ -571,8 +566,9 @@ msgid "Sub"
 msgstr "Alam"
 
 #: addressbook/gui/component/ldap-config.glade.h:56
+#, fuzzy
 msgid "Supported Search Bases"
-msgstr ""
+msgstr "Otsi faile"
 
 #: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
@@ -668,7 +664,7 @@ msgstr "E-posti aadressi kasutamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:86
 #: mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
@@ -683,8 +679,9 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
+#, fuzzy
 msgid "_Display name:"
-msgstr ""
+msgstr "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime näitamine antud formaadis\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Download limit:"
@@ -693,8 +690,8 @@ msgstr "_Allalaadimise piirang:"
 #: addressbook/gui/component/ldap-config.glade.h:91
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: filter/filter.glade.h:14
-#: mail/mail-config.glade.h:150
+#: filter/filter.glade.h:17
+#: mail/mail-config.glade.h:148
 #: ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36
 #: ui/evolution-composer-entries.xml.h:8
@@ -732,8 +729,9 @@ msgid "cards"
 msgstr "kaardid"
 
 #: addressbook/gui/component/ldap-config.glade.h:98
+#, fuzzy
 msgid "connecting-tab"
-msgstr ""
+msgstr "Uus s_akk"
 
 #: addressbook/gui/component/ldap-config.glade.h:99
 msgid "general-tab"
@@ -761,7 +759,7 @@ msgstr "Eemalda"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:221
 #, fuzzy
 msgid "View Contact List"
-msgstr "Uus kontaktide nimekiri"
+msgstr "Kontaktiloendi redaktor"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:221
 #, fuzzy
@@ -801,39 +799,34 @@ msgid "Select Contacts from Address Book"
 msgstr "Kontaktide valimine aadressiraamatust"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "<b>Contacts</b>"
-msgstr "<b>Algus:</b> "
+msgstr "<b>Kontaktid</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 #, fuzzy
 msgid "<b>Show Contacts</b>"
-msgstr "Näita kontakte"
+msgstr "Teised kontaktid"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
 msgid "Address _Book:"
-msgstr "Aadress _2:"
+msgstr "_Aadressiraamat:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#, fuzzy
 msgid "C_ategory:"
 msgstr "Kate_gooria:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
 msgid "_Find"
-msgstr "Otsing"
+msgstr "_Otsi"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#, fuzzy
 msgid " B_usiness:"
-msgstr "Äri"
+msgstr " Ä_ri:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "A_ddress..."
-msgstr "_Aadress..."
+msgstr "_Aadress"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "A_ssistant's name:"
@@ -855,7 +848,7 @@ msgstr "_Sünnipäev:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
 msgid "Blog address:"
-msgstr "E-posti _aadress:"
+msgstr "Kodune aadress"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
@@ -868,7 +861,7 @@ msgstr "Koostöö"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:2065
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -894,7 +887,7 @@ msgstr "_Hõivatuse URL:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "File a_s:"
-msgstr "Fai_l kui:"
+msgstr "_Fail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Full _Name..."
@@ -918,11 +911,11 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Instant Messaging"
-msgstr "Eelmisele sõnumile"
+msgstr "Kohene õigekirja kontroll"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "New phone type"
-msgstr "Uus telefoni tüüp"
+msgstr "Uus telefonitüüp"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "No_tes:"
@@ -937,9 +930,8 @@ msgid "P_rofession:"
 msgstr "_Eriala:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
 msgid "Primary _email:"
-msgstr "Peamine e-post"
+msgstr "Peamine _e-post:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "S_pouse:"
@@ -954,37 +946,34 @@ msgid "_Add"
 msgstr "_Lisa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
 msgid "_Business:"
-msgstr "Äri"
+msgstr "_Äri:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "_Categories..."
-msgstr "Kate_gooriad..."
+msgstr "_Kategooriad:"
 
-#. FIXME: need to disable for undeletable folders
+#  FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:649
-#: calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-view.c:1332
+#: calendar/gui/e-calendar-view.c:1363
 #: calendar/gui/e-calendar-table.c:1057
 #: calendar/gui/e-calendar-table.c:1075
-#: mail/em-folder-tree.c:2200
-#: mail/em-folder-view.c:775
+#: mail/em-folder-tree.c:2504
+#: mail/em-folder-view.c:765
 #: ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35
 #: ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:112
 #: ui/evolution-tasks.xml.h:19
 msgid "_Delete"
 msgstr "_Kustuta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
 msgid "_Home:"
-msgstr "Kodu"
+msgstr "_Kodu:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Job title:"
@@ -993,16 +982,15 @@ msgstr "Ameti_nimetus:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Manager's name:"
-msgstr "_Juhataja nimi:"
+msgstr "Juhi nimi"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
 msgid "_Mobile:"
-msgstr "Mobiil"
+msgstr "_Mobiil:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Nickname:"
-msgstr "_Hüüdnimi"
+msgstr "_Hüüdnimi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Office:"
@@ -1015,36 +1003,36 @@ msgstr "_Avaliku kalendri URL:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
 msgid "_This is the mailing address"
-msgstr "See on e-_postiaadress"
+msgstr "See partitsioon pole kasutatav"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#, fuzzy
 msgid "_Video Conferencing URL:"
-msgstr ""
+msgstr "Blogi alus-URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Web page address:"
-msgstr "Kodulehe aad_ress"
+msgstr "Kodulehe aad_ress:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:250
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
-msgstr "Luba"
+msgstr "Redigeeritav"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
@@ -1176,7 +1164,7 @@ msgstr "Briti India ookeani territoorium"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr "Brunei Darussalam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
@@ -1208,7 +1196,7 @@ msgstr "Roheneemesaared"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
-msgstr "Kaimanisaared"
+msgstr "Kaimani saared"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
@@ -1232,7 +1220,7 @@ msgstr "Jõulusaar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
-msgstr "Kookossaared"
+msgstr "Kookossaared (Keelingi saared)"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
@@ -1247,9 +1235,8 @@ msgid "Congo"
 msgstr "Kongo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:186
-#, fuzzy
 msgid "Congo, The Democratic Republic Of The"
-msgstr "Korea Demokraatlik Rahvavabariik"
+msgstr "Congo, Demokraatlik vabariik"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
@@ -1404,9 +1391,8 @@ msgid "Guatemala"
 msgstr "Guatemala"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:225
-#, fuzzy
 msgid "Guernsey"
-msgstr "Saksamaa"
+msgstr "Guernsey"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
@@ -1457,14 +1443,12 @@ msgid "Indonesia"
 msgstr "Indoneesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#, fuzzy
 msgid "Iran"
-msgstr "Iirimaa"
+msgstr "Iraan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#, fuzzy
 msgid "Iraq"
-msgstr "Iisrael"
+msgstr "Iraak"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
@@ -1511,9 +1495,8 @@ msgid "Kiribati"
 msgstr "Kiribati"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#, fuzzy
 msgid "Korea, Democratic People's Republic Of"
-msgstr "Korea Vabariik"
+msgstr "Korea Demokraatlik Rahvavabariik"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
@@ -1548,9 +1531,8 @@ msgid "Liberia"
 msgstr "Libeeria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:260
-#, fuzzy
 msgid "Libya"
-msgstr "Libeeria"
+msgstr "Liibüa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
@@ -1565,9 +1547,8 @@ msgid "Luxembourg"
 msgstr "Luksemburg"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#, fuzzy
 msgid "Macao"
-msgstr "Macau"
+msgstr "Macao"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
@@ -1815,7 +1796,7 @@ msgstr "Senegal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbia ja Montenegro"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
@@ -1894,9 +1875,8 @@ msgid "Switzerland"
 msgstr "Šveits"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#, fuzzy
 msgid "Syria"
-msgstr "Suriname"
+msgstr "Süüria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
@@ -1908,16 +1888,15 @@ msgstr "Tadžikistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tansaania, Ühendatud Vabariik"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Tai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#, fuzzy
 msgid "Timor-Leste"
-msgstr "Trieste"
+msgstr "Timor-Leste"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
@@ -2026,19 +2005,18 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
 msgid "AOL Instant Messenger"
-msgstr "Eelmisele sõnumile"
+msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
-msgstr "Nimetu kontaktide nimekiri"
+msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
@@ -2047,113 +2025,110 @@ msgstr "Yahoo Messenger"
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
-msgstr "_Saada sõnum"
+msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2920
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:741
 #, fuzzy
 msgid "Service"
-msgstr "Allikas"
+msgstr "Teenus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:764
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
-#, fuzzy
 msgid "Location"
-msgstr "Asukoht:"
+msgstr "Asukoht"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
 msgid "Username"
-msgstr "Suriname"
+msgstr "Kasutajanimi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2585
+#: addressbook/gui/contact-editor/e-contact-editor.c:2881
 msgid "Home"
 msgstr "Kodu"
 
-#. red
+#  red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 #: filter/filter-label.c:122
 #: mail/em-migrate.c:924
 #: mail/mail-config.c:64
-#: mail/mail-config.glade.h:137
-#, fuzzy
+#: mail/mail-config.glade.h:135
 msgid "Work"
-msgstr "Töönädal"
+msgstr "Töö"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2586
+#: addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:215
 #, fuzzy
 msgid "Source Book"
-msgstr "Allikas"
+msgstr "Aadressraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#, fuzzy
 msgid "Target Book"
-msgstr ""
+msgstr "Aadressraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
+#: addressbook/gui/contact-editor/e-contact-editor.c:229
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:236
 #, fuzzy
 msgid "Is New Contact"
-msgstr "Uus kontakt"
+msgstr "Loo uus kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:243
 #, fuzzy
 msgid "Writable Fields"
-msgstr "Merril Field"
+msgstr "Sertifikaadi _väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Changed"
-msgstr "Tšaad"
+msgstr "Parool on nüüd muudetud\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "Account Name"
 msgstr "Konto nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Save Contact as VCard"
 msgstr "Kontakti salvestamine VKaardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 "Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
+"kustutada need kontaktid?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
+#: addressbook/gui/contact-editor/e-contact-editor.c:1774
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2161,35 +2136,33 @@ msgstr ""
 "Kas sa tõesti soovid\n"
 "kustutada seda kontakti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Business"
 msgstr "Äri"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2918
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
-msgstr "Yoro"
+msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2921
 msgid "GroupWise"
-msgstr "Grupp"
+msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3208
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat väljale: `%s'"
@@ -2199,26 +2172,22 @@ msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:283
-#, fuzzy
 msgid "_Edit Full"
-msgstr "Redigeeri kõike"
+msgstr "Täisnime r_edigeerimine"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#, fuzzy
 msgid "_Full Name:"
-msgstr "Ees- ja perekonna_nimi"
+msgstr "_Täisnimi:"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:307
-#, fuzzy
 msgid "E-_mail:"
-msgstr "E-post:"
+msgstr "E-Post:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-#, fuzzy
 msgid "Ci_ty:"
 msgstr "_Linn:"
 
@@ -2229,7 +2198,7 @@ msgstr "_Riik:"
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
 #, fuzzy
 msgid "Full Address"
-msgstr "Vigane aadress"
+msgstr "Kodune aadress"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
@@ -2318,23 +2287,22 @@ msgstr "_Tiitel:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
-msgid "Account name:"
-msgstr "Konto nimi"
+msgid "Add IM Account"
+msgstr "Lisa konto"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
-#, fuzzy
-msgid "Add IM Account"
-msgstr "Kontod"
+msgid "_Account name:"
+msgstr "_Konto nimi:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
 #, fuzzy
-msgid "IM Service:"
-msgstr "Teenus on valmis"
+msgid "_IM Service:"
+msgstr "Teenuse kontrollimine"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-msgid "Location:"
-msgstr "Asukoht:"
+#, fuzzy
+msgid "_Location:"
+msgstr "_Asukoht:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
@@ -2347,7 +2315,7 @@ msgstr "_Peida aadressid sellesse listi kirja saatmisel"
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
 msgid "_List name:"
-msgstr "Loendi _nimi:"
+msgstr "Blogi nimi:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
@@ -2364,14 +2332,13 @@ msgstr "kontaktide-nimekirja-redaktor"
 #: addressbook/gui/widgets/e-addressbook-view.c:209
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
-#, fuzzy
 msgid "Book"
-msgstr "Bodo"
+msgstr "Raamat"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
 #, fuzzy
 msgid "Is New List"
-msgstr "Uus loend"
+msgstr "Uus kontaktide nimekiri"
 
 #. Construct the app
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
@@ -2426,37 +2393,34 @@ msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
 msgid "No contacts"
-msgstr "Näita kontakte"
+msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
 msgid "1 contact"
-msgstr "Kontakt"
+msgstr "1 kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%d contacts"
-msgstr "Kontaktid"
+msgstr "%d kontakti"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:305
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:223
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
-#, fuzzy
 msgid "Query"
-msgstr "Quimper"
+msgstr "Päring"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:448
+#, fuzzy
 msgid "Error getting book view"
-msgstr ""
+msgstr "viga informatsiooni saamisel '%s' jaoks: %s"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-#, fuzzy
 msgid "Model"
-msgstr "Molde"
+msgstr "Mudel"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
 msgid "Error modifying card"
@@ -2471,13 +2435,13 @@ msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:162
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:48
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
@@ -2488,95 +2452,89 @@ msgstr "Edasijõudnutele..."
 #: addressbook/gui/widgets/e-addressbook-view.c:230
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:340
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
+#: addressbook/gui/widgets/e-addressbook-view.c:497
 #: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-#: addressbook/gui/widgets/e-addressbook-view.c:2015
+#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:2019
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1044
+#: addressbook/gui/widgets/e-addressbook-view.c:1048
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1049
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1048
+#: addressbook/gui/widgets/e-addressbook-view.c:1052
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1053
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1051
+#: addressbook/gui/widgets/e-addressbook-view.c:1055
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1056
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1054
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-#: calendar/gui/print.c:2481
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16
 #: ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
 msgid "Copy to Address Book..."
-msgstr "Aadressiraamat..."
+msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 msgid "Move to Address Book..."
-msgstr "Aadressiraamat..."
+msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 #: ui/evolution-addressbook.xml.h:6
 #: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: calendar/gui/calendar-component.c:360
-#: calendar/gui/dialogs/copy-source-dialog.c:159
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: calendar/gui/calendar-component.c:372
 #: calendar/gui/tasks-component.c:363
 #: ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9
@@ -2584,18 +2542,18 @@ msgstr "Lõika"
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1076
 #: ui/evolution-addressbook.xml.h:13
 #: ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: calendar/gui/e-calendar-view.c:1299
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1266
+#: addressbook/gui/widgets/e-addressbook-view.c:1270
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2604,8 +2562,8 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1606
-#: calendar/gui/cal-search-bar.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:1610
+#: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
@@ -2648,7 +2606,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:441
+#: addressbook/gui/widgets/eab-contact-display.c:522
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
@@ -2672,9 +2630,8 @@ msgid "File As"
 msgstr "Kataloogi kui"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
 msgid "Given Name"
-msgstr "Perekonnanimi"
+msgstr "Antud nimi"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
@@ -2691,18 +2648,18 @@ msgstr "Kodune telefon 2"
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 #, fuzzy
 msgid "ISDN Phone"
-msgstr "Telefon"
+msgstr "Assistendi telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-#, fuzzy
 msgid "Journal"
-msgstr "Jordaania"
+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:336
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
@@ -2711,7 +2668,7 @@ msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
 msgstr "Märkus"
 
@@ -2720,7 +2677,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisatsioon"
 
@@ -2746,7 +2703,7 @@ 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:256
+#: calendar/gui/e-meeting-list-view.c:347
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -2756,9 +2713,8 @@ msgid "Spouse"
 msgstr "Abikaasa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-#, fuzzy
 msgid "TTYTDD"
-msgstr "TTY/TDD"
+msgstr "TTYTDD"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
@@ -2769,54 +2725,50 @@ msgid "Title"
 msgstr "Tiitel"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#, fuzzy
 msgid "Unit"
-msgstr "Unst"
+msgstr "Ühik"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Koduleht"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
-msgstr "Laius:"
+msgstr "Laius"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
-msgstr "Kõrgus:"
+msgstr "Kõrgus"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
+#, fuzzy
 msgid "Has Focus"
-msgstr ""
+msgstr "Fookuse käitumine"
 
 #: addressbook/gui/widgets/e-minicard-label.c:136
-#, fuzzy
 msgid "Field"
-msgstr "Fairfield"
+msgstr "Väli"
 
 #: addressbook/gui/widgets/e-minicard-label.c:143
-#, fuzzy
 msgid "Field Name"
-msgstr "Perekonnanimi"
+msgstr "Välja nimi"
 
 #: addressbook/gui/widgets/e-minicard-label.c:150
 #, fuzzy
 msgid "Text Model"
-msgstr "Teksti _suurus"
+msgstr "CPU mudel"
 
 #: addressbook/gui/widgets/e-minicard-label.c:157
+#, fuzzy
 msgid "Max field name length"
-msgstr ""
+msgstr "Maks. erinevus lausepikkustes:"
 
 #: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
 msgid "Column Width"
-msgstr "Columbia"
+msgstr "Veeru laius"
 
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
@@ -2847,90 +2799,89 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:168
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
-msgstr "Valitud:"
+msgstr "Valitud"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 #, fuzzy
 msgid "Has Cursor"
-msgstr "Ülesannete sorteerimine"
+msgstr "Vilkuv kursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
+#, fuzzy
 msgid "(map)"
-msgstr ""
+msgstr "Jooksev klahvitabel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
-msgstr "Amapala"
+msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:417
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 #, fuzzy
 msgid "List Members"
-msgstr "Liikmed"
+msgstr "Predikaatide loend:\n"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
 #, fuzzy
 msgid "E-mail"
-msgstr "E-post"
+msgstr "Post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:238
-#, fuzzy
-msgid "work"
-msgstr "Töönädal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
 #, fuzzy
 msgid "Position"
-msgstr "Eesti"
+msgstr "Asukoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "Groupwise"
-msgstr "Grupp"
+msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
+#, fuzzy
 msgid "Video Conferencing"
-msgstr ""
+msgstr "AVI video"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
-msgstr "Fax tööl"
+msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
+#: addressbook/gui/widgets/eab-contact-display.c:319
 #, fuzzy
-msgid "personal"
-msgstr "Pownal"
+msgid "work"
+msgstr "Töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:476
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "Blog"
-msgstr "Bologna"
+msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:437
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr "isiklik"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 #, fuzzy
 msgid "Job Title"
 msgstr "Ameti_nimetus:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:468
+#: addressbook/gui/widgets/eab-contact-display.c:549
 #, fuzzy
 msgid "Home page"
-msgstr "Kodune faks"
+msgstr "Alguskülg"
 
 #: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Success"
@@ -2956,12 +2907,12 @@ msgstr "Juurdepääs keelatud"
 #: addressbook/gui/widgets/eab-gui-util.c:50
 #, fuzzy
 msgid "Contact not found"
-msgstr "Kaarti ei leitud"
+msgstr "Ei leia faili"
 
 #: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Contact ID already exists"
-msgstr "Kaardi ID on juba olemas"
+msgstr "Fail %s on juba olemas. Kas kirjutada üle?"
 
 #: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Protocol not supported"
@@ -2973,7 +2924,7 @@ msgstr "Mitte toetatud protokoll"
 #: calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467
 #: calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2349
 #: camel/camel-service.c:728
 #: camel/camel-service.c:766
 #: camel/camel-service.c:850
@@ -2992,13 +2943,14 @@ msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #: addressbook/gui/widgets/eab-gui-util.c:56
+#, fuzzy
 msgid "TLS not Available"
-msgstr ""
+msgstr "Teenus ei ole kättesaadav"
 
 #: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Address Book does not exist"
-msgstr "Aadressiraamatut ei leitud"
+msgstr "Partitsiooni %d pole veel olemas!\n"
 
 #: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Other error"
@@ -3011,7 +2963,7 @@ msgstr "Kas soovid muudatused salvestada?"
 #: addressbook/gui/widgets/eab-gui-util.c:87
 #, fuzzy
 msgid "_Discard"
-msgstr "Dinard"
+msgstr "Keeldu"
 
 #: addressbook/gui/widgets/eab-gui-util.c:106
 msgid "Error adding list"
@@ -3021,7 +2973,7 @@ msgstr "Viga listi lisamisel"
 #: addressbook/gui/widgets/eab-gui-util.c:524
 #, fuzzy
 msgid "Error adding contact"
-msgstr "Viga kaardi lisamisel"
+msgstr "Viga listi lisamisel"
 
 #: addressbook/gui/widgets/eab-gui-util.c:115
 msgid "Error modifying list"
@@ -3040,7 +2992,7 @@ msgstr "Viga listi eemaldamisel"
 #: addressbook/gui/widgets/eab-gui-util.c:482
 #, fuzzy
 msgid "Error removing contact"
-msgstr "Viga kaardi eemaldamisel"
+msgstr "Viga listi eemaldamisel"
 
 #: addressbook/gui/widgets/eab-gui-util.c:207
 #, c-format
@@ -3079,27 +3031,30 @@ msgstr "nimekiri"
 #: addressbook/gui/widgets/eab-gui-util.c:578
 #, fuzzy
 msgid "Move contact to"
-msgstr "Liiguta kaart"
+msgstr "Tõsta prügikasti"
 
 #: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Copy contact to"
-msgstr "Kopeeri kaart..."
+msgstr ""
+"\n"
+"Koopia aadressile:\n"
+"  "
 
 #: addressbook/gui/widgets/eab-gui-util.c:583
 #, fuzzy
 msgid "Move contacts to"
-msgstr "Liiguta kaardid"
+msgstr "Lisa kontaktide hulka"
 
 #: addressbook/gui/widgets/eab-gui-util.c:585
 #, fuzzy
 msgid "Copy contacts to"
-msgstr "Kopeeri kaardid"
+msgstr "Lisa kontaktide hulka"
 
 #: addressbook/gui/widgets/eab-gui-util.c:588
 #, fuzzy
 msgid "Select target addressbook."
-msgstr "Kontaktide valimine aadressiraamatust"
+msgstr "Salvesta aadressiraamatusse"
 
 #: addressbook/gui/widgets/eab-gui-util.c:767
 msgid "Multiple VCards"
@@ -3140,7 +3095,7 @@ msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 #: addressbook/gui/widgets/eab-popup-control.c:888
 #, fuzzy
 msgid "Querying Address Book..."
-msgstr "Aadressiraamatust pärimine..."
+msgstr "GNOME aadressraamat"
 
 #: addressbook/gui/widgets/eab-popup-control.c:972
 msgid "Edit Contact Info"
@@ -3153,12 +3108,12 @@ msgstr "Ühenda e-posti aadressid"
 #: addressbook/gui/widgets/eab-vcard-control.c:140
 #, fuzzy, c-format
 msgid "and %d other contacts."
-msgstr "ja %d teist kaarti."
+msgstr "Lisa kontaktide hulka"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:142
 #, fuzzy
 msgid "and one other contact."
-msgstr "ja üks teine kaart."
+msgstr "Kõik _inimesed ja üks ressurss"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:225
 #: addressbook/gui/widgets/eab-vcard-control.c:275
@@ -3169,7 +3124,7 @@ msgstr "Näita kõiki _päiseid"
 #: addressbook/gui/widgets/eab-vcard-control.c:229
 #, fuzzy
 msgid "Show Compact VCard"
-msgstr "Kontakti salvestamine VKaardina"
+msgstr "Salvesta VKaardina"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:280
 msgid "Save in addressbook"
@@ -3184,8 +3139,9 @@ msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
 #: addressbook/gui/widgets/test-reflow.c:119
+#, fuzzy
 msgid "Reflow Test"
-msgstr ""
+msgstr "Html test"
 
 #: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
@@ -3198,12 +3154,14 @@ msgid "This should test the reflow canvas item"
 msgstr ""
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
 msgid "Evolution LDIF importer"
-msgstr ""
+msgstr "Evolutioni VKaardi importija"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#, fuzzy
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+msgstr "Andmevahetusformaadi (DIF) moodul"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
@@ -3225,13 +3183,13 @@ msgstr "Trüki ümbrik"
 #: addressbook/printing/e-contact-print.c:1009
 #, fuzzy
 msgid "Print contacts"
-msgstr "Trüki kaardid"
+msgstr "Teised kontaktid"
 
 #: addressbook/printing/e-contact-print.c:1075
 #: addressbook/printing/e-contact-print.c:1102
 #, fuzzy
 msgid "Print contact"
-msgstr "Otsi kontakti"
+msgstr "Kontaktisiku nimi"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3322,7 +3280,7 @@ msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Häälestus"
 
@@ -3414,7 +3372,7 @@ msgstr ""
 #: addressbook/printing/test-print.c:52
 #, fuzzy
 msgid "Contact Print Test"
-msgstr "Kontaktide _nimekiri"
+msgstr "Bonobo testrakend"
 
 #: addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
@@ -3425,16 +3383,17 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:58
 #, fuzzy
 msgid "Can not open file"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Ei saa faili avada!"
 
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:78
 #, fuzzy
 msgid "Can not load URI"
-msgstr "Kaarti ei leitud"
+msgstr "Ei suuda laadida faili: %s"
 
 #: addressbook/tools/evolution-addressbook-export.c:56
+#, fuzzy
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "Palun määra väljundfaili asukoht ja nimi:"
 
 #: addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
@@ -3443,7 +3402,7 @@ msgstr "VÄLJUNDFAIL"
 #: addressbook/tools/evolution-addressbook-export.c:58
 #, fuzzy
 msgid "List local addressbook folders"
-msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
+msgstr "koos kõigi kohalike kalatoogidega"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
@@ -3452,11 +3411,12 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "[vcard|csv]"
-msgstr "kaardid"
+msgstr "VKaart %s kohta"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
+#, fuzzy
 msgid "Export in asynchronous mode "
-msgstr ""
+msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "The number of cards in one output file in asychronous mode,default size 100."
@@ -3485,7 +3445,7 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export.c:153
 #, fuzzy
 msgid "Impossible internal error."
-msgstr "Sisemine viga"
+msgstr "Sisemine tüübiviga"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3496,17 +3456,17 @@ msgid "Input File"
 msgstr "Sisendfail"
 
 #: addressbook/tools/evolution-addressbook-import.c:82
+#, fuzzy
 msgid "No filename provided."
-msgstr ""
+msgstr "Puudub salvestatava faili nimi"
 
 #: addressbook/util/eab-destination.c:677
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
 #: calendar/common/authentication.c:37
-#: calendar/gui/itip-utils.c:1156
+#: calendar/gui/itip-utils.c:1158
 #: smime/gui/component.c:44
-#, fuzzy
 msgid "Enter password"
 msgstr "Sisesta parool"
 
@@ -3543,9 +3503,8 @@ msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
 msgid "Calendars"
-msgstr "Kalender"
+msgstr "Kalendrid"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
@@ -3554,11 +3513,12 @@ msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
 msgid "Evolution Calendar and Tasks"
-msgstr "Kalender ja ülesanded"
+msgstr "Kalendri ja ülesannete sätted"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
 msgid "Evolution Calendar configuration control"
-msgstr ""
+msgstr "Evolution'i intelligentne kalendriimportija"
 
 # !PARANDA!
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
@@ -3568,33 +3528,32 @@ msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
 # !PARANDA!
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Calendar viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Evolution'i kalendrivaa"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i uudiseredaktor"
+msgstr "Evolution'i intelligentne kalendriimportija"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Tasks viewer"
-msgstr "Evolution'i uudiseredaktor"
+msgstr "Gnumericu töövihikute vaataja"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 #, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgstr "Evolution'i intelligentne kalendriimportija"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 #, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgstr "Evolution component for handling contacts."
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1101
-#: calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1138
+#: calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
@@ -3643,25 +3602,24 @@ msgstr "Edasilükkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kokkusaamist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
 msgid "Open"
-msgstr "A_va"
+msgstr "Ava"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
 msgstr "Tühista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3670,12 +3628,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3687,7 +3645,7 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1115
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -3703,7 +3661,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
@@ -3748,8 +3706,9 @@ msgid "Days that are work days"
 msgstr "Päevad, mis on tööpäevad"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#, fuzzy
 msgid "Default timezone for meetings"
-msgstr ""
+msgstr "On vaikimisi elemndi \"%s\" jaoks."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Hour the workday ends on"
@@ -3784,16 +3743,18 @@ msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#, fuzzy
 msgid "Position of the horizontal pane"
-msgstr ""
+msgstr "Sulge külgpaan"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#, fuzzy
 msgid "Position of the vertical pane"
-msgstr ""
+msgstr "Sulge külgpaan"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
@@ -3818,8 +3779,9 @@ msgid "The view showing when the calendar starts"
 msgstr "Trükitava kalendri eelvaatlemine"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#, fuzzy
 msgid "Time last alarm ran"
-msgstr ""
+msgstr "Viimasest kellaaja korrigeermisest on möödunud %d sekundit\n"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
@@ -3828,7 +3790,7 @@ msgstr ""
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 #, fuzzy
 msgid "Units of default reminder"
-msgstr "Loo uusi sündmusi koos vaikimisi _meeldetuletajaga"
+msgstr "Näita _meeldetuletust"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
@@ -3862,25 +3824,32 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:357
-#: mail/mail-ops.c:1108
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:363
+#: mail/mail-ops.c:1059
 msgid "Unmatched"
 msgstr "Puudub"
 
 #: calendar/gui/calendar-commands.c:116
-#: calendar/gui/gnome-cal.c:1603
+#: calendar/gui/gnome-cal.c:1585
+#: camel/providers/groupwise/camel-gw-listener.c:298
+#: camel/providers/groupwise/camel-gw-listener.c:322
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3899,7 +3868,7 @@ msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:362
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: filter/filter.glade.h:17
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "päeva"
 
@@ -3915,7 +3884,7 @@ msgstr "%A, %d. %B %Y"
 #. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434
 #: calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1365
+#: calendar/gui/e-day-view.c:1589
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -3942,88 +3911,82 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:301
+#: calendar/gui/calendar-component.c:313
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:358
+#: calendar/gui/calendar-component.c:370
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
-#, fuzzy
 msgid "New Calendar"
-msgstr "Uus-Kaledoonia"
+msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:603
+#: calendar/gui/calendar-component.c:843
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:604
+#: calendar/gui/calendar-component.c:844
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:605
+#: calendar/gui/calendar-component.c:845
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:610
+#: calendar/gui/calendar-component.c:850
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:611
-#, fuzzy
+#: calendar/gui/calendar-component.c:851
 msgid "M_eeting"
-msgstr "Koosolek"
+msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:612
+#: calendar/gui/calendar-component.c:852
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:617
-#, fuzzy
+#: calendar/gui/calendar-component.c:857
 msgid "New all day appointment"
-msgstr "Uus kogu päeva hõlmav kokkusaamine"
+msgstr "Uus, kogu päeva hõlmav kohtumine"
 
-#: calendar/gui/calendar-component.c:618
+#: calendar/gui/calendar-component.c:858
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:859
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:624
-#, fuzzy
+#: calendar/gui/calendar-component.c:864
 msgid "New calendar"
-msgstr "Uus-Kaledoonia"
+msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:625
-#, fuzzy
+#: calendar/gui/calendar-component.c:865
 msgid "C_alendar"
-msgstr "Kalender"
+msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:626
-#, fuzzy
+#: calendar/gui/calendar-component.c:866
 msgid "Create a new calendar"
-msgstr "Loo uus kontakt"
+msgstr "Loo uus kalender"
 
-#: calendar/gui/calendar-component.c:693
+#: calendar/gui/calendar-component.c:933
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:945
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #: calendar/gui/calendar-offline-handler.c:192
-#, c-format
+#, fuzzy, c-format
 msgid "backend_go_offline(): %s"
-msgstr ""
+msgstr "Ühendamata"
 
 #: calendar/gui/calendar-offline-handler.c:215
-#, c-format
+#, fuzzy, c-format
 msgid "backend_go_online(): %s"
-msgstr ""
+msgstr "Ühendatud"
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
@@ -4042,14 +4005,13 @@ msgid "Month View"
 msgstr "Kuu vaade"
 
 #: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
 msgid "List View"
-msgstr "Kuu vaade"
+msgstr "Loeteluvaade"
 
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
-msgstr "Viga kalendriserveriga suhtlemisel"
+msgstr "Viga xbase faili avamisel."
 
 #: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
@@ -4061,9 +4023,9 @@ msgid "Permission denied to open the calendar"
 msgstr "Juurdepääs keelatud"
 
 #: calendar/gui/comp-editor-factory.c:474
-#, c-format
+#, fuzzy, c-format
 msgid "open_client(): %s"
-msgstr ""
+msgstr "Võrk, mina olen kliendiks"
 
 #: calendar/gui/control-factory.c:140
 #, c-format
@@ -4089,7 +4051,7 @@ msgstr "Sõnumialarmi häälestus"
 #: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
-msgstr "Kirjaalarmi häälestus"
+msgstr "Helialarmi häälestus"
 
 #: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
@@ -4108,8 +4070,9 @@ msgid "Message to Display:"
 msgstr "Näidatav sõnum:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
 msgid "Message to Send"
-msgstr ""
+msgstr "Saada kontaktile sõnum"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
@@ -4126,7 +4089,7 @@ msgstr "Käivita programm:"
 #: calendar/gui/dialogs/alarm-options.glade.h:8
 #, fuzzy
 msgid "Send To:"
-msgstr "Saada"
+msgstr "Saaja"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
@@ -4134,26 +4097,28 @@ msgstr "Nende parameetritega:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 #: smime/gui/smime-ui.glade.h:47
+#, fuzzy
 msgid "dialog1"
-msgstr ""
+msgstr "dialog1"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "tundi"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutit"
 
-#: calendar/gui/dialogs/alarm-page.c:798
+#: calendar/gui/dialogs/alarm-page.c:800
+#, fuzzy
 msgid "Action/Trigger"
-msgstr ""
+msgstr "Käsk    Tähendus"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
@@ -4190,8 +4155,8 @@ msgid "Run a program"
 msgstr "Käivita programm"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
-#, fuzzy
-msgid "Send an Email"
+#: calendar/gui/e-alarm-list.c:467
+msgid "Send an email"
 msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
@@ -4229,7 +4194,7 @@ msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
 #: calendar/gui/dialogs/calendar-setup.glade.h:40
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4237,51 +4202,47 @@ msgstr "minuti(t)"
 msgid "start of appointment"
 msgstr "kokkusaamise algust"
 
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
+#  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#  has "activatable" set.
 #: calendar/gui/dialogs/cal-prefs-dialog.c:415
-#: mail/em-account-prefs.c:487
+#: mail/em-account-prefs.c:493
 #: mail/em-composer-prefs.c:712
-#: mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:876
 #, fuzzy
 msgid "Enabled"
-msgstr "Luba"
+msgstr "lubatud"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:656
 #, fuzzy
 msgid "Are you sure you want to remove this URL?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
+msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:664
 #, fuzzy
 msgid "Don't Remove"
-msgstr "Eemalda"
+msgstr "Eemalda filter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:773
 #: mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356
-#: mail/em-account-prefs.c:397
+#: mail/em-account-prefs.c:399
 #: mail/em-composer-prefs.c:679
 #: mail/em-composer-prefs.c:697
 #: mail/em-composer-prefs.c:721
-#, fuzzy
 msgid "Disable"
-msgstr "Luba"
+msgstr "Keela"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
 #: calendar/gui/dialogs/cal-prefs-dialog.c:775
 #: mail/em-account-prefs.c:315
 #: mail/em-account-prefs.c:356
-#: mail/em-account-prefs.c:399
+#: mail/em-account-prefs.c:401
 #: mail/em-composer-prefs.c:679
 #: mail/em-composer-prefs.c:697
 #: mail/em-composer-prefs.c:721
-#, fuzzy
 msgid "Enable"
 msgstr "Luba"
 
@@ -4306,7 +4267,7 @@ msgid "60 minutes"
 msgstr "60 minutit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "Alerts"
 msgstr ""
 
@@ -4331,10 +4292,10 @@ msgid "Days"
 msgstr "Päev(a)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "E_nable"
-msgstr "Luba"
+msgstr "Luba _Lülitavad Klahvid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
@@ -4446,7 +4407,7 @@ msgstr "_24 tunnine"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Add URL"
-msgstr "_Lisa"
+msgstr "Ava URL: %s"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Ask for confirmation when deleting items"
@@ -4467,14 +4428,14 @@ msgstr "Kuvamine"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Free/Busy Publishing"
-msgstr "Soov saada vaba/hõivatud infot"
+msgstr "Avaliku Vaba/Hõivatud info asukoht"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Üldine"
 
@@ -4501,7 +4462,7 @@ msgstr "_Näita kokkusaamise lõpuaegu nädala ja kuu vaadetel"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Time divisions:"
-msgstr "_Aja jaotused:"
+msgstr "Kopeeri k_ellaaeg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
@@ -4526,9 +4487,9 @@ msgid "The source location '%s' is not well-formed."
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
 #: calendar/gui/dialogs/calendar-setup.c:179
-#, c-format
+#, fuzzy, c-format
 msgid "The source location '%s' is not a webcal source."
-msgstr ""
+msgstr "Asukoha URL ei ole absoluutne."
 
 #: calendar/gui/dialogs/calendar-setup.c:216
 #, c-format
@@ -4543,12 +4504,12 @@ msgstr ""
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
 #, fuzzy
 msgid "Calendar Creation Assistant"
-msgstr "LDAP konfigureerimise abimees"
+msgstr "Evolution'i kontoassistent"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
 #, fuzzy
 msgid "Calendar Properties"
-msgstr "iKalendri viga"
+msgstr "Käivitaja häälestus"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid ""
@@ -4568,12 +4529,12 @@ msgstr ""
 #: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
-msgstr "Ülesannete nimekiri"
+msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:15
 #, fuzzy
 msgid "Remote"
-msgstr "Eemalda"
+msgstr "Kau_g: "
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:18
 msgid "Specifying a display name and group is the first step in setting up a calendar."
@@ -4590,12 +4551,12 @@ msgstr ""
 #: calendar/gui/dialogs/calendar-setup.glade.h:22
 #, fuzzy
 msgid "Task List Creation Assistant"
-msgstr "LDAP konfigureerimise abimees"
+msgstr "GNOME _teguminimekirjas"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:23
 #, fuzzy
 msgid "Task List Properties"
-msgstr "Ülesannete nimekiri"
+msgstr "Muuda ülesande omadusi..."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:24
 #, fuzzy
@@ -4638,12 +4599,12 @@ msgstr ""
 #: calendar/gui/dialogs/calendar-setup.glade.h:38
 #, fuzzy
 msgid "_Refresh Interval:"
-msgstr "_Värskenda nimekiri"
+msgstr "Pin_gi intervall (sekundit):"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:39
 #, fuzzy
 msgid "_Source URL:"
-msgstr "Allikas"
+msgstr "Ava URL: %s"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
@@ -4713,33 +4674,33 @@ msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada red
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
 #: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2259
+#: calendar/gui/print.c:2258
 msgid " to "
 msgstr " kuni "
 
 #: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2263
+#: calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Valmis "
 
 #: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2265
+#: calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Lõpetatud "
 
 #: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2270
+#: calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Tähtaeg "
 
 #: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2272
+#: calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Tähtaeg "
 
@@ -4776,7 +4737,7 @@ msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
 #: calendar/gui/dialogs/comp-editor.c:1360
-#: calendar/gui/e-cal-view.c:1083
+#: calendar/gui/e-calendar-view.c:1057
 #: calendar/gui/e-calendar-table.c:1190
 #: composer/e-msg-composer.c:1146
 msgid "Save as..."
@@ -4791,36 +4752,22 @@ msgstr ""
 #: calendar/gui/dialogs/comp-editor.c:1552
 #, fuzzy
 msgid "Unable to use current version!"
-msgstr "Katkestab käimasoleva sõnumioperatsiooni"
+msgstr "Kasuta käesolevat valikut nimede tekitamisel"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:58
 #, fuzzy
 msgid "Could not open source"
-msgstr "Ei saa uuendada objekti!"
+msgstr "%s: Ei saa järjekorda (FIFO) avada"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:66
 #, fuzzy
 msgid "Could not open destination"
-msgstr "Ei saa avada kausta '%s'"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:100
-msgid "Destination is read only"
-msgstr ""
+msgstr "%s: Ei saa järjekorda (FIFO) avada"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, fuzzy, c-format
-msgid "Select destination %s"
-msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
+#: calendar/gui/dialogs/copy-source-dialog.c:75
 #, fuzzy
-msgid "calendar"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Uus ülesanne"
+msgid "Destination is read only"
+msgstr "Sihtkoha ketas on kirjutuskaitsega."
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4929,7 +4876,7 @@ msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
 #: calendar/gui/dialogs/event-editor.c:200
-#: calendar/gui/print.c:2296
+#: calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
@@ -4954,27 +4901,36 @@ msgstr "Planeering"
 msgid "Meeting"
 msgstr "Koosolek"
 
-#: calendar/gui/dialogs/event-page.c:606
-#: calendar/gui/dialogs/task-page.c:510
-msgid "Start date is wrong"
+#: calendar/gui/dialogs/event-page.c:458
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:461
+msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:616
+#: calendar/gui/dialogs/event-page.c:615
+#: calendar/gui/dialogs/task-page.c:512
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "Lõppemise päev on vale"
+
+#: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1225
+#: calendar/gui/dialogs/event-page.c:1234
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Juurdepääs keelatud"
+msgstr "Ei saa avada faili '%s'"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
@@ -5055,37 +5011,37 @@ msgstr "_Algus:"
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:591
 #: composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448
-#: mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258
-#: mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:82
+#: mail/em-account-prefs.c:454
+#: mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1310
+#: mail/mail-account-gui.c:1838
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257
-#: widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482
-#: widgets/misc/e-dateedit.c:1597
+#: widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:645
+#: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:331
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osavõtja"
@@ -5122,14 +5078,14 @@ msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
 #: calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-meeting-list-view.c:354
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:361
 #: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
@@ -5139,7 +5095,7 @@ msgstr "Olek"
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
 msgid "Add A_ttendee"
-msgstr "Osavõtja"
+msgstr "Lisa raamid"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:9
@@ -5158,47 +5114,47 @@ msgstr "_Kutsu teisi..."
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
-msgstr "Kalendri info"
+msgstr "Kalendriseaded"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:3
 #, fuzzy
 msgid "Add New Calendar"
-msgstr "Uus-Kaledoonia"
+msgstr "Loob uue kalendri"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:4
 #, fuzzy
 msgid "Calendar Group"
-msgstr "iKalendri viga"
+msgstr "Grupeeri veerud %s"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:5
 #, fuzzy
 msgid "Calendar Location"
-msgstr "Kalendri info"
+msgstr "Käivitaja asukoht"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:6
 #, fuzzy
 msgid "Calendar Name"
-msgstr "Kalender"
+msgstr "Uue kalendri nimi:"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 #, fuzzy
 msgid "<b>Task List Options</b>"
-msgstr "Kalendri info"
+msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:3
 #, fuzzy
 msgid "Add New Task List"
-msgstr "Ülesannete nimekiri"
+msgstr "Loo uus ülesannete nimekiri"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:4
 #, fuzzy
 msgid "Task List Group"
-msgstr "Ülesannete nimekiri"
+msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:5
 #, fuzzy
 msgid "Task List Name"
-msgstr "Ülesannete nimekiri"
+msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
@@ -5213,18 +5169,19 @@ msgid "You are modifying a recurring journal entry, what would you like to modif
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
+#, fuzzy
 msgid "This Instance Only"
-msgstr ""
+msgstr "Ainult _selles töötsoonis"
 
 #: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
-msgstr "Wallis ja Futuna"
+msgstr "      --help     väljasta see abiinfo ja lõpeta töö\n"
 
 #: calendar/gui/dialogs/recur-comp.c:82
 #, fuzzy
 msgid "This and Future Instances"
-msgstr "Wallis ja Futuna"
+msgstr "      --help     väljasta see abiinfo ja lõpeta töö\n"
 
 #: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
@@ -5235,8 +5192,9 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See kokkusaamine sisaldab ressursse, mida Evolution ei saa muuta."
 
 #: calendar/gui/dialogs/recurrence-page.c:816
+#, fuzzy
 msgid "Recurrence date is invalid"
-msgstr ""
+msgstr "Otsimisvahemik ei ole sobiv."
 
 #: calendar/gui/dialogs/recurrence-page.c:927
 msgid "on"
@@ -5278,7 +5236,7 @@ msgstr "iga"
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -5311,7 +5269,7 @@ msgid "_No recurrence"
 msgstr "E_i kordu"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -5356,8 +5314,9 @@ msgstr ""
 
 #: calendar/gui/dialogs/save-comp.c:57
 #: composer/e-msg-composer.c:1563
+#, fuzzy
 msgid "_Discard Changes"
-msgstr ""
+msgstr "Salvesta muudatused"
 
 #: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
@@ -5379,9 +5338,10 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#: calendar/gui/dialogs/task-details-page.c:402
+#: calendar/gui/dialogs/task-details-page.c:404
+#, fuzzy
 msgid "Completed date is wrong"
-msgstr ""
+msgstr "Lõppemise päev on vale"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #, no-c-format
@@ -5395,7 +5355,7 @@ msgstr "(%) _valmis"
 #: calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210
 #: calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Lõpetatud"
 
@@ -5412,7 +5372,7 @@ msgstr "Kõrge"
 #: calendar/gui/e-cal-model-tasks.c:657
 #: calendar/gui/e-calendar-table.c:465
 #: calendar/gui/e-tasks.c:203
-#: calendar/gui/print.c:2344
+#: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Töös"
 
@@ -5424,7 +5384,7 @@ msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835
+#: calendar/gui/e-cal-model.c:864
 #: calendar/gui/e-calendar-table.c:392
 #: calendar/gui/e-tasks.c:229
 #: mail/message-list.c:938
@@ -5436,7 +5396,7 @@ msgstr "Keskmine"
 #: calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464
 #: calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -5450,7 +5410,8 @@ msgid "Undefined"
 msgstr "Määramata"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "_Lõpetamise päev:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5475,20 +5436,22 @@ msgstr "Peamine"
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:483
+#: calendar/gui/dialogs/task-page.c:485
+#, fuzzy
 msgid "Due date is wrong"
-msgstr ""
+msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/task-page.c:543
+#: calendar/gui/dialogs/task-page.c:545
 #: calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
+#, fuzzy
 msgid "Due date is before start date!"
-msgstr ""
+msgstr "[] on varasem kui []"
 
-#: calendar/gui/dialogs/task-page.c:808
+#: calendar/gui/dialogs/task-page.c:810
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Aadressiraamatu avamine ebaõnnestus"
+msgstr "Ei saa avada mooduli faili \"%s\"."
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
@@ -5499,7 +5462,7 @@ msgstr "_Salajane"
 #: calendar/gui/e-itip-control.glade.h:6
 #: calendar/gui/e-tasks.c:243
 #: composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5508,12 +5471,14 @@ msgid "Folder:"
 msgstr "Kaust:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "_Alguskuupäev:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr "_Tähtaeg:"
+#, fuzzy
+msgid "_Due date:"
+msgstr "Tähtaeg"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
@@ -5521,8 +5486,9 @@ msgid "Authentication Credentials for HTTP Server"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#, fuzzy
 msgid "Calendars selected for publishing"
-msgstr ""
+msgstr "Märgista valitud paketid installimiseks"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "Daily"
@@ -5545,8 +5511,9 @@ msgid "Password:"
 msgstr "Parool:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#, fuzzy
 msgid "Publishing Frequency"
-msgstr ""
+msgstr "Avaliku Vaba/Hõivatud info asukoht"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "Remember password"
@@ -5557,8 +5524,9 @@ msgid "URL:"
 msgstr "URL:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#, fuzzy
 msgid "User Publishes"
-msgstr ""
+msgstr "Kasutajanimi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 msgid "Weekly"
@@ -5609,10 +5577,6 @@ msgstr "%d sekundit"
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr "Saada sõnum"
-
 #: calendar/gui/e-alarm-list.c:477
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
@@ -5658,20 +5622,20 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: calendar/gui/e-cal-list-view.c:264
-#: calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290
+#: calendar/gui/e-cal-model.c:312
+#: calendar/gui/e-cal-model.c:319
 #: calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Avalik"
 
 #: calendar/gui/e-cal-list-view.c:265
-#: calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-model.c:321
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Isiklik"
 
 #: calendar/gui/e-cal-list-view.c:266
-#: calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-model.c:323
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Salajane"
@@ -5682,7 +5646,6 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Algab kuupäeval"
 
@@ -5693,14 +5656,14 @@ msgid "Summary"
 msgstr "Kokkuvõte"
 
 #: calendar/gui/e-cal-list-view.etspec.h:6
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:180
 msgid "color"
 msgstr "värv"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
 #, fuzzy
 msgid "component"
-msgstr "Sündmus"
+msgstr "komponent"
 
 #: calendar/gui/e-cal-model-calendar.c:163
 #: calendar/gui/e-calendar-table.c:443
@@ -5741,8 +5704,8 @@ msgstr ""
 "45.436845,125.862501"
 
 #: calendar/gui/e-cal-model-tasks.c:966
-#: calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:168
+#: calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-meeting-list-view.c:259
 #: calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169
 #: calendar/gui/e-meeting-store.c:765
@@ -5750,136 +5713,136 @@ msgid "Yes"
 msgstr "Jah"
 
 #: calendar/gui/e-cal-model-tasks.c:966
-#: calendar/gui/e-cal-model.c:841
-#: calendar/gui/e-meeting-list-view.c:169
+#: calendar/gui/e-cal-model.c:870
+#: calendar/gui/e-meeting-list-view.c:260
 #: calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-cal-model.c:299
+#: calendar/gui/e-cal-model.c:325
+#: calendar/gui/e-cal-model.c:328
 #: calendar/gui/e-itip-control.c:978
 #: calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-list-view.c:235
+#: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150
 #: calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1665
+#: camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227
-#: mail/em-utils.c:2097
+#: mail/em-utils.c:2130
 #: shell/e-component-registry.c:168
 #: widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:866
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:868
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-cal-view.c:719
+#: calendar/gui/e-calendar-view.c:677
 #: calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-cal-view.c:820
+#: calendar/gui/e-calendar-view.c:778
 #: calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-cal-view.c:1254
-#: calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-calendar-view.c:1284
+#: calendar/gui/e-calendar-view.c:1371
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-cal-view.c:1255
-#: calendar/gui/e-cal-view.c:1341
+#: calendar/gui/e-calendar-view.c:1285
+#: calendar/gui/e-calendar-view.c:1373
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-cal-view.c:1256
-#: calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-calendar-view.c:1286
+#: calendar/gui/e-calendar-view.c:1375
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-cal-view.c:1257
-#: calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-calendar-view.c:1287
+#: calendar/gui/e-calendar-view.c:1377
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-cal-view.c:1261
-#: calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351
+#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1383
 #: calendar/gui/e-calendar-table.c:1040
 #: calendar/gui/e-calendar-table.c:1082
 #: ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39
 #: ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:124
 #: ui/evolution-tasks.xml.h:23
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-cal-view.c:1265
-#: calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349
+#: calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1321
+#: calendar/gui/e-calendar-view.c:1381
 #: calendar/gui/e-calendar-table.c:1046
 #: calendar/gui/e-calendar-table.c:1080
 #: ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38
 #: ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-cal-view.c:1271
-#: calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-calendar-view.c:1301
+#: calendar/gui/e-calendar-view.c:1367
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-cal-view.c:1272
-#: calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1369
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-view.c:1306
 #: ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-cal-view.c:1282
-#: calendar/gui/e-cal-view.c:1347
+#: calendar/gui/e-calendar-view.c:1312
+#: calendar/gui/e-calendar-view.c:1379
 #: calendar/gui/e-calendar-table.c:1037
 #: calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750
+#: mail/em-folder-view.c:740
 #: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-cal-view.c:1283
-#: calendar/gui/e-cal-view.c:1353
+#: calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1385
 #: calendar/gui/e-calendar-table.c:1039
 #: calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752
+#: mail/em-folder-view.c:742
 #: mail/em-popup.c:689
 #: mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-cal-view.c:1289
-#: calendar/gui/e-cal-view.c:1329
+#: calendar/gui/e-calendar-view.c:1319
+#: calendar/gui/e-calendar-view.c:1361
 #: calendar/gui/e-calendar-table.c:1044
 #: calendar/gui/e-calendar-table.c:1073
 #: ui/evolution-addressbook.xml.h:1
@@ -5888,38 +5851,48 @@ msgstr "_Salvesta kui..."
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-cal-view.c:1290
-#: calendar/gui/e-cal-view.c:1327
+#: calendar/gui/e-calendar-view.c:1320
+#: calendar/gui/e-calendar-view.c:1359
 #: calendar/gui/e-calendar-table.c:1045
 #: calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2193
+#: mail/em-folder-tree.c:2497
 #: ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34
 #: ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-calendar-view.c:1325
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Trükitava kalendri eelvaatlemine"
+
+#: calendar/gui/e-calendar-view.c:1326
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_Tõsta prügikasti"
+
+#: calendar/gui/e-calendar-view.c:1327
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-calendar-view.c:1328
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-cal-view.c:1301
-#: calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1364
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-cal-view.c:1302
-#: calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-calendar-view.c:1334
+#: calendar/gui/e-calendar-view.c:1365
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-cal-view.c:1355
+#: calendar/gui/e-calendar-view.c:1387
 #: ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Sätted..."
@@ -6010,26 +5983,34 @@ msgstr "Alarmid"
 #: calendar/gui/e-calendar-table.etspec.h:7
 #: camel/camel-filter-driver.c:1167
 #: camel/camel-filter-driver.c:1259
-#: mail/mail-send-recv.c:580
+#: mail/mail-send-recv.c:597
 msgid "Complete"
 msgstr "Lõpetatud"
 
 #: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#, fuzzy
+msgid "Completion date"
 msgstr "Lõpetamise kuupäev"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#, fuzzy
+msgid "Due date"
 msgstr "Tähtaeg"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#, fuzzy
+msgid "Geographical position"
 msgstr "Geograafiline asukoht"
 
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Tähtsus"
 
+#: calendar/gui/e-calendar-table.etspec.h:13
+#, fuzzy
+msgid "Start date"
+msgstr "Alguskuupäev:"
+
 #: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
@@ -6072,9 +6053,9 @@ msgstr ""
 "%s"
 
 #: calendar/gui/e-day-view-time-item.c:532
-#, c-format
+#, fuzzy, c-format
 msgid "%02i minute divisions"
-msgstr ""
+msgstr "Süsteem läheb maha 1 minuti pärast\n"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -6083,7 +6064,7 @@ msgstr ""
 #. order but don't change the specifiers or add
 #. anything.
 #: calendar/gui/e-day-view-top-item.c:688
-#: calendar/gui/e-day-view.c:1348
+#: calendar/gui/e-day-view.c:1572
 #: calendar/gui/e-week-view-main-item.c:320
 #: calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -6095,21 +6076,21 @@ msgstr "%A, %d. %B"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/e-day-view-top-item.c:696
-#: calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view.c:1605
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:602
-#: calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:822
+#: calendar/gui/e-week-view.c:593
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:605
-#: calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:825
+#: calendar/gui/e-week-view.c:596
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pl"
@@ -6199,8 +6180,9 @@ msgid "<b>Completed:</b> "
 msgstr "<b>Lõpetatud:</b>"
 
 #: calendar/gui/e-itip-control.c:749
+#, fuzzy
 msgid "<b>Due:</b> "
-msgstr ""
+msgstr " (Tähtaeg "
 
 #: calendar/gui/e-itip-control.c:786
 #: calendar/gui/e-itip-control.c:839
@@ -6228,6 +6210,10 @@ msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst en
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
+#: calendar/gui/e-itip-control.c:947
+msgid "Location:"
+msgstr "Asukoht:"
+
 #. write status
 #: calendar/gui/e-itip-control.c:961
 #: calendar/gui/e-tasks.c:199
@@ -6235,7 +6221,7 @@ msgid "Status:"
 msgstr "Olek:"
 
 #: calendar/gui/e-itip-control.c:966
-#: calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-meeting-list-view.c:271
 #: calendar/gui/e-meeting-store.c:179
 #: calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6248,7 +6234,7 @@ msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
 #: calendar/gui/e-itip-control.c:974
-#: calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-meeting-list-view.c:272
 #: calendar/gui/e-meeting-store.c:181
 #: calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428
@@ -6297,8 +6283,9 @@ msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
 #: calendar/gui/e-itip-control.c:1101
+#, fuzzy
 msgid "Update respondent status"
-msgstr ""
+msgstr "GGV juhtimise staatus"
 
 #: calendar/gui/e-itip-control.c:1114
 msgid "Send Latest Information"
@@ -6306,9 +6293,8 @@ msgstr "Saadab värskeima informatsiooni"
 
 #: calendar/gui/e-itip-control.c:1127
 #: calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:390
-#: mail/mail-send-recv.c:442
-#: shell/e-shell-startup-wizard.c:794
+#: mail/mail-send-recv.c:394
+#: mail/mail-send-recv.c:446
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -6375,9 +6361,9 @@ msgstr "Koosoleku tühistamine"
 #: calendar/gui/e-itip-control.c:1245
 #: calendar/gui/e-itip-control.c:1313
 #: calendar/gui/e-itip-control.c:1348
-#, c-format
+#, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "Sellegipoolest saadeti sõnum edukalt."
 
 #: calendar/gui/e-itip-control.c:1246
 msgid "Bad Meeting Message"
@@ -6393,9 +6379,9 @@ msgid "Task Information"
 msgstr "Ülesande info"
 
 #: calendar/gui/e-itip-control.c:1277
-#, c-format
+#, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr ""
+msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
 #: calendar/gui/e-itip-control.c:1279
 #, c-format
@@ -6407,9 +6393,9 @@ msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #: calendar/gui/e-itip-control.c:1284
-#, c-format
+#, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
 #: calendar/gui/e-itip-control.c:1285
 msgid "Task Update"
@@ -6524,8 +6510,9 @@ msgid "There was an error on the CORBA system\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1867
+#, fuzzy
 msgid "Object could not be found\n"
-msgstr ""
+msgstr "Kirje saatmine ebaõnnestus!\n"
 
 #: calendar/gui/e-itip-control.c:1870
 msgid "You don't have the right permissions to update the calendar\n"
@@ -6595,7 +6582,7 @@ msgid "Chair Persons"
 msgstr "Juhid"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:570
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
@@ -6607,71 +6594,71 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:140
+#: calendar/gui/e-meeting-list-view.c:231
 #: calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107
 #: calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:141
+#: calendar/gui/e-meeting-list-view.c:232
 #: calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:142
+#: calendar/gui/e-meeting-list-view.c:233
 #: calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:143
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:154
+#: calendar/gui/e-meeting-list-view.c:245
 #: calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:155
+#: calendar/gui/e-meeting-list-view.c:246
 #: calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144
 #: calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:156
+#: calendar/gui/e-meeting-list-view.c:247
 #: calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:157
+#: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:179
+#: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200
 #: calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-meeting-list-view.c:273
 #: calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206
 #: calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:183
+#: calendar/gui/e-meeting-list-view.c:274
 #: calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
@@ -6712,7 +6699,7 @@ msgstr "%a, %d.%m.%Y"
 #: calendar/gui/e-meeting-time-sel-item.c:460
 #: e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299
-#: widgets/misc/e-dateedit.c:1606
+#: widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -6786,11 +6773,13 @@ msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #  write priority
+#. write priority
 #: calendar/gui/e-tasks.c:221
 msgid "Priority:"
 msgstr "Tähtsus:"
 
 #  URL
+#. URL
 #: calendar/gui/e-tasks.c:277
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
@@ -6799,10 +6788,10 @@ msgstr "Veebilehekülg:"
 #: mail/em-folder-view.c:2176
 #, fuzzy, c-format
 msgid "Click to open %s"
-msgstr "Ülesande lisamiseks vajuta siia"
+msgstr "%s: Avamine ei õnnestunud: %s\n"
 
-#: calendar/gui/e-tasks.c:736
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/e-tasks.c:773
+#: calendar/gui/gnome-cal.c:1903
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6812,8 +6801,9 @@ msgstr ""
 " %s"
 
 #  FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:755
-#: calendar/gui/gnome-cal.c:1941
+#. FIXME: this doesn't remove the task list from the list or anything
+#: calendar/gui/e-tasks.c:792
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6821,53 +6811,54 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:856
+#: calendar/gui/e-tasks.c:893
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
-msgstr ""
-"Viga tegevusel %s:\n"
-" %s"
+msgstr "Tõrge faili %s avamisel!"
 
-#: calendar/gui/e-tasks.c:875
+#: calendar/gui/e-tasks.c:912
 #, fuzzy
 msgid "Loading tasks"
-msgstr "Kalendri laadimine"
+msgstr "Trüki ülesanded"
 
-#: calendar/gui/e-tasks.c:977
+#: calendar/gui/e-tasks.c:1014
+#, fuzzy
 msgid "Completing tasks..."
-msgstr ""
+msgstr "Trüki ülesanded"
 
-#: calendar/gui/e-tasks.c:1000
+#: calendar/gui/e-tasks.c:1037
+#, fuzzy
 msgid "Deleting selected objects..."
-msgstr ""
+msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:1025
+#: calendar/gui/e-tasks.c:1062
+#, fuzzy
 msgid "Expunging"
-msgstr ""
+msgstr "Hävitan kustutatud sõnumid"
 
-#: calendar/gui/gnome-cal.c:1755
+#: calendar/gui/gnome-cal.c:1738
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
-msgstr "Kalendri laadimine"
+msgstr "Avan %s ülesanded"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1750
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
-msgstr "Uus kokkusaamine"
+msgstr "Austria (de_AT)"
 
-#: calendar/gui/gnome-cal.c:1800
+#: calendar/gui/gnome-cal.c:1783
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:1949
+#: calendar/gui/gnome-cal.c:1932
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6875,7 +6866,7 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2803
+#: calendar/gui/gnome-cal.c:2776
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -6982,19 +6973,19 @@ msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
 #: calendar/gui/itip-utils.c:521
-#, c-format
+#, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr ""
+msgstr "Vaba/hõivatud info saatmine"
 
 #: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: calendar/gui/itip-utils.c:671
+#: 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/itip-utils.c:1155
+#: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
@@ -7019,8 +7010,9 @@ msgstr ""
 
 #. Create the Webcal source group
 #: calendar/gui/migration.c:442
+#, fuzzy
 msgid "On The Web"
-msgstr ""
+msgstr "gtranslatori kodulehekülg www-s"
 
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -7175,85 +7167,85 @@ msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1940
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939
+#: calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1945
+#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2560
-#: calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738
+#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737
 #: mail/em-format-html-print.c:173
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
@@ -7355,8 +7347,9 @@ msgid "Reminder!!"
 msgstr "Meeldetuletaja!!"
 
 #: calendar/importers/icalendar-importer.c:702
+#, fuzzy
 msgid "Calendar Events"
-msgstr ""
+msgstr "Helisündmused"
 
 #: calendar/importers/icalendar-importer.c:727
 msgid ""
@@ -8926,15 +8919,16 @@ msgid "You may not export keys with this cipher"
 msgstr "See šiffer ei toeta dekrüpteerimist"
 
 #: camel/camel-data-cache.c:133
+#, fuzzy
 msgid "Unable to create cache path"
-msgstr ""
+msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
 #: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8945,7 +8939,7 @@ msgstr ""
 "Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
 "taastad ühenduse võrguga."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8956,7 +8950,7 @@ msgstr ""
 "%s\n"
 "Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Taassünkroniseeritakse serveriga"
 
@@ -8969,27 +8963,27 @@ msgid "Downloading new messages for offline mode"
 msgstr ""
 
 #: camel/camel-disco-folder.c:441
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr ""
+msgstr "Loob virtuaalse kausta selle sõnumi adressaatide järgi"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
 #: camel/camel-filter-driver.c:667
 #: camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
-msgstr ""
+msgstr "Kataloogi %s loomine ebaõnnestus."
 
 #: camel/camel-filter-driver.c:711
 #: camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
 #: camel/camel-filter-driver.c:754
 #, c-format
@@ -9064,11 +9058,11 @@ msgstr ""
 msgid "Invalid arguments to (user-tag)"
 msgstr "Vigased argumendid"
 
-#: camel/camel-filter-search.c:669
-#: camel/camel-filter-search.c:677
+#: camel/camel-filter-search.c:670
+#: camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "Viga filtri täitmisel: %s: %s"
+msgstr "Viga otsingu avaldises."
 
 #: camel/camel-folder-search.c:348
 #, c-format
@@ -9084,7 +9078,7 @@ msgstr ""
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
-msgstr "Viga filtri täitmisel: %s: %s"
+msgstr "Viga otsingu avaldises."
 
 #: camel/camel-folder-search.c:569
 #: camel/camel-folder-search.c:598
@@ -9097,30 +9091,34 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toetamata operatsioon: lisa sõnum: %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toetamata operatsioon: otsing UID järgi: %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
 msgstr "Sõnumite liigutamine"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
 msgstr "Sõnumite kopeerimine"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
 msgid "Filtering new message(s)"
 msgstr "Uute sõnumite filtreerimine"
 
@@ -9141,18 +9139,22 @@ msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
 #: camel/camel-gpg-context.c:762
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
+"\n"
+"Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
+"parooli: \""
 
 #: camel/camel-gpg-context.c:779
-#: camel/camel-gpg-context.c:1271
-#: camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1516
-#: camel/camel-gpg-context.c:1623
-#: mail/mail-send-recv.c:576
+#: camel/camel-gpg-context.c:1263
+#: camel/camel-gpg-context.c:1422
+#: camel/camel-gpg-context.c:1508
+#: camel/camel-gpg-context.c:1615
+#: mail/mail-ops.c:697
+#: mail/mail-send-recv.c:593
 msgid "Cancelled."
 msgstr "Loobutud."
 
@@ -9163,61 +9165,57 @@ msgstr ""
 #: camel/camel-gpg-context.c:803
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "Ootamatu vastus POP serverilt: %s"
-
-#: camel/camel-gpg-context.c:815
-msgid "No data provided"
-msgstr ""
+msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/camel-gpg-context.c:855
+#: camel/camel-gpg-context.c:847
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ei saa krüptida sõnumit: saajate aadressid on määramata."
 
-#: camel/camel-gpg-context.c:1132
+#: camel/camel-gpg-context.c:1124
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
 "%s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "%s laadimine ebaõnnestus: %s\n"
 
-#: camel/camel-gpg-context.c:1137
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "%s laadimine ebaõnnestus: %s\n"
 
-#: camel/camel-gpg-context.c:1250
+#: camel/camel-gpg-context.c:1242
 #: camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
-msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
+msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1264
-#: camel/camel-gpg-context.c:1672
-#: camel/camel-gpg-context.c:1723
+#: camel/camel-gpg-context.c:1256
+#: camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
-msgstr "Sõnumi lahtikrüptimine ebaõnnestus."
+msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
-#: camel/camel-gpg-context.c:1288
-#: camel/camel-gpg-context.c:1422
-#: camel/camel-gpg-context.c:1509
-#: camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1616
-#: camel/camel-gpg-context.c:1640
-#: camel/camel-gpg-context.c:1694
-#: camel/camel-gpg-context.c:1745
+#: camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1414
+#: camel/camel-gpg-context.c:1501
+#: camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1608
+#: camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1686
+#: camel/camel-gpg-context.c:1737
 #, fuzzy
 msgid "Failed to execute gpg."
-msgstr "Autentimine ebaõnnestus.\n"
+msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
-#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1389
-#: camel/camel-gpg-context.c:1398
+#: camel/camel-gpg-context.c:1381
+#: camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717
 #: camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
@@ -9225,31 +9223,31 @@ msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1405
+#: camel/camel-gpg-context.c:1397
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1492
+#: camel/camel-gpg-context.c:1484
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1550
+#: camel/camel-gpg-context.c:1542
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1647
+#: camel/camel-gpg-context.c:1639
 #: camel/camel-smime-context.c:990
 #, fuzzy
 msgid "Encrypted content"
-msgstr "Sisu sisaldab"
+msgstr "Vigane \\{\\} kontekst"
 
-#: camel/camel-gpg-context.c:1651
+#: camel/camel-gpg-context.c:1643
 #, fuzzy
 msgid "Unable to parse message content"
-msgstr "Vigane sõnumi sisu"
+msgstr "VIGA: Tundub, et artiklis pole uut teksti."
 
 #: camel/camel-lock-client.c:100
 #, fuzzy, c-format
@@ -9259,7 +9257,7 @@ msgstr "Ei suuda luua lukustamisabilise toru: %s"
 #: camel/camel-lock-client.c:113
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Lukustamisabilise haruprotsessi ei saa luua: %s"
+msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
 
 #: camel/camel-lock-client.c:191
 #: camel/camel-lock-client.c:214
@@ -9270,13 +9268,13 @@ msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
 #: camel/camel-lock-client.c:204
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "%s: Ei saa lukustada küpsise faili %s"
 
 #: camel/camel-lock.c:92
 #: camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
 
 #: camel/camel-lock.c:154
 #, c-format
@@ -9296,17 +9294,17 @@ msgstr "flock(2) abil lukustamine nurjus: %s"
 #: camel/camel-movemail.c:107
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Statistika faili ei saa lugeda."
 
 #: camel/camel-movemail.c:120
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "%s: Ei saa avada küpsise faili %s"
 
 #: camel/camel-movemail.c:128
 #, fuzzy, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
 
 #: camel/camel-movemail.c:157
 #, fuzzy, c-format
@@ -9316,12 +9314,12 @@ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 #: camel/camel-movemail.c:187
 #, fuzzy, c-format
 msgid "Could not create pipe: %s"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "%s: Ei suuda luua soklit!"
 
 #: camel/camel-movemail.c:199
 #, fuzzy, c-format
 msgid "Could not fork: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa uut protsessi forkida!"
 
 #: camel/camel-movemail.c:237
 #, c-format
@@ -9336,18 +9334,18 @@ msgstr "Tundmatu viga"
 #: camel/camel-movemail.c:261
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "Viga faili lugemisel."
 
 #: camel/camel-movemail.c:272
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "VIGA - Faili saatmine ebaõnnestus"
 
 #: camel/camel-movemail.c:465
 #: camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "VIGA - Faili saatmine ebaõnnestus"
 
 #: camel/camel-multipart-encrypted.c:229
 #: camel/camel-multipart-encrypted.c:244
@@ -9362,11 +9360,12 @@ msgstr ""
 #: camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
-msgstr "Muu viga"
+msgstr "%s: viga võtmete analüüsimisel\n"
 
 #: camel/camel-provider.c:59
+#, fuzzy
 msgid "Virtual folder email provider"
-msgstr ""
+msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
 
 #: camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
@@ -9380,7 +9379,7 @@ msgstr "Ei saa laadida %s: süsteem ei toeta moodulite laadimist."
 #: camel/camel-provider.c:181
 #, fuzzy, c-format
 msgid "Could not load %s: %s"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "Ei suuda laadida faili: %s"
 
 #: camel/camel-provider.c:189
 #, c-format
@@ -9389,9 +9388,9 @@ msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
 #: camel/camel-provider.c:356
 #: camel/camel-session.c:160
-#, c-format
+#, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
-msgstr ""
+msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
 
 #: camel/camel-sasl-anonymous.c:35
 #, fuzzy
@@ -9406,7 +9405,7 @@ msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 #: camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
-msgstr "Autentimine ebaõnnestus."
+msgstr "Autentimine ebaõnnestus"
 
 #: camel/camel-sasl-anonymous.c:121
 #, c-format
@@ -9422,14 +9421,18 @@ msgstr ""
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
-msgstr "Kalendri info"
+msgstr ""
+"Ebakorrektne e-posti aadressi jälitusinfo:\n"
+"%s"
 
 #: camel/camel-sasl-anonymous.c:145
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
-msgstr "Kalendri info"
+msgstr ""
+"Ebakorrektne e-posti aadressi jälitusinfo:\n"
+"%s"
 
 #: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
@@ -9517,27 +9520,28 @@ msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:183
+#, fuzzy
 msgid "The referenced credentials have expired."
-msgstr ""
+msgstr "Aegunud allkiri kasutajalt \""
 
 #: camel/camel-sasl-gssapi.c:189
 #: camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274
 #: camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1221
+#: camel/providers/imap/camel-imap-store.c:1193
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
 #: camel/camel-sasl-gssapi.c:213
 #, fuzzy, c-format
 msgid "Failed to resolve host `%s': %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "Ebaõnnestus pikselrastri %s saamine"
 
 #: camel/camel-sasl-gssapi.c:299
 #, fuzzy
 msgid "Unsupported security layer."
-msgstr "Toetamata tüüp"
+msgstr "MPEG %d Kiht III"
 
 #: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
@@ -9559,7 +9563,7 @@ msgstr ""
 #: camel/camel-sasl-login.c:32
 #, fuzzy
 msgid "Login"
-msgstr "Logan"
+msgstr "Kasutaja"
 
 #: camel/camel-sasl-login.c:34
 #: camel/camel-sasl-plain.c:34
@@ -9569,11 +9573,12 @@ msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 #: camel/camel-sasl-login.c:127
 #, fuzzy
 msgid "Unknown authentication state."
-msgstr "Autentimine ebaõnnestus."
+msgstr "Tundmatu autentimis skeem.\n"
 
 #: camel/camel-sasl-ntlm.c:31
+#, fuzzy
 msgid "NTLM / SPA"
-msgstr ""
+msgstr "Vale SPA käepigistus: %s"
 
 #: camel/camel-sasl-ntlm.c:33
 #, fuzzy
@@ -9581,8 +9586,9 @@ msgid "This option will connect to a Windows-based server using NTLM / Secure Pa
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-plain.c:32
+#, fuzzy
 msgid "PLAIN"
-msgstr ""
+msgstr "Lihtne"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
@@ -9654,7 +9660,7 @@ msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
 #: camel/camel-service.c:855
 #, fuzzy
 msgid "Resolving address"
-msgstr "E-posti aadressi kasutamine"
+msgstr "Kodune aadress"
 
 #: camel/camel-service.c:924
 #, fuzzy
@@ -9671,7 +9677,7 @@ msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
 msgid ""
 "Could not create directory %s:\n"
 "%s"
-msgstr "Ei saa uuendada objekti!"
+msgstr "Kataloogi loomine ebaõnnestus"
 
 #: camel/camel-smime-context.c:104
 #, fuzzy, c-format
@@ -9686,12 +9692,12 @@ msgstr "Määramata"
 #: camel/camel-smime-context.c:516
 #, fuzzy
 msgid "Good signature"
-msgstr "Lisa tingimus"
+msgstr "Korrektne allkiri kasutajalt \""
 
 #: camel/camel-smime-context.c:518
 #, fuzzy
 msgid "Bad signature"
-msgstr "Lisa tingimus"
+msgstr "1 halb allkiri\n"
 
 #: camel/camel-smime-context.c:520
 msgid "Content tampered with or altered in transit"
@@ -9700,30 +9706,32 @@ msgstr ""
 #: camel/camel-smime-context.c:522
 #, fuzzy
 msgid "Signing certificate not found"
-msgstr "Ei leia häälestusandmebaasi"
+msgstr "ei leia abiprogrammi `%s'"
 
 #: camel/camel-smime-context.c:524
 #, fuzzy
 msgid "Signing certificate not trusted"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
 
 #: camel/camel-smime-context.c:526
+#, fuzzy
 msgid "Signature algorithm unknown"
-msgstr ""
+msgstr "tundmatu šifri algoritm"
 
 #: camel/camel-smime-context.c:528
+#, fuzzy
 msgid "Siganture algorithm unsupported"
-msgstr ""
+msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
 #: camel/camel-smime-context.c:530
 #, fuzzy
 msgid "Malformed signature"
-msgstr "Allkirja salvestamine"
+msgstr "PGP allkiri"
 
 #: camel/camel-smime-context.c:532
 #, fuzzy
 msgid "Processing error"
-msgstr "Elukutse"
+msgstr "Viga rea %d töötlemisel (%s)\n"
 
 #: camel/camel-smime-context.c:647
 #, fuzzy, c-format
@@ -9734,31 +9742,33 @@ msgstr "Server: %s, tüüp: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:242
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:293
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:381
-#: camel/camel-vee-store.c:351
+#: camel/camel-store.c:377
+#: camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:779
-#: mail/mail-ops.c:1128
+#: camel/camel-store.c:773
+#: mail/mail-ops.c:1079
 #, fuzzy
 msgid "Trash"
-msgstr "Ülesanne"
+msgstr "Tarbetu"
 
-#: camel/camel-store.c:781
+#: camel/camel-store.c:775
 #: filter/libfilter-i18n.h:35
-#: mail/mail-ops.c:1132
-#: ui/evolution-mail-message.xml.h:46
+#: mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juuni"
@@ -9766,7 +9776,7 @@ msgstr "Juuni"
 #: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "Sertifikaadi võtme laadimine failist %s ebaõnnestus\n"
 
 #: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
@@ -9775,7 +9785,7 @@ msgstr ""
 #: camel/camel-tcp-stream-openssl.c:572
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "ei suuda kirjutada signatuuriga lehekülge"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
@@ -9788,38 +9798,42 @@ msgstr ""
 #: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
-msgstr "Allkirjafail"
+msgstr "Viga nime '%s' analüüsimisel"
 
 #: camel/camel-tcp-stream-openssl.c:580
+#, fuzzy
 msgid "Certificate Revocation List signature failure"
-msgstr ""
+msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
 #: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
 msgid "Certificate not yet valid"
-msgstr ""
+msgstr "Kas võtad vastu veel mittekehtiva turvainfo?"
 
 #: camel/camel-tcp-stream-openssl.c:584
 #, fuzzy
 msgid "Certificate has expired"
-msgstr "_Sertifikaadi ID:"
+msgstr "%08lX: võti on aegunud\n"
 
 #: camel/camel-tcp-stream-openssl.c:586
+#, fuzzy
 msgid "CRL not yet valid"
-msgstr ""
+msgstr "Kas võtad vastu veel mittekehtiva turvainfo?"
 
 #: camel/camel-tcp-stream-openssl.c:588
+#, fuzzy
 msgid "CRL has expired"
-msgstr ""
+msgstr "%08lX: võti on aegunud\n"
 
 #: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
-msgstr "Viga listi lisamisel"
+msgstr "Viga projektis '%s'"
 
 #: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
-msgstr "Kontorist väljas"
+msgstr "Mälu otsas"
 
 #: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
@@ -9836,47 +9850,52 @@ msgstr ""
 #: camel/camel-tcp-stream-openssl.c:603
 #, fuzzy
 msgid "Unable to verify leaf signature"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "ei suuda kirjutada signatuuriga lehekülge"
 
 #: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
 msgid "Certificate chain too long"
-msgstr ""
+msgstr "argumendi rida on liiga pikk"
 
 #: camel/camel-tcp-stream-openssl.c:607
 #, fuzzy
 msgid "Certificate Revoked"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: camel/camel-tcp-stream-openssl.c:609
+#, fuzzy
 msgid "Invalid Certificate Authority (CA)"
-msgstr ""
+msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
 #: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
 msgid "Path length exceeded"
-msgstr ""
+msgstr "Vigane lindi pikkus"
 
 #: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Invalid purpose"
-msgstr "Vigane parameeter"
+msgstr "%s: vigane võti -- %c\n"
 
 #: camel/camel-tcp-stream-openssl.c:615
 #, fuzzy
 msgid "Certificate untrusted"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: camel/camel-tcp-stream-openssl.c:617
 #, fuzzy
 msgid "Certificate rejected"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: camel/camel-tcp-stream-openssl.c:620
+#, fuzzy
 msgid "Subject/Issuer mismatch"
-msgstr ""
+msgstr "Alluta piirangutele:"
 
 #: camel/camel-tcp-stream-openssl.c:622
+#, fuzzy
 msgid "AKID/SKID mismatch"
-msgstr ""
+msgstr "arp: vale protokolli tüüp\n"
 
 #: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
@@ -9887,8 +9906,11 @@ msgid "Key usage does not support certificate signing"
 msgstr ""
 
 #: camel/camel-tcp-stream-openssl.c:629
+#, fuzzy
 msgid "Error in application verification"
 msgstr ""
+"Viga regulaaravaldises '%s':\n"
+"%s"
 
 #: camel/camel-tcp-stream-openssl.c:696
 #: camel/camel-tcp-stream-ssl.c:831
@@ -9902,13 +9924,15 @@ msgstr ""
 
 #: camel/camel-tcp-stream-openssl.c:702
 #: camel/camel-tcp-stream-ssl.c:837
+#, fuzzy
 msgid "GOOD"
-msgstr ""
+msgstr "Hea soovitus"
 
 #: camel/camel-tcp-stream-openssl.c:702
 #: camel/camel-tcp-stream-ssl.c:837
+#, fuzzy
 msgid "BAD"
-msgstr ""
+msgstr "Halvad võtmed"
 
 #: camel/camel-tcp-stream-openssl.c:704
 #, c-format
@@ -9934,11 +9958,11 @@ msgid ""
 msgstr ""
 
 #: camel/camel-tcp-stream-ssl.c:885
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
-msgstr ""
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: camel/camel-tcp-stream-ssl.c:937
 #, c-format
@@ -9952,7 +9976,7 @@ msgstr ""
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
-msgstr "_Sertifikaadi ID:"
+msgstr "Aegunud allkiri kasutajalt \""
 
 #: camel/camel-tcp-stream-ssl.c:972
 #, fuzzy, c-format
@@ -9964,17 +9988,17 @@ msgstr "_Sertifikaadi ID:"
 #: camel/camel-url.c:290
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "ei saa parsida võtmeserveri URI\n"
 
 #: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
-msgstr "Viga %s salvestamisel: %s"
+msgstr "viga (mitteassotsiatiivne)\n"
 
 #: camel/camel-vee-folder.c:649
-#, c-format
+#, fuzzy, c-format
 msgid "No such message %s in %s"
-msgstr ""
+msgstr "Sõnum mitmes vormingus"
 
 #: camel/camel-vee-folder.c:815
 #: camel/camel-vee-folder.c:821
@@ -9982,21 +10006,31 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Kopeerib valitud sõnumi teise kausta"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Kopeerib valitud sõnumi teise kausta"
+
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
@@ -10013,7 +10047,7 @@ msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
@@ -10021,7 +10055,7 @@ msgstr "_Kontrolli uusi sõnumeid automaatselt"
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 #, fuzzy
 msgid "LDAP Server Name:"
-msgstr "LDAP server"
+msgstr "Sisesta serveri nimi"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:72
 #, fuzzy
@@ -10029,46 +10063,44 @@ msgid "Search base:"
 msgstr "_Otsingu baas:"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:83
+#, fuzzy
 msgid "Novell GroupWise"
-msgstr ""
+msgstr "Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Parool"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#  default charset used in mail view
 #: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:300
-#: mail/em-folder-view.c:1586
-#: mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:42
-msgid "Default"
-msgstr "UTF-8"
+#: camel/providers/groupwise/camel-gw-listener.c:323
+#, fuzzy
+msgid "Checklist"
+msgstr "nimekiri"
 
 #: 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:2869
+#: camel/providers/imap/camel-imap-store.c:2860
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2872
+#: camel/providers/imap/camel-imap-store.c:2863
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -10098,7 +10130,7 @@ msgstr "Serveri vastus lõppes liiga vara."
 #: camel/providers/imap/camel-imap-command.c:649
 #, fuzzy, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Kontaktide infot sisaldav LDAP server"
+msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
 
 #: camel/providers/imap/camel-imap-command.c:685
 #, c-format
@@ -10108,28 +10140,28 @@ msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 #: camel/providers/imap/camel-imap-folder.c:223
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Kataloogi loomine ebaõnnestus"
 
 #: camel/providers/imap/camel-imap-folder.c:242
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "OMF faili '%s' laadimine ebaõnnestus."
 
-#: camel/providers/imap/camel-imap-folder.c:320
+#: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust hävitati ja taasloodi serveris."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:563
+#: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1910
+#: camel/providers/imap/camel-imap-folder.c:1926
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1972
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10141,34 +10173,36 @@ msgstr "Sõnumi vastuvõtmine nurjus"
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1941
+#: camel/providers/imap/camel-imap-folder.c:1972
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:1964
-#: camel/providers/imap/camel-imap-folder.c:2566
+#: camel/providers/imap/camel-imap-folder.c:1995
+#: camel/providers/imap/camel-imap-folder.c:2591
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2224
-#: camel/providers/imap/camel-imap-folder.c:2294
+#: camel/providers/imap/camel-imap-folder.c:2255
+#: camel/providers/imap/camel-imap-folder.c:2325
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2604
+#: camel/providers/imap/camel-imap-folder.c:2629
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:252
 #: camel/providers/imap/camel-imap-message-cache.c:309
@@ -10176,17 +10210,17 @@ msgstr "Ei saa avada kausta '%s'"
 #: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Nurjumine teate %d juures"
+msgstr "Sõnumi vastuvõtmine nurjus"
 
 #: camel/providers/imap/camel-imap-message-cache.c:417
 #, fuzzy, c-format
 msgid "Failed to cache %s: %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
 #: camel/providers/imap/camel-imap-provider.c:43
 #, fuzzy
 msgid "Connection to Server"
-msgstr "Samm 2: serverisse ühendumine"
+msgstr "Loon %s ühendust serveriga %s"
 
 #: camel/providers/imap/camel-imap-provider.c:45
 #, fuzzy
@@ -10196,13 +10230,13 @@ msgstr "Ei saa luua ühendust LDAP serveriga"
 #: camel/providers/imap/camel-imap-provider.c:47
 #, fuzzy
 msgid "Command:"
-msgstr "Firma"
+msgstr "Käsk:"
 
 #: camel/providers/imap/camel-imap-provider.c:55
 #: camel/providers/nntp/camel-nntp-provider.c:41
 #, fuzzy
 msgid "Folders"
-msgstr "_Kaust:"
+msgstr "Kataloogid"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
@@ -10221,27 +10255,37 @@ msgstr "Nimi"
 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:72
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:425
 #, fuzzy, c-format
 msgid "IMAP server %s"
-msgstr "LDAP server"
+msgstr "Vali server"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:427
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
-msgstr "%s teenus %s jaoks %s peal"
+msgstr "Serveri %s turvainfo kaotas kehtivuse %s."
 
-#: camel/providers/imap/camel-imap-store.c:582
-#: camel/providers/imap/camel-imap-store.c:602
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
@@ -10250,99 +10294,102 @@ msgstr "%s teenus %s jaoks %s peal"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:549
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
 msgid "SSL unavailable"
-msgstr ""
+msgstr "Otsing ei ole saadaval"
 
-#: camel/providers/imap/camel-imap-store.c:599
-#: camel/providers/imap/camel-imap-store.c:831
-#: camel/providers/imapp/camel-imapp-store.c:230
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:796
+#: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
 #: camel/providers/pop3/camel-pop3-store.c:192
 #, fuzzy
 msgid "Connection cancelled"
-msgstr "Katkestatud"
+msgstr "Operatsioon katekstatud"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:630
+#: camel/providers/imap/camel-imap-store.c:661
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/imap/camel-imap-store.c:666
+#: camel/providers/imap/camel-imap-store.c:631
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:662
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
-msgstr "Autentimine ebaõnnestus."
+msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:799
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1251
+#: camel/providers/imap/camel-imap-store.c:1223
 #, 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:1261
+#: camel/providers/imap/camel-imap-store.c:1233
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1284
-#: camel/providers/imapp/camel-imapp-store.c:346
+#: camel/providers/imap/camel-imap-store.c:1256
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/imap/camel-imap-store.c:1298
+#: camel/providers/imap/camel-imap-store.c:1270
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1327
+#: camel/providers/imap/camel-imap-store.c:1299
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
-msgstr "Autentimine LDAP serverile nurjus"
+msgstr "Ei saa luua ühendust meiliserveriga \"%*.*s\""
 
-#: camel/providers/imap/camel-imap-store.c:1674
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1717
+#: camel/providers/imap/camel-imap-store.c:1798
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1767
+#: camel/providers/imap/camel-imap-store.c:1739
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-store.c:2027
+#: camel/providers/imap/camel-imap-store.c:1999
 #, fuzzy, c-format
 msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 
-#: camel/providers/imap/camel-imap-store.c:2039
+#: camel/providers/imap/camel-imap-store.c:2011
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
-msgstr "Tundmatu viga: %s"
+msgstr "Viga kataloogi \"%s\" loomisel: %s\n"
 
-#: camel/providers/imap/camel-imap-store.c:2075
+#: camel/providers/imap/camel-imap-store.c:2047
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10350,7 +10397,7 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-provider.c:38
 #, fuzzy
 msgid "Message storage"
-msgstr "Näidatav sõnum:"
+msgstr "Sõnumi kuulajaskond"
 
 #: camel/providers/imapp/camel-imapp-provider.c:47
 #, fuzzy
@@ -10365,7 +10412,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 
-#: camel/providers/imapp/camel-imapp-store.c:330
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
@@ -10373,34 +10420,38 @@ msgstr "Ei saa luua ühendust LDAP serveriga"
 #: camel/providers/local/camel-local-folder.c:179
 #, fuzzy
 msgid "Index message body data"
-msgstr "Saada kontaktile sõnum"
+msgstr ""
+"\n"
+" Palun vaadake teade üle:\n"
+"\n"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:388
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s @ %s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
-#, c-format
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
+#, fuzzy, c-format
 msgid "mailbox:%s (%s)"
-msgstr ""
+msgstr "Postikast"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:399
 #, fuzzy, c-format
 msgid "%s (%s)"
-msgstr "%s @ %s"
+msgstr "%s (%s)"
 
 #: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+#, fuzzy
 msgid "MH-format mail directories"
-msgstr ""
+msgstr "\"Maildir\" vormingus postikataloog"
 
 #: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
@@ -10447,27 +10498,30 @@ msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:145
-#, c-format
+#, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
-msgstr ""
+msgstr "Fail '%s' ei ole tavaline fail ega kataloog."
 
 #: camel/providers/local/camel-local-store.c:154
 #: camel/providers/local/camel-local-store.c:162
 #: camel/providers/local/camel-local-store.c:226
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
 
 #: camel/providers/local/camel-local-store.c:174
+#, fuzzy
 msgid "Local stores do not have an inbox"
-msgstr ""
+msgstr "Suurused ei klapi (lokaalne %ld) -- laen uuesti.\n"
 
 #: camel/providers/local/camel-local-store.c:186
 #, c-format
@@ -10477,12 +10531,12 @@ msgstr "Kohaliku posti fail %s"
 #: camel/providers/local/camel-local-store.c:295
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa ühenduda %s (port: %d): %s"
 
 #: camel/providers/local/camel-local-store.c:360
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Arhiivi nime muutmine ei õnnestunud."
 
 #: camel/providers/local/camel-local-store.c:385
 #: camel/providers/local/camel-mbox-store.c:284
@@ -10496,8 +10550,8 @@ msgstr "Ei saa avada '%s' kausta"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa avada '%s' kausta"
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Ei saa avada '%s' kausta"
@@ -10514,7 +10568,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:183
 #, fuzzy
 msgid "Maildir append message cancelled"
-msgstr "Nurjumine teate %d juures"
+msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
@@ -10528,14 +10582,16 @@ msgstr "Vigane sõnumi sisu"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Aadressiraamatut ei leitud"
@@ -10545,7 +10601,9 @@ msgstr "Aadressiraamatut ei leitud"
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
 
 #: camel/providers/local/camel-maildir-store.c:134
 #, fuzzy, c-format
@@ -10554,21 +10612,25 @@ msgstr "`%s' ei ole maildir vormingus kataloog."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
 #: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
 #: camel/providers/local/camel-maildir-summary.c:417
 #: camel/providers/local/camel-maildir-summary.c:548
@@ -10579,21 +10641,21 @@ msgstr ""
 #: camel/providers/local/camel-maildir-summary.c:541
 #, fuzzy
 msgid "Checking folder consistency"
-msgstr "Kontrollin uusi sõnumeid"
+msgstr "Järjekindlus viib sihile"
 
 #: camel/providers/local/camel-maildir-summary.c:644
 #, fuzzy
 msgid "Checking for new messages"
-msgstr "Kontrollin uute sõnumite olemasolu"
+msgstr "Uute sõnumite kontroll"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:348
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 #, fuzzy
 msgid "Storing folder"
-msgstr "Kausta sünkroniseerimine"
+msgstr "Avab kataloog"
 
 #: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
@@ -10604,16 +10666,17 @@ msgstr "%s lukustamine nurjus: %s"
 #: camel/providers/local/camel-mbox-folder.c:284
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Ei saa avada ajutist kirjakasti: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:344
+#, fuzzy
 msgid "Mail append cancelled"
-msgstr ""
+msgstr "Postitamine katkestati!!!"
 
 #: camel/providers/local/camel-mbox-folder.c:347
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
+msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:435
 #: camel/providers/local/camel-mbox-folder.c:466
@@ -10636,7 +10699,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Sa ei saa luua selle nimega kausta"
@@ -10653,7 +10716,9 @@ msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-store.c:255
 #, c-format
@@ -10665,128 +10730,137 @@ msgstr "`%s' ei ole tavaline fail."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "Ei saa luua kataloogi %s: %s"
+msgstr "kataloogi `%s' ei õnnestu luua"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 #, fuzzy
 msgid "Folder already exists"
-msgstr "Kaardi ID on juba olemas"
+msgstr "Kataloog \"%*.*s\" on juba olemas."
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Kirjeldatud kaustanimi ei ole korrektne: %s"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "Ei saa laadida '%s' ülesandeid"
+msgstr "Arhiivi nime muutmine ei õnnestunud."
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Arhiivi nime muutmine ei õnnestunud."
 
-#: camel/providers/local/camel-mbox-summary.c:354
+#: camel/providers/local/camel-mbox-summary.c:375
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ei saa avada kausta '%s'"
 
-#: camel/providers/local/camel-mbox-summary.c:402
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:458
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
-#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa faili \"%s\" avada"
 
-#: camel/providers/local/camel-mbox-summary.c:538
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:551
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa luua sihtkataloogi: %s."
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:581
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa luua sihtkataloogi: %s."
 
-#: camel/providers/local/camel-mbox-summary.c:571
-#: mail/em-folder-tree.c:2155
+#: camel/providers/local/camel-mbox-summary.c:592
+#: mail/em-folder-tree.c:2459
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Kataloogi nime muutmine ei õnnestunud."
 
-#: camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:663
-#: camel/providers/local/camel-mbox-summary.c:856
-#: camel/providers/local/camel-mbox-summary.c:864
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:790
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga"
 
-#: camel/providers/local/camel-mbox-summary.c:825
+#: camel/providers/local/camel-mbox-summary.c:846
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
-#: camel/providers/local/camel-mbox-summary.c:919
-#: camel/providers/local/camel-mbox-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine ebaõnnestus: %s: %s"
 
 #: camel/providers/local/camel-mh-folder.c:174
+#, fuzzy
 msgid "MH append message cancelled"
-msgstr ""
+msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
 
 #: camel/providers/local/camel-mh-folder.c:177
 #, 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:217
+#: camel/providers/local/camel-mh-store.c:219
 #, fuzzy, c-format
 msgid "Could not create folder `%s': %s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a directory."
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -10794,57 +10868,60 @@ msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:122
-#, c-format
+#, fuzzy, c-format
 msgid "Spool `%s' cannot be opened: %s"
-msgstr ""
+msgstr "%s: ei saa avada"
 
 #: camel/providers/local/camel-spool-store.c:134
 #, fuzzy, c-format
 msgid "Spool `%s' is not a regular file or directory"
-msgstr "`%s' ei ole maildir vormingus kataloog."
+msgstr "Valik ei ole fail ega kataloog! Ignoreerin päringut."
 
 #: camel/providers/local/camel-spool-store.c:153
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
-msgstr "Aadressiraamatut ei leitud"
+msgstr "Funktsiooni pole olemas"
 
 #: camel/providers/local/camel-spool-store.c:163
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr "Ei saa avada kausta '%s'"
 
 #: camel/providers/local/camel-spool-store.c:167
 #, fuzzy, c-format
 msgid "Folder `%s' does not exist."
-msgstr "Aadressiraamatut ei leitud"
+msgstr "Funktsiooni pole olemas"
 
 #: camel/providers/local/camel-spool-store.c:172
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
 #: camel/providers/local/camel-spool-store.c:180
 #, fuzzy, c-format
 msgid "`%s' is not a mailbox file."
-msgstr "`%s' ei ole tavaline fail."
+msgstr "%s: %s ei ole tavaline fail."
 
 #: camel/providers/local/camel-spool-store.c:197
+#, fuzzy
 msgid "Store does not support an INBOX"
-msgstr ""
+msgstr "Terminal ei toeta värve"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, c-format
+#, fuzzy, c-format
 msgid "Spool mail file %s"
-msgstr ""
+msgstr "Kohaliku posti fail %s"
 
 #: camel/providers/local/camel-spool-store.c:209
 #, fuzzy, c-format
 msgid "Spool folder tree %s"
-msgstr "Säilitan Kausta '%s'"
+msgstr "Puhverkausta pole võimalik avada"
 
 #: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
@@ -10859,12 +10936,12 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:195
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa luua sihtkataloogi: %s."
 
 #: camel/providers/local/camel-spool-summary.c:211
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr "Ei saa luua sihtkataloogi: %s."
 
 #: camel/providers/local/camel-spool-summary.c:242
 #: camel/providers/local/camel-spool-summary.c:261
@@ -10879,7 +10956,9 @@ msgstr ""
 #: camel/providers/nntp/camel-nntp-store.c:997
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+msgstr ""
+"Palun sisesta sobiv\n"
+"populatsiooni dispersioon muutuja 1 jaoks."
 
 #: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
@@ -10902,7 +10981,7 @@ msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
 #: camel/providers/pop3/camel-pop3-folder.c:509
 #, fuzzy
 msgid "User cancelled"
-msgstr "Katkestatud"
+msgstr "katkestatud kasutaja poolt\n"
 
 #: camel/providers/nntp/camel-nntp-folder.c:142
 #: camel/providers/nntp/camel-nntp-folder.c:226
@@ -10913,7 +10992,9 @@ msgstr "Katkestatud"
 #: camel/providers/pop3/camel-pop3-folder.c:512
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:195
@@ -10949,8 +11030,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
-"Viga kirja automaatsel salvestamisel: %s\n"
-" %s"
+"Ei saa muuta võtme väärtust. Viga:\n"
+"%s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:448
 msgid "You cannot post NNTP messages while working offline!"
@@ -10970,16 +11051,12 @@ msgstr "Ei saa käivitada wombat serverit"
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Väljundfaili loomine nurjus: %s\n"
-" %s"
+msgstr "Ei saa avada töölaua (desktop) faili %s paneeli käivitajale %s%s\n"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Väljundfaili loomine nurjus: %s\n"
-" %s"
+msgstr "Ei saa avada töölaua (desktop) faili %s paneeli käivitajale %s%s\n"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
@@ -11004,7 +11081,7 @@ msgstr ""
 #: camel/providers/nntp/camel-nntp-store.c:158
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
-msgstr "Ei leidnud vidinat väljale: `%s'"
+msgstr "Standardsisendist (stdin) andmete lugemine ebaõnnestus."
 
 #: camel/providers/nntp/camel-nntp-store.c:170
 #, c-format
@@ -11019,7 +11096,7 @@ msgstr "USENETi uudised üle %s"
 #: camel/providers/nntp/camel-nntp-store.c:640
 #, fuzzy
 msgid "Stream error"
-msgstr "Muu viga"
+msgstr "viga (mitteassotsiatiivne)\n"
 
 #: camel/providers/nntp/camel-nntp-store.c:643
 #, fuzzy, c-format
@@ -11027,9 +11104,7 @@ msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
-msgstr ""
-"Viga faili %s lugemisel:\n"
-"%s"
+msgstr "/_Uudisegrupid/Grupi _omadused..."
 
 #: camel/providers/nntp/camel-nntp-store.c:735
 msgid ""
@@ -11058,51 +11133,53 @@ msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:253
+#, c-format
 msgid "Connection error: %s"
-msgstr "Valideerimisviga: %s"
+msgstr "Ühenduse viga: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:262
+#, c-format
 msgid "No such folder: %s"
-msgstr "Kausta %s ei leitud"
+msgstr "Kausta ei leitud: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, fuzzy, c-format
 msgid "Could not get group: %s"
-msgstr "Ei leidnud vidinat väljale: `%s'"
+msgstr "Gruppi ei saa muuta."
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
 msgid "Could not get messages: unspecificed error"
 msgstr "Sõnumi võtmine nurjus: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
-msgstr "IMAPi käsk ebaõnnestus: %s"
+msgstr ""
+"Mount käsk ei läinud läbi.\n"
+"\""
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
-msgstr "Kontrollin uute sõnumite olemasolu"
+msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
-msgstr "Tundmatu viga: %s"
+msgstr "Server ei vasta!"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 #, fuzzy
 msgid "Use cancel"
-msgstr "Tühista"
+msgstr "Katkestada avamine?"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, fuzzy, c-format
 msgid "Operation failed: %s"
-msgstr "Avan %s kalendri"
+msgstr "TIFFSulgemisoperatsioon nurjus"
 
 #: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
@@ -11111,28 +11188,27 @@ msgstr "Võtan vastu POP kokkuvõtet"
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
+msgstr "ei õnnestu leida jooksvat kataloogi"
 
 #: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Hävitan kustutatud sõnumid"
 
 #: camel/providers/pop3/camel-pop3-folder.c:404
-#, c-format
+#, fuzzy, c-format
 msgid "No message with uid %s"
-msgstr ""
+msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
+#  Sigh, most of the crap in this function is so that the cancel button
+#  returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:411
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Võtan vastu POP kokkuvõtet"
 
 #: camel/providers/pop3/camel-pop3-folder.c:501
-#, fuzzy
 msgid "Unknown reason"
-msgstr "Tundmatu viga"
+msgstr "Tundmatu põhjus"
 
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
@@ -11148,7 +11224,7 @@ msgid "Disable support for all POP3 extensions"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:54
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -11179,7 +11255,7 @@ msgstr "Ei saa luua ühendust LDAP serveriga"
 #: camel/providers/pop3/camel-pop3-store.c:366
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
-msgstr "Ei saa luua ühendust LDAP serveriga"
+msgstr "Ei õnnestu luua ühendust WAIS serveriga."
 
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
@@ -11188,9 +11264,9 @@ msgid "Unable to connect to POP server %s: No support for requested authenticati
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "IMAPi käsk ebaõnnestus: %s"
+msgstr "SASL `%s'  Sisselogimine POP serverisse %s ebaõnnestus: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
@@ -11223,10 +11299,9 @@ msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:113
-#, fuzzy
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
-msgstr "Saada sõnum"
+msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
@@ -11235,7 +11310,7 @@ msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 #, fuzzy
 msgid "Could not parse recipient list"
-msgstr "Ei saa uuendada objekti!"
+msgstr "%s: Ei õnnestu lugeda autoriseerimisnimekirja"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
@@ -11250,7 +11325,7 @@ msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatma
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, fuzzy, c-format
 msgid "Could not send message: %s"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Saada kontaktile sõnum"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
@@ -11268,16 +11343,15 @@ msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail lõpetas töö staatusega %d: sõnumit ei saadetud."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
-#, fuzzy
 msgid "sendmail"
-msgstr "Saada sõnum"
+msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
 #: camel/providers/smtp/camel-smtp-provider.c:37
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11286,20 +11360,23 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "E-posti saatmiseks SMTP protokolli abil läbi võrgus oleva mailhub'i.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
+#, fuzzy
 msgid "Syntax error, command unrecognized"
-msgstr ""
+msgstr "Viga käsurea töötlemisel"
 
 #: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:178
+#, fuzzy
 msgid "Command not implemented"
-msgstr ""
+msgstr "Käsku ei leitud."
 
 #: camel/providers/smtp/camel-smtp-transport.c:180
+#, fuzzy
 msgid "Command parameter not implemented"
-msgstr ""
+msgstr "Massiivi versioon pole toetatud!"
 
 #: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
@@ -11308,7 +11385,9 @@ msgstr ""
 #: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
-msgstr "Näita teadet"
+msgstr ""
+"  -h, --help                 näita seda teadet\n"
+"\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
@@ -11365,11 +11444,12 @@ msgstr ""
 #: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "Transaction failed"
-msgstr "Autentimine ebaõnnestus."
+msgstr "Trükkimine ebaõnnestus"
 
 #: camel/providers/smtp/camel-smtp-transport.c:216
+#, fuzzy
 msgid "A password transition is needed"
-msgstr ""
+msgstr "PLN : Tabel on parooliga krüpteeritud"
 
 #: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
@@ -11383,17 +11463,16 @@ msgstr ""
 #: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
-msgstr "Autentimine ebaõnnestus."
+msgstr "Viga nime '%s' analüüsimisel"
 
 #: camel/providers/smtp/camel-smtp-transport.c:224
-#, fuzzy
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
 #: camel/providers/smtp/camel-smtp-transport.c:308
 #, fuzzy
 msgid "Welcome response error"
-msgstr "RSET vastuse viga: %s"
+msgstr "HELO vastuse viga: %s: mittefataalne"
 
 #: camel/providers/smtp/camel-smtp-transport.c:343
 #: camel/providers/smtp/camel-smtp-transport.c:382
@@ -11402,24 +11481,22 @@ msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
-#, fuzzy
 msgid "server does not appear to support SSL"
-msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
+msgstr "tundub, et  server ei toeta SSL'i"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "AUTH päring ületas ajalimiidi: %s"
+#, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "STARTTLS käsk ebaõnnestus: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-#, fuzzy
-msgid "STARTTLS response error"
-msgstr "RSET vastuse viga: %s"
+msgid "STARTTLS command failed"
+msgstr "STARTTLS käsk ebaõnnestus"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
+msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, fuzzy, c-format
@@ -11432,7 +11509,7 @@ msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
-msgstr "Autentimine LDAP serverile nurjus"
+msgstr "Ei saa luua ühendust meiliserveriga \"%*.*s\""
 
 #: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
@@ -11445,158 +11522,145 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 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:691
-#: mail/mail-ops.c:614
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Sõnumi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 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:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
+msgstr "Sõnumit ei saa saata: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
-msgstr "Koosolek"
+msgstr "SMTP Tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, fuzzy, c-format
-msgid "HELO request timed out: %s"
-msgstr "RSET päring ületas ajalimiidi: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, c-format
+msgid "HELO command failed: %s"
+msgstr "HELO käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-#, fuzzy
-msgid "HELO response error"
-msgstr "RSET vastuse viga: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
+msgstr "HELO käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
-msgstr "Autentimine ebaõnnestus."
+msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH päring ületas ajalimiidi: %s"
+msgid "AUTH command failed: %s"
+msgstr "AUTH käsk ebaõnnestus: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH päring nurjus"
+msgid "AUTH command failed"
+msgstr "AUTH käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "MAIL FROM päring ületas ajalimiidi: %s: sõnum jäi saatmata"
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "MAIL FROM käsk ebaõnnestus: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-#, fuzzy
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM vastuse viga: %s: sõnum jäi saatmata"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
+msgstr "MAIL FROM käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "RCPT TO päring ületas ajalimiidi: %s: sõnum jäi saatmata"
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO käsk ebaõnnestus: %s: meil jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
-msgstr ""
+msgstr "RCPT TO <%s> ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr "DATA päring ületas ajalimiidi: %s: sõnum jäi saatmata"
+msgid "DATA command failed: %s: mail not sent"
+msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-#, fuzzy
-msgid "DATA response error"
-msgstr "RSET vastuse viga: %s"
+#  we should have gotten instructions on how to use the DATA command:
+#  * 354 Enter mail, end with "." on a line by itself
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
+msgstr "DATA käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA saatmine ületas ajalimiidi: sõnumi tühistamine: %s: sõnum jäi saatmata"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-#, fuzzy
-msgid "DATA termination response error"
-msgstr "Serverilt saadi vigane autentimise vastus."
+msgid "RSET command failed: %s"
+msgstr "RSET käsk ebaõnnestus: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET päring ületas ajalimiidi: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-#, fuzzy
-msgid "RSET response error"
-msgstr "RSET vastuse viga: %s"
+msgid "RSET command failed"
+msgstr "RSET käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, fuzzy, c-format
-msgid "QUIT request timed out: %s"
-msgstr "AUTH päring ületas ajalimiidi: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, c-format
+msgid "QUIT command failed: %s"
+msgstr "QUIT käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-#, fuzzy
-msgid "QUIT response error"
-msgstr "RSET vastuse viga: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
+msgstr "QUIT käsk ebaõnnestus"
 
-#: composer/e-msg-composer-attachment-bar.c:103
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:104
+#, c-format
 msgid "%.0fK"
-msgstr "%.1fK"
+msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:107
+#, c-format
 msgid "%.0fM"
-msgstr "%.1fM"
+msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment-bar.c:110
+#, c-format
 msgid "%.0fG"
-msgstr "%.1fG"
+msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
-#: mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:301
+#: mail/em-utils.c:1482
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:493
 #, fuzzy
 msgid "Attach a file to the message"
-msgstr "Sõnumi vastuvõtmine nurjus"
+msgstr "Salvesta artikkel faili"
 
 #: composer/e-msg-composer-attachment.c:168
 #: composer/e-msg-composer-attachment.c:184
@@ -11612,12 +11676,11 @@ msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
 #: composer/e-msg-composer-attachment.glade.h:2
 #, fuzzy
 msgid "Attachment Properties"
-msgstr "Manuse omadused"
+msgstr "Käivitaja häälestus"
 
 #: composer/e-msg-composer-attachment.glade.h:4
-#, fuzzy
 msgid "File name:"
-msgstr "Stiili nimi:"
+msgstr "Faili nimi:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
@@ -11632,17 +11695,17 @@ msgstr "Soovita manuse automaatset kuvamist"
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:508
 #, fuzzy
 msgid "Posting destination"
-msgstr "Kirjeldus puudub"
+msgstr "Vigane sihtkoht"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:509
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Lisa sõnumile manus"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:543
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu avamine ebaõnnestus"
@@ -11654,58 +11717,58 @@ msgstr "Aadressiraamatu avamine ebaõnnestus"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:573
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:579
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:585
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:594
 #, fuzzy
 msgid "To:"
-msgstr "Ülevalt:"
+msgstr "Kuhu:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:595
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:599
 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:601
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:603
 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:609
+#: composer/e-msg-composer-hdrs.c:610
 #, fuzzy
 msgid "Post To:"
-msgstr "Porto"
+msgstr "Postita gruppi "
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:615
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<kausta valimiseks kliki siia>"
@@ -11726,11 +11789,13 @@ msgid "Cannot encrypt outgoing message: No encryption certificate set for from a
 msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
 
 #: composer/e-msg-composer.c:789
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
-msgstr "Viga filtri täitmisel: %s: %s"
+msgstr ""
+"Viga faili: %s lugemisel\n"
+"%s"
 
 #: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
@@ -11738,19 +11803,19 @@ msgstr "Fail on juba olemas. Kirjutada üle?"
 
 #: composer/e-msg-composer.c:1172
 #: composer/e-msg-composer.c:1188
-#, fuzzy, c-format
+#, c-format
 msgid "Error saving file: %s"
-msgstr "Viga %s salvestamisel: %s"
+msgstr "Viga faili: %s salvestamisel"
 
 #: composer/e-msg-composer.c:1212
-#, fuzzy, c-format
+#, c-format
 msgid "Error loading file: %s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "Viga faili: %s laadimisel"
 
 #: composer/e-msg-composer.c:1250
-#, fuzzy, c-format
+#, c-format
 msgid "Error accessing file: %s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "Tõrge faili: %s avamisel"
 
 #: composer/e-msg-composer.c:1258
 #, fuzzy
@@ -11762,14 +11827,14 @@ msgstr "Sõnumi vastuvõtmine nurjus"
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
-msgstr "Puhverkausta pole võimalik avada"
+msgstr "Ei saa sulgeda mooduli faili \"%s\"."
 
 #: composer/e-msg-composer.c:1272
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
-msgstr ""
+msgstr "Ei saa avada faili '%s'"
 
 #: composer/e-msg-composer.c:1281
 #, fuzzy, c-format
@@ -11777,23 +11842,24 @@ msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
-"Väljundfaili loomine nurjus: %s\n"
-" %s"
+"Ei saa kopeerida faili:\n"
+"%s\n"
+"faili:\n"
+"%s"
 
 #: composer/e-msg-composer.c:1290
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
-msgstr "Viga %s salvestamisel: %s"
+msgstr "VIGA: Artikkel on tühi."
 
 #: composer/e-msg-composer.c:1394
-#, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
+"Ximian Evolution leidis eelmisest sessioonist pärit salvestamata faile.\n"
 "Kas sa soovid üritada nende taastamist?"
 
 #: composer/e-msg-composer.c:1558
@@ -11807,6 +11873,10 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
+#: composer/e-msg-composer.c:1560
+msgid "Untitled Message"
+msgstr "Pealkirjata sõnum"
+
 #: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
@@ -11816,12 +11886,11 @@ msgid "Open file"
 msgstr "Ava fail"
 
 #: composer/e-msg-composer.c:2045
-#, fuzzy
 msgid "Signature:"
-msgstr "Singapur"
+msgstr "Allkiri:"
 
 #: composer/e-msg-composer.c:2085
-#: mail/mail-account-gui.c:1259
+#: mail/mail-account-gui.c:1311
 msgid "Autogenerated"
 msgstr ""
 
@@ -11839,9 +11908,8 @@ msgstr ""
 #: composer/e-msg-composer.c:2312
 #: composer/e-msg-composer.c:3053
 #: composer/e-msg-composer.c:3054
-#, fuzzy
 msgid "Compose a message"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Sõnumi koostamine"
 
 #: composer/e-msg-composer.c:3083
 msgid ""
@@ -11868,19 +11936,19 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4239
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
-msgstr "Ximian Evolution"
+msgstr "Näita infot Ximian Evolutioni kohta"
 
 #: data/evolution.desktop.in.in.h:2
 #, fuzzy
 msgid "Ximian Evolution (Unstable)"
-msgstr "Ximian Evolution"
+msgstr "Ximian Evolutionist"
 
 #: data/evolution.keys.in.in.h:1
 #, fuzzy
@@ -11890,7 +11958,7 @@ msgstr "Aadressikaart"
 #: data/evolution.keys.in.in.h:2
 #, fuzzy
 msgid "calendar information"
-msgstr "Kalendri info"
+msgstr "Informatsioon/Kalender"
 
 #: designs/OOA/ooa.glade.h:1
 msgid ""
@@ -11902,12 +11970,12 @@ msgstr ""
 #: designs/OOA/ooa.glade.h:4
 #, fuzzy
 msgid "<b>Out of Office Message:</b>"
-msgstr "Kontorist väljas"
+msgstr "Teade kõigile kasutajalt %s@%s"
 
 #: designs/OOA/ooa.glade.h:5
 #, fuzzy
 msgid "<b>Status:</b>"
-msgstr "<b>Algus:</b> "
+msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
@@ -11916,30 +11984,33 @@ msgid ""
 msgstr ""
 
 #: designs/OOA/ooa.glade.h:8
+#, fuzzy
 msgid "I am currently in the office"
-msgstr ""
+msgstr "Rakenda muutused avatud postkastis"
 
 #: designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr ""
 
 #: designs/OOA/ooa.glade.h:10
+#, fuzzy
 msgid "No, Don't Change Status"
-msgstr ""
+msgstr "Ära muuda olemasolevate kataloogide vormingut"
 
 #: designs/OOA/ooa.glade.h:12
 #, fuzzy
 msgid "Out of Office Assistant"
-msgstr "Kontorist väljas"
+msgstr "Evolution'i kontoassistent"
 
 #: designs/OOA/ooa.glade.h:13
 #, fuzzy
 msgid "Yes, Change Status"
-msgstr "Olek"
+msgstr "GGV juhtimise staatus"
 
 #: designs/read_receipts/read.glade.h:1
+#, fuzzy
 msgid "      "
-msgstr ""
+msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
 #, fuzzy
@@ -11949,7 +12020,7 @@ msgstr "E-posti vastuvõtmine"
 #: designs/read_receipts/read.glade.h:3
 #, fuzzy
 msgid "<b>Sending Email:</b>"
-msgstr "Saada sõnum"
+msgstr "meili info"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
@@ -11972,7 +12043,7 @@ msgstr ""
 #: designs/read_receipts/read.glade.h:9
 #, fuzzy
 msgid "Read Receipts"
-msgstr "Adressaadid"
+msgstr "%s: ei suuda lugeda %s\n"
 
 #: designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
@@ -11986,7 +12057,7 @@ msgstr ""
 msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -11994,32 +12065,37 @@ msgstr ""
 "Antud nimega fail eksisteerib.\n"
 "Kirjutada üle?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 #, fuzzy
 msgid "Overwrite file?"
-msgstr "Kirjuta üle"
+msgstr "Kirjuta fail üle"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Jäta see parool meelde"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
 #: e-util/e-pilot-settings.c:93
+#, fuzzy
 msgid "Sync Private Records:"
-msgstr ""
+msgstr "Privaatvõtme genereerimine."
 
 #: e-util/e-pilot-settings.c:102
 #, fuzzy
 msgid "Sync Categories:"
-msgstr "Kategooriad"
+msgstr "trustdb: sync ebaõnnestus: %s\n"
 
 #  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.
+#. 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
 #, fuzzy
@@ -12050,53 +12126,53 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y"
 
-#. strptime format of a date and a time, in 12-hour format.
+#  strptime format of a date and a time, in 12-hour format.
 #: e-util/e-time-utils.c:211
 #, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#. strptime format of a date and a time, in 24-hour format.
+#  strptime format of a date and a time, in 24-hour format.
 #: e-util/e-time-utils.c:215
 #, fuzzy
 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.
+#  strptime format of a date and a time, in 12-hour format,
+#  without seconds.
 #: e-util/e-time-utils.c:220
 #, fuzzy
 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.
+#  strptime format of a date and a time, in 24-hour format,
+#  without seconds.
 #: e-util/e-time-utils.c:225
 #, fuzzy
 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.
+#  strptime format of a date and a time, in 12-hour format,
+#  without minutes or seconds.
 #: e-util/e-time-utils.c:230
 #, fuzzy
 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.
+#  strptime format of a date and a time, in 24-hour format,
+#  without minutes or seconds.
 #: e-util/e-time-utils.c:235
 #, fuzzy
 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.
+#  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
 #, fuzzy
 msgid "%I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %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.
@@ -12112,8 +12188,8 @@ msgstr "%H:%M:%S"
 #. 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:1416
-#: widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414
+#: widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12123,8 +12199,8 @@ msgstr "%I:%M %p"
 #. 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:1413
-#: widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411
+#: widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12133,139 +12209,69 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "1 second ago"
-msgstr "1 sekund"
-
-#: filter/filter-datespec.c:65
-#, fuzzy, c-format
-msgid "%d seconds ago"
-msgstr "%d sekundit"
-
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "1 minute ago"
-msgstr "1 minut"
-
-#: filter/filter-datespec.c:66
-#, fuzzy, c-format
-msgid "%d minutes ago"
-msgstr "%d minutit"
-
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "1 hour ago"
-msgstr "1 tund"
-
-#: filter/filter-datespec.c:67
-#, fuzzy, c-format
-msgid "%d hours ago"
-msgstr "%d tundi"
-
-#: filter/filter-datespec.c:68
-#, fuzzy
-msgid "1 day ago"
-msgstr "1 päev"
-
-#: filter/filter-datespec.c:68
-#, fuzzy, c-format
-msgid "%d days ago"
-msgstr "%d päeva"
-
-#: filter/filter-datespec.c:69
-#, fuzzy
-msgid "1 week ago"
-msgstr "1 nädal"
-
-#: filter/filter-datespec.c:69
-#, fuzzy, c-format
-msgid "%d weeks ago"
-msgstr "%d nädalat"
-
-#: filter/filter-datespec.c:70
-#, fuzzy
-msgid "1 month ago"
-msgstr "kuu"
-
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:73
+#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:76
+#: filter/filter-datespec.c:77
+#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:187
 #, fuzzy, c-format
-msgid "%d months ago"
-msgstr "Iga %d. kuul"
-
-#: filter/filter-datespec.c:71
-msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, fuzzy, c-format
-msgid "%d years ago"
-msgstr "Iga %d. aastal"
-
-#: filter/filter-datespec.c:176
-#, fuzzy
 msgid "You must choose a date."
-msgstr "Sa unustasid kuupäeva valimata."
+msgstr "Sa valisid vigase kuupäeva."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 #, fuzzy
 msgid "<click here to select a date>"
-msgstr "Osavõtja lisamiseks vajuta siia"
+msgstr "<kausta valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:278
-#: filter/filter-datespec.c:289
-#, fuzzy
+#: filter/filter-datespec.c:290
+#: filter/filter-datespec.c:301
 msgid "now"
-msgstr "Madal"
+msgstr "praegu"
 
-#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#  strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:297
 #, fuzzy
 msgid "%d-%b-%Y"
 msgstr "%a, %d. %b %Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
 msgstr "Vali aeg, millega võrrelda"
 
-#: filter/filter-editor.c:114
-#: filter/filter.glade.h:4
-#, fuzzy
-msgid "Filter Rules"
-msgstr "Kataloogi kui"
-
 #: filter/filter-file.c:166
 #, fuzzy
 msgid "You must specify a file name."
-msgstr "Stiili nimi:"
+msgstr "Sa pead arhiivi nime sisestama."
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
-msgstr "'%s' ei ole kataloog"
+msgstr "Faili pole - sisestage uuesti või katkestage:"
 
-#: filter/filter-file.c:299
-#, fuzzy
+#: filter/filter-file.c:301
 msgid "Choose a file"
-msgstr "Vali tegevus"
+msgstr "Vali faili"
 
-#. and now for the action area
+#  and now for the action area
 #: filter/filter-filter.c:491
 #, fuzzy
-msgid "Then"
-msgstr "N"
+msgid "<b>Then</b>"
+msgstr "P_aremale, siis alla"
 
 #: filter/filter-folder.c:153
 #, fuzzy
 msgid "You must specify a folder."
-msgstr "Stiili nimi:"
+msgstr "Sa pead käsu määrama"
 
-#: filter/filter-folder.c:242
-#: filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243
+#: filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1147
 #, fuzzy
 msgid "Select Folder"
-msgstr "Vali ülesannete kaust"
+msgstr "Vali kalendrikaust"
 
 #: filter/filter-input.c:193
 #, c-format
@@ -12280,30 +12286,30 @@ msgstr ""
 #: filter/libfilter-i18n.h:26
 #: mail/em-migrate.c:923
 #: mail/mail-config.c:63
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Important"
-msgstr "Impordi..."
+msgstr "Tähtis"
 
-#. forest green
+#  forest green
 #: filter/filter-label.c:124
 #: mail/em-migrate.c:926
 #: mail/mail-config.c:66
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "To Do"
-msgstr "Togo"
+msgstr "midagi ei ole teha.\n"
 
-#. blue
+#  blue
 #: filter/filter-label.c:125
 #: mail/em-migrate.c:927
 #: mail/mail-config.c:67
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Later"
-msgstr "pärast"
+msgstr "Hilisemad artiklid"
 
-#: filter/filter-part.c:531
+#: filter/filter-part.c:532
 #: shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
@@ -12312,66 +12318,88 @@ msgstr "Test"
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime määrama."
 
-#: filter/filter-rule.c:751
-#, fuzzy
-msgid "Rule name: "
-msgstr "Stiili nimi:"
+#: filter/filter-rule.c:752
+msgid "Rule name:"
+msgstr "Reegli nimi:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 #, fuzzy
 msgid "Untitled"
-msgstr "Tiitel"
+msgstr "Nimetu"
 
-#: filter/filter-rule.c:772
+#: filter/filter-rule.c:779
 #, fuzzy
-msgid "If"
-msgstr "I"
+msgid "<b>If</b>"
+msgstr "'#if 0' kommentaar"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 #, fuzzy
 msgid "Execute actions"
-msgstr "Erandid"
+msgstr "Ei suuda kävitada programmi '%s'"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
 msgstr "kui kõik tingimised on täidetud"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 #, fuzzy
 msgid "if any criteria are met"
-msgstr "kui mõni tingimus on täidetud"
+msgstr "kui kõik tingimised on täidetud"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
 msgstr "väljaminev"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Võrdle"
+#, fuzzy
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
 #, fuzzy
-msgid "Edit Filters"
-msgstr "Redigeeri kõike"
+msgid "<b>Filter Rules</b>"
+msgstr "Kasutamata reeglid"
 
 #: filter/filter.glade.h:3
 #, fuzzy
-msgid "Edit VFolders"
-msgstr "Redigeeri kõike"
+msgid "<b>Virtual _Folders</b>"
+msgstr "Virtuaalsed kaustad"
+
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Kasutamata reeglid"
 
 #: filter/filter.glade.h:5
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vKausta allikad"
+
+#: filter/filter.glade.h:6
+msgid "Compare against"
+msgstr "Võrdle"
+
+#: filter/filter.glade.h:7
+msgid "Edit Filters"
+msgstr "Redigeeri filtreid"
+
+#: filter/filter.glade.h:8
+msgid "Edit VFolders"
+msgstr "Redigeeri VKaustu"
+
+#: filter/filter.glade.h:9
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:10
 msgid "Outgoing"
 msgstr "Väljaminev"
 
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:11
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12380,7 +12408,7 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12390,7 +12418,7 @@ msgstr ""
 "mis on suhteline filtri käivitamise hetkega.\n"
 "Näiteks: 2 nädalat tagasi"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:15
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
@@ -12399,84 +12427,70 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud ajahetkega."
 
-#: filter/filter.glade.h:13
-#: filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtuaalsed kaustad"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:18
 msgid "a time relative to the current time"
 msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:19
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter.glade.h:20
-#, fuzzy
+#: filter/filter.glade.h:23
 msgid "months"
-msgstr "kuu(d)"
+msgstr "kuud"
 
-#: filter/filter.glade.h:21
-#: mail/mail-config.glade.h:185
+#: filter/filter.glade.h:24
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "seconds"
-msgstr "teine"
+msgstr "sekundi järel"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:26
 #, fuzzy
 msgid "the current time"
-msgstr "Käesolev vaade"
+msgstr "Praegune _aeg"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:27
 #, fuzzy
 msgid "the time you specify"
-msgstr "määratud ajaga"
-
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vKausta allikad"
+msgstr "Sa pead nime määrama."
 
-#: filter/filter.glade.h:26
-#, fuzzy
+#: filter/filter.glade.h:28
 msgid "weeks"
-msgstr "nädal(at)"
+msgstr "nädalat"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:29
 msgid "with all active remote folders"
 msgstr "koos kõigi aktiivsete võrgukaustadega"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:30
 msgid "with all local and active remote folders"
 msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:31
 msgid "with all local folders"
 msgstr "koos kõigi kohalike kalatoogidega"
 
-#: filter/filter.glade.h:30
-#, fuzzy
+#: filter/filter.glade.h:32
 msgid "years"
-msgstr "aasta(t)"
+msgstr "aastat"
 
-#. Automatically generated. Do not edit.
+#  Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
 msgid "Adjust Score"
-msgstr "Määra skoor"
+msgstr "Kohanda hinnet"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Määra värvus"
 
 #: filter/libfilter-i18n.h:4
-#, fuzzy
 msgid "Assign Score"
-msgstr "Määratud"
+msgstr "Omista hinne"
 
 #: filter/libfilter-i18n.h:5
 msgid "Attachments"
@@ -12488,9 +12502,8 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
 msgid "contains"
-msgstr "Kokkuvõte sisaldab"
+msgstr "sisaldab"
 
 #: filter/libfilter-i18n.h:8
 #, fuzzy
@@ -12502,43 +12515,37 @@ msgid "Date received"
 msgstr "Vastuvõtmise kuupäev"
 
 #: filter/libfilter-i18n.h:10
-#, fuzzy
 msgid "Date sent"
-msgstr "Kirje saadetud!\n"
+msgstr "Saatmise kuupäev"
 
 #: filter/libfilter-i18n.h:12
-#, fuzzy
 msgid "Deleted"
-msgstr "Kustuta"
+msgstr "Kustutatud"
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
 msgid "does not contain"
-msgstr "Kommentaar sisaldab"
+msgstr "ei sisalda"
 
 #: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ei lõppe"
 
 #: filter/libfilter-i18n.h:15
-#, fuzzy
 msgid "does not exist"
-msgstr "Aadressiraamatut ei leitud"
+msgstr "ei eksisteeri"
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
 msgid "does not return"
-msgstr "ei ole olemas"
+msgstr "ei tagasta"
 
 #: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
-msgstr "Kaarti ei leitud"
+msgstr "Funktsiooni pole olemas"
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
 msgid "does not start with"
-msgstr "EI saa käivitada wombatit"
+msgstr "ei alga"
 
 #: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
@@ -12549,47 +12556,43 @@ msgid "Draft"
 msgstr "Mustand"
 
 #: filter/libfilter-i18n.h:21
-#, fuzzy
 msgid "ends with"
-msgstr "Nimi algab stringiga"
+msgstr "lõpeb"
 
 #: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Exist"
-msgstr "Loend"
+msgstr "Moodulit \"%s\" pole olemas."
 
 #: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "on olemas"
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
 msgid "Expression"
-msgstr "Elukutse"
+msgstr "Avaldis"
 
 #: filter/libfilter-i18n.h:25
+#, fuzzy
 msgid "Follow Up"
-msgstr ""
+msgstr "Liiguta üles"
 
 #: filter/libfilter-i18n.h:27
-#, fuzzy
 msgid "is"
-msgstr "Loend"
+msgstr "on"
 
 #: filter/libfilter-i18n.h:28
-#, fuzzy
 msgid "is after"
-msgstr "pärast"
+msgstr "on peale"
 
 #: filter/libfilter-i18n.h:29
-#, fuzzy
 msgid "is before"
-msgstr "enne"
+msgstr "on enne"
 
 #: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
-msgstr "Tähistatud"
+msgstr "/_Tõmba märgistatud artiklid"
 
 #: filter/libfilter-i18n.h:31
 msgid "is greater than"
@@ -12606,29 +12609,31 @@ msgstr "ei ole"
 #: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
-msgstr "Tähistatud"
+msgstr "%s ei ole tõene."
 
 #: filter/libfilter-i18n.h:36
 #, fuzzy
 msgid "Junk Test"
-msgstr "Juuni"
+msgstr "Html test"
 
 #: filter/libfilter-i18n.h:37
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
-#, fuzzy
 msgid "Label"
-msgstr "Laurel"
+msgstr "Silt"
 
 #: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Mailing list"
-msgstr "Viga listi lisamisel"
+msgstr "Filter _postiloendi järgi"
 
 #: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Message Body"
-msgstr "Näidatav sõnum:"
+msgstr ""
+"\n"
+" Palun vaadake teade üle:\n"
+"\n"
 
 #: filter/libfilter-i18n.h:40
 msgid "Message Header"
@@ -12637,17 +12642,16 @@ msgstr "Kirja päis"
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Message is Junk"
-msgstr "Sõnum saadeti"
+msgstr "VIGA: Artikkel on tühi."
 
 #: filter/libfilter-i18n.h:42
 #, fuzzy
 msgid "Message is not Junk"
-msgstr "Ei leia sõnumit %s"
+msgstr "Fail '%s' pole sõnumikataloog."
 
 #: filter/libfilter-i18n.h:43
-#, fuzzy
 msgid "Move to Folder"
-msgstr "Tõsta kausta..."
+msgstr "Tõsta kausta"
 
 #: filter/libfilter-i18n.h:44
 #, fuzzy
@@ -12655,15 +12659,14 @@ msgid "Pipe Message to Shell Command"
 msgstr "Saada kontaktile sõnum"
 
 #: filter/libfilter-i18n.h:45
-#, fuzzy
 msgid "Play Sound"
-msgstr "Mängi heli:"
+msgstr "Mängi heli"
 
 #: filter/libfilter-i18n.h:46
 #: mail/message-tag-followup.c:68
 #, fuzzy
 msgid "Read"
-msgstr "Raadio"
+msgstr "Loe"
 
 #: filter/libfilter-i18n.h:47
 msgid "Recipients"
@@ -12678,42 +12681,36 @@ msgid "Replied to"
 msgstr "Vastatud kellele"
 
 #: filter/libfilter-i18n.h:50
-#, fuzzy
 msgid "returns"
-msgstr "Burns"
+msgstr "tagastab"
 
 #: filter/libfilter-i18n.h:51
-#, fuzzy
 msgid "returns greater than"
-msgstr "on suurem kui"
+msgstr "tagastab rohkem kui"
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
 msgid "returns less than"
-msgstr "on väiksem kui"
+msgstr "tagastab vähem kui"
 
 #: filter/libfilter-i18n.h:53
 #: filter/score-rule.c:184
 #: filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
-#, fuzzy
 msgid "Score"
-msgstr "Allikas"
+msgstr "Hinne"
 
 #: filter/libfilter-i18n.h:54
-#, fuzzy
 msgid "Sender"
-msgstr "Meeldetuletaja"
+msgstr "Saatja"
 
 #: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Set Status"
-msgstr "Olek"
+msgstr "Olekutekst"
 
 #: filter/libfilter-i18n.h:56
-#, fuzzy
 msgid "Shell Command"
-msgstr "Firma"
+msgstr "Kesta käsk"
 
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
@@ -12736,14 +12733,13 @@ msgid "starts with"
 msgstr "algab"
 
 #: filter/libfilter-i18n.h:63
-#, fuzzy
 msgid "Stop Processing"
-msgstr "Elukutse"
+msgstr "Peata töötlemine"
 
 #: filter/libfilter-i18n.h:64
-#: mail/em-format-html.c:1484
+#: mail/em-format-html.c:1512
 #: mail/em-format-quote.c:301
-#: mail/em-format.c:747
+#: mail/em-format.c:748
 #: mail/em-mailer-prefs.c:72
 #: mail/message-list.etspec.h:13
 #: mail/message-tag-followup.c:305
@@ -12754,73 +12750,60 @@ msgstr "Teema"
 #: filter/libfilter-i18n.h:65
 #, fuzzy
 msgid "Unset Status"
-msgstr "Ühendriigid"
+msgstr "Olekutekst"
 
 #: filter/rule-context.c:682
-#: filter/rule-editor.c:243
-#: filter/rule-editor.c:328
+#: filter/rule-editor.c:239
+#: filter/rule-editor.c:326
 #: mail/mail-vfolder.c:1007
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
 
-#: filter/rule-editor.c:172
-#, fuzzy
-msgid "Rules"
-msgstr "Roll"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
 #: filter/rule-editor.c:375
-#, fuzzy
 msgid "Edit Rule"
-msgstr "Redigeeri kõike"
+msgstr "Muuda reeglit"
 
 #: filter/rule-editor.c:699
-#, fuzzy
 msgid "Rule name"
-msgstr "Stiili nimi:"
+msgstr "Reegli nimi"
 
 #: filter/score-editor.c:114
-#, fuzzy
 msgid "Score Rules"
-msgstr "Korduse reegel"
+msgstr "Hindereeglid"
 
 #: filter/searchtypes.xml.h:1
-#, fuzzy
 msgid "Body contains"
-msgstr "Kokkuvõte sisaldab"
+msgstr "Sisu sisaldab"
 
 #: filter/searchtypes.xml.h:2
-#, fuzzy
 msgid "Body does not contain"
-msgstr "Kommentaar sisaldab"
+msgstr "Sisu ei sisalda"
 
 #: filter/searchtypes.xml.h:3
 msgid "Body or subject contains"
 msgstr "Sisu või teema sisaldab"
 
 #: filter/searchtypes.xml.h:4
-#, fuzzy
 msgid "Message contains"
-msgstr "Sõnumialarmi häälestus"
+msgstr "Sõnum sisaldab"
 
 #: filter/searchtypes.xml.h:5
 #, fuzzy
 msgid "Recipients contain"
-msgstr "Kirjeldus sisaldab"
+msgstr "ei sisalda"
 
 #: filter/searchtypes.xml.h:6
-#, fuzzy
 msgid "Sender contains"
-msgstr "Kokkuvõte sisaldab"
+msgstr "Saatja sisaldab"
 
 #: filter/searchtypes.xml.h:7
-#, fuzzy
 msgid "Subject contains"
-msgstr "Kokkuvõte sisaldab"
+msgstr "Teema sisaldab"
 
 #: filter/searchtypes.xml.h:8
 msgid "Subject does not contain"
@@ -12830,18 +12813,18 @@ msgstr "Teema ei sisalda"
 msgid "You must name this vfolder."
 msgstr "Sa pead sellele vKaustale nime määrama."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:585
-#, fuzzy
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
-msgstr "Paberiallikas:"
+msgstr "VKausta allikas"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
 msgid "Composer Preferences"
-msgstr ""
+msgstr "Kella häälestus"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Configure mail preferences, including security and message display, here"
@@ -12859,7 +12842,7 @@ msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Evolution Mail"
-msgstr "Evolution'i alarm "
+msgstr "Meiliklient Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
@@ -12869,13 +12852,13 @@ msgstr "Evolution'i kontoredaktor"
 #: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Mail component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgstr "Meiliklient Evolution"
 
 # !PARANDA!
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Mail composer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Meiliklient Evolution"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
@@ -12891,61 +12874,51 @@ msgstr "Evolution'i kalendri iTip/iMip vaataja"
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
 msgid "Evolution Mail preferences control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgstr "Evolution Meili seadistuste "
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/em-folder-browser.c:826
+#: mail/em-folder-browser.c:830
 #: mail/importers/elm-importer.c:418
 #: mail/importers/netscape-importer.c:1872
 #: mail/importers/pine-importer.c:473
-#, fuzzy
 msgid "Mail"
-msgstr "Postiprogramm:"
+msgstr "Meil"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
 msgid "Mail Accounts"
-msgstr "Kontod"
+msgstr "Meilikontod"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 msgid "Mail Preferences"
-msgstr ""
+msgstr "Meili häälestus"
 
 #: mail/em-account-prefs.c:233
-#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #: mail/em-account-prefs.c:241
-#, fuzzy
 msgid "Don't delete"
-msgstr "Kustuta"
+msgstr "Ära kustuta"
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:439
-#, fuzzy
+#  translators: default account indicator
+#: mail/em-account-prefs.c:445
 msgid "[Default]"
-msgstr "_Vaikimisi"
+msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:493
-#, fuzzy
+#: mail/em-account-prefs.c:499
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:495
-#, fuzzy
+#: mail/em-account-prefs.c:501
 msgid "Protocol"
-msgstr "Puerto Rico"
+msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226
 #: mail/em-composer-prefs.c:353
 #: mail/mail-config.c:1252
-#, fuzzy
 msgid "Unnamed"
-msgstr "Nimetu nimekiri"
+msgstr "Nimetu"
 
 #: mail/em-composer-prefs.c:337
 #, fuzzy
@@ -12954,24 +12927,20 @@ msgstr "Stiili nimi:"
 
 #: mail/em-composer-prefs.c:396
 #: mail/em-composer-prefs.c:458
-#, fuzzy
 msgid "[script]"
-msgstr "Kirjeldus puudub"
+msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:862
-#, fuzzy
+#: mail/em-composer-prefs.c:880
 msgid "Language(s)"
-msgstr "Keel"
+msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:900
-#, fuzzy
+#: mail/em-composer-prefs.c:922
 msgid "Add script signature"
-msgstr "Lisa tingimus"
+msgstr "Lisa allkirjaskript"
 
-#: mail/em-composer-prefs.c:920
-#, fuzzy
+#: mail/em-composer-prefs.c:942
 msgid "Signature(s)"
-msgstr "minuti(t)"
+msgstr "Allkiri(jad)"
 
 #: mail/em-composer-utils.c:124
 #, c-format
@@ -12994,9 +12963,8 @@ msgid "Since the contact list you are sending to is configured to hide the list'
 msgstr ""
 
 #: mail/em-composer-utils.c:157
-#, fuzzy
 msgid "This message contains only Bcc recipients."
-msgstr "Sõnum sisaldab ainult toetamata päringuid."
+msgstr "See sõnum sisaldab ainult BCC saajaid."
 
 #: mail/em-composer-utils.c:162
 msgid ""
@@ -13014,156 +12982,177 @@ msgid ""
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/em-folder-browser.c:133
-#, fuzzy
+#: mail/em-folder-browser.c:137
 msgid "Create _Virtual Folder From Search..."
-msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
+msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
 #: mail/em-folder-properties.c:120
-#, fuzzy
 msgid "Folder properties"
-msgstr "Omadused"
+msgstr "Kausta omadused"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
 #: mail/em-folder-properties.c:126
-#, fuzzy
 msgid "Properties"
-msgstr "Edenemine"
+msgstr "Omadused"
 
-#. TODO: can this be done in a loop?
+#  TODO: can this be done in a loop?
 #: mail/em-folder-properties.c:135
-#, fuzzy
 msgid "Folder Name"
-msgstr "Perekonnanimi"
+msgstr "Kausta nimi"
 
 #: mail/em-folder-properties.c:146
-#, fuzzy
 msgid "Total messages"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Sõnumeid kokku"
 
 #: mail/em-folder-properties.c:158
-#, fuzzy
 msgid "Unread messages"
-msgstr "Järgmisele lugemata sõnumile"
+msgstr "Lugemata sõnumid"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: mail/em-folder-selector.c:137
+#: mail/em-folder-selector.c:166
 #: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Loo _uus kaust..."
+msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:137
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-selector.c:166
+#: mail/em-folder-tree.c:2217
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: mail/em-folder-selector.c:260
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
 msgid "Folder _name:"
-msgstr "_Kaust:"
+msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree-model.c:163
-#: mail/em-folder-tree-model.c:165
+#: mail/em-folder-tree-model.c:196
+#: mail/em-folder-tree-model.c:198
 #: mail/mail-vfolder.c:855
-#, fuzzy
 msgid "VFolders"
-msgstr "_Kaust:"
+msgstr "VKaustad"
 
-#: mail/em-folder-tree-model.c:173
-#: mail/em-folder-tree-model.c:175
+#: mail/em-folder-tree-model.c:206
+#: mail/em-folder-tree-model.c:208
+#, fuzzy
 msgid "UNMATCHED"
-msgstr ""
+msgstr "Puudub \\{"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:201
-#: mail/em-folder-tree-model.c:203
+#: mail/em-folder-tree-model.c:236
+#: mail/em-folder-tree-model.c:238
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:446
-#: mail/em-folder-tree-model.c:729
+#: mail/em-folder-tree-model.c:483
+#: mail/em-folder-tree-model.c:792
 msgid "Loading..."
 msgstr "Laen..."
 
-#: mail/em-folder-tree.c:817
+#: mail/em-folder-tree.c:874
+#, c-format
+msgid "Moving folder %s"
+msgstr "Kausta %s liigutamine"
+
+#: mail/em-folder-tree.c:876
+#, c-format
+msgid "Copying folder %s"
+msgstr "Kausta %s kopeerimine"
+
+#: mail/em-folder-tree.c:883
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Sõnumite liigutamine %s kausta"
+
+#: mail/em-folder-tree.c:885
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Sõnumite kopeerimine %s kausta"
+
+#: mail/em-folder-tree.c:901
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:1760
+#: mail/em-folder-tree.c:1947
 #, fuzzy, c-format
 msgid "Cannot move folder `%s': illegal operation"
-msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
+msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: mail/em-folder-tree.c:1789
-#: mail/em-folder-tree.c:1878
-#, c-format
+#: mail/em-folder-tree.c:1976
+#: mail/em-folder-tree.c:2152
+#, fuzzy, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: mail/em-folder-tree.c:1805
-#: mail/em-folder-tree.c:1818
-#: mail/em-folder-view.c:660
-#: mail/em-folder-view.c:674
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/em-folder-tree.c:1992
+#: mail/em-folder-tree.c:2005
+#: mail/em-folder-view.c:642
+#: mail/em-folder-view.c:656
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder"
-msgstr "Vali ülesannete kaust"
+msgstr "Vali kalendrikaust"
+
+#: mail/em-folder-tree.c:2032
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Viga kataloogi \"%s\" loomisel: %s\n"
 
-#: mail/em-folder-tree.c:1913
+#: mail/em-folder-tree.c:2217
+#: mail/mail-component.c:638
 #, fuzzy
 msgid "Create folder"
-msgstr "Loo uue kausta"
+msgstr "Uus _kataloog"
 
-#: mail/em-folder-tree.c:2032
+#: mail/em-folder-tree.c:2336
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
-msgstr "Ei saa avada kausta '%s'"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
 
-#: mail/em-folder-tree.c:2057
+#: mail/em-folder-tree.c:2361
 #, fuzzy, c-format
 msgid "Cannot delete local %s folder."
-msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
+msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/em-folder-tree.c:2063
+#: mail/em-folder-tree.c:2367
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: mail/em-folder-tree.c:2073
+#: mail/em-folder-tree.c:2377
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Kustuta"
 
-#: mail/em-folder-tree.c:2107
+#: mail/em-folder-tree.c:2411
 #, fuzzy, c-format
 msgid "Cannot rename local %s folder."
-msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
+msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: mail/em-folder-tree.c:2116
+#: mail/em-folder-tree.c:2420
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2422
 #, fuzzy
 msgid "Rename Folder"
-msgstr "Kausta nime muutmine"
+msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2142
-#, c-format
+#: mail/em-folder-tree.c:2446
+#, fuzzy, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgstr "Nimi \"%s\" on juba siin kaustas olemas. Palun kasuta teist nime."
 
-#: mail/em-folder-tree.c:2188
+#: mail/em-folder-tree.c:2492
 #: ui/evolution-addressbook.xml.h:45
 #: ui/evolution-mail-global.xml.h:18
 #: ui/evolution-mail-messagedisplay.xml.h:8
@@ -13171,210 +13160,224 @@ msgstr ""
 #: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_View"
-msgstr "Päeva vaade"
+msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2189
+#: mail/em-folder-tree.c:2493
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ava uues aknas"
 
-#: mail/em-folder-tree.c:2194
+#: mail/em-folder-tree.c:2498
 #, fuzzy
 msgid "_Move"
-msgstr "_E"
+msgstr "_Liiguta"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2198
+#: mail/em-folder-tree.c:2502
 #, fuzzy
 msgid "_New Folder..."
-msgstr "Mine kausta..."
+msgstr "Uus kataloog"
 
-#: mail/em-folder-tree.c:2201
+#: mail/em-folder-tree.c:2505
 #, fuzzy
 msgid "_Rename"
-msgstr "_Eemalda"
+msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2204
+#: mail/em-folder-tree.c:2508
 #: ui/evolution-mail-list.xml.h:27
 #, fuzzy
 msgid "_Properties..."
-msgstr "Kate_gooriad..."
+msgstr "_Omadused..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751
+#: mail/em-folder-view.c:741
 #: mail/em-popup.c:688
 #, fuzzy
 msgid "_Edit as New Message..."
-msgstr "Vigane ülesande sõnum"
+msgstr "/Redaktor/Sea _taustapildiks"
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:756
-#: ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:757
+#: mail/em-folder-view.c:747
 #: mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:758
+#: mail/em-folder-view.c:748
 #: mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Reply to _All"
-msgstr "Eemalda kõik"
+msgstr "Vasta kõigile"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:749
 #: mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
+#, fuzzy
 msgid "Follo_w Up..."
-msgstr ""
+msgstr "Liiguta üles"
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 #, fuzzy
 msgid "Fla_g Completed"
-msgstr "Lõpetatud"
+msgstr "%s kirjutamine valmis"
 
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
 #, fuzzy
 msgid "Cl_ear Flag"
-msgstr "Puhasta"
+msgstr "   a   lülitada buuditavuse lipp sisse/välja"
 
-#: mail/em-folder-view.c:767
-#: ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 #, fuzzy
 msgid "Mark as _Unread"
-msgstr "Märgi kui l_ugemata"
+msgstr "/_Artiklid/Mä_rgi kui lugemata"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 #, fuzzy
 msgid "Mark as _Important"
-msgstr "_Märgi lõpetatuks"
+msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 #, fuzzy
 msgid "_Mark as Unimportant"
-msgstr "_Märgi lõpetatuks"
+msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:771
-#: ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Märgi kui l_ugemata"
 
-#: mail/em-folder-view.c:772
-#: ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
-msgstr "Märgi tä_htsaks"
+msgstr "Märgi vähetä_htsaks"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Kustuta"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 #, fuzzy
 msgid "Mo_ve to Folder..."
-msgstr "Tõsta kausta..."
+msgstr "_Tõsta prügikasti"
 
-#: mail/em-folder-view.c:780
+#: mail/em-folder-view.c:770
 #: ui/evolution-addressbook.xml.h:32
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 #, fuzzy
 msgid "Add Sender to Address_book"
-msgstr "Salvesta aadressiraamatusse"
+msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 #, fuzzy
 msgid "Appl_y Filters"
-msgstr "Rakenda filtrid"
+msgstr "_Rakenda filtreid"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "in_arcnet(%s): sodi lõpus\n"
+
+#: mail/em-folder-view.c:785
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Kalendri sõnum"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 #, fuzzy
 msgid "VFolder on Mailing _List"
-msgstr "Ülesandeid sisaldav kaust"
+msgstr "Filter _postiloendi järgi"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
 #, fuzzy
 msgid "VFolder on Thread"
-msgstr "VKaust _saatja järgi"
+msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 #, fuzzy
 msgid "Filter on Thread"
-msgstr "Nurjumine teate %d juures"
+msgstr "Filter _adressaatide järgi"
+
+#  default charset used in mail view
+#. default charset used in mail view
+#: mail/em-folder-view.c:1583
+#: mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:41
+msgid "Default"
+msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 #, fuzzy
 msgid "Print Message"
-msgstr "Trüki ülesanded"
+msgstr "Trükib valitud sõnumi"
 
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
 #, fuzzy
 msgid "_Copy Link Location"
-msgstr "Kopeeri viida asukoht"
+msgstr "Kopeeri _link"
 
 #: mail/em-folder-view.c:2171
 #, fuzzy, c-format
 msgid "Click to mail %s"
-msgstr "Ülesande lisamiseks vajuta siia"
+msgstr "Meiliserveriga ühendamine"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:402
 #, fuzzy, c-format
 msgid "Matches: %d"
-msgstr "Vastavusi:"
+msgstr "Ei leia: %s"
 
 #: mail/em-format-html-display.c:638
 #: mail/em-format-html.c:562
@@ -13392,7 +13395,7 @@ msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
 #: mail/em-format-html.c:563
 #, fuzzy
 msgid "Valid signature"
-msgstr "Lisa tingimus"
+msgstr "Allkiri on kehtiv kuni? (0) "
 
 # !PARANDA! - kas on ikka täpne tõlge?
 #: mail/em-format-html-display.c:639
@@ -13404,7 +13407,7 @@ msgstr "See sõnum on digitaalselt allkirjastatud kuid ei ole autentne."
 #: mail/em-format-html.c:564
 #, fuzzy
 msgid "Invalid signature"
-msgstr "vigane aeg"
+msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
 #: mail/em-format-html-display.c:640
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
@@ -13412,8 +13415,9 @@ msgstr ""
 
 #: mail/em-format-html-display.c:641
 #: mail/em-format-html.c:565
+#, fuzzy
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
 #: 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."
@@ -13431,8 +13435,9 @@ msgstr ""
 
 #: mail/em-format-html-display.c:648
 #: mail/em-format-html.c:572
+#, fuzzy
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "nõrk võti"
 
 #: 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."
@@ -13442,7 +13447,7 @@ msgstr ""
 #: mail/em-format-html.c:573
 #, fuzzy
 msgid "Encrypted"
-msgstr "PGP krüpteerimine"
+msgstr "Krüpteeritud sõnum"
 
 #: 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."
@@ -13450,8 +13455,9 @@ msgstr ""
 
 #: mail/em-format-html-display.c:650
 #: mail/em-format-html.c:574
+#, fuzzy
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "Krüpteeritud sõnum"
 
 #: 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."
@@ -13460,48 +13466,48 @@ msgstr ""
 #: mail/em-format-html-display.c:734
 #, fuzzy
 msgid "_View Certificate"
-msgstr "_Sertifikaadi ID:"
+msgstr "_Ava sertifikaat"
 
 #: mail/em-format-html-display.c:739
 #, fuzzy
 msgid "This certificate is not viewable"
-msgstr "See sõnum ei ole hetkel kättesaadav"
+msgstr "See kataloog ei ole loetav."
 
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:972
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d. %b %l:%M %p"
+msgstr " vasakul:"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:980
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:983
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+msgstr "Grupeeritud:"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1053
 #, fuzzy
 msgid "_View Inline"
-msgstr "Kuva sõnumi sees"
+msgstr "Kuva sõnumi sees (%s abil)"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1054
 #, fuzzy
 msgid "_Hide"
-msgstr "_Liignimi:"
+msgstr "_Peida"
 
 #: mail/em-format-html-print.c:125
 #, fuzzy, c-format
 msgid "Page %d of %d"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "&[PAGE]"
 
 #: mail/em-format-html.c:455
 #: mail/em-format-html.c:457
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
-msgstr "Võtan vastu sõnumit %s"
+msgstr "Võtan vastu POP kokkuvõtet"
 
 #: mail/em-format-html.c:812
 msgid "Malformed external-body part."
@@ -13523,117 +13529,166 @@ msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
 #: mail/em-format-html.c:876
-#, c-format
+#, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
-msgstr ""
+msgstr "Viide kaugfailile"
 
 #: mail/em-format-html.c:887
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1129
 #, fuzzy
 msgid "Formatting message"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Sõnumi kuulajaskond"
 
-#: mail/em-format-html.c:1375
+#: mail/em-format-html.c:1406
 #: mail/em-format-quote.c:191
-#: mail/em-format.c:742
+#: mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67
 #: mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301
 #, fuzzy
 msgid "From"
-msgstr "R"
+msgstr "Saatja"
 
-#: mail/em-format-html.c:1375
+#: mail/em-format-html.c:1406
 #: mail/em-format-quote.c:191
-#: mail/em-format.c:743
+#: mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
+#, fuzzy
 msgid "Reply-To"
-msgstr ""
+msgstr "Vastus-Kuhu"
 
-#: mail/em-format-html.c:1375
+#: mail/em-format-html.c:1406
 #: mail/em-format-quote.c:191
-#: mail/em-format.c:744
+#: mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69
 #: mail/message-list.etspec.h:14
 #, fuzzy
 msgid "To"
-msgstr "Togo"
+msgstr "_kuni:"
 
-#: mail/em-format-html.c:1375
+#: mail/em-format-html.c:1406
 #: mail/em-format-quote.c:191
-#: mail/em-format.c:745
+#: mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format-html.c:1375
+#: mail/em-format-html.c:1406
 #: mail/em-format-quote.c:191
-#: mail/em-format.c:746
+#: mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/em-format-html.c:1491
+#. pseudo-header
+#: mail/em-format-html.c:1516
 #: mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:632
+#: mail/em-mailer-prefs.c:769
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
 #  translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1543
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1546
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1532
+#: mail/em-format-html.c:1556
 #: mail/em-format-quote.c:315
-#: mail/em-format.c:748
+#: mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73
 #: mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
-msgstr "Kuupäev:"
+msgstr "Kuupäev"
+
+#: mail/em-format-html.c:1577
+#: mail/em-format.c:750
+#: mail/em-mailer-prefs.c:74
+#, fuzzy
+msgid "Newsgroups"
+msgstr "Uudisegrupid"
 
-#: mail/em-format.c:963
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1042
-#: mail/em-format.c:1161
+#: mail/em-format.c:1066
+#: mail/em-format.c:1188
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ei saa saata sõnumit: %s"
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086
+#: mail/em-format.c:1106
+#: mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1295
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1314
+#: mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported signature format"
-msgstr "Toetamata skeem"
+msgstr "Toetamata failiformaat."
+
+#: mail/em-format.c:1352
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: mail/em-format.c:1322
+#: mail/em-format.c:1352
 #, fuzzy
 msgid "Unknown error verifying signature"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
+
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
 
 #: mail/em-junk-filter.c:82
+#, fuzzy
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "S_isseehitatud teemad:"
+
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Kopeeri k_ellaaeg"
+
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Once per day"
+msgstr "Püha Tib'i päev"
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "calendar:week_start:1"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "Sea kalendrikuu"
 
 #: mail/em-migrate.c:1079
 msgid ""
@@ -13642,28 +13697,28 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1800
-#: mail/em-migrate.c:1815
+#: mail/em-migrate.c:1843
+#: mail/em-migrate.c:1858
 #, fuzzy, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:1903
-#: mail/em-migrate.c:2004
+#: mail/em-migrate.c:1946
+#: mail/em-migrate.c:2047
 #, fuzzy, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2128
-#: mail/em-migrate.c:2300
+#: mail/em-migrate.c:2171
+#: mail/em-migrate.c:2343
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: mail/em-migrate.c:2140
+#: mail/em-migrate.c:2183
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr "'%s' avamine kirjutamiseks ebaõnnestus: %s"
 
 #: mail/em-popup.c:698
 msgid "Save As..."
@@ -13672,11 +13727,12 @@ msgstr "Salvesta kui..."
 #: mail/em-popup.c:716
 #, fuzzy, c-format
 msgid "untitled_image.%s"
-msgstr "Pealkirjata sõnum"
+msgstr "Tausta_pilt:"
 
 #: mail/em-popup.c:805
+#, fuzzy
 msgid "Set as _Background"
-msgstr ""
+msgstr "Sea _taustapildiks"
 
 #: mail/em-popup.c:807
 #, fuzzy
@@ -13686,22 +13742,22 @@ msgstr "_Vasta saatjale"
 #: mail/em-popup.c:855
 #, fuzzy
 msgid "_Open Link in Browser"
-msgstr "Ava uues aknas"
+msgstr "Ava _viit uues sakis"
 
 #: mail/em-popup.c:856
 #, fuzzy
 msgid "Se_nd message to..."
-msgstr "Saada kontaktile sõnum"
+msgstr "Sõnumi vastuvõtmine nurjus"
 
 #: mail/em-popup.c:857
 #, fuzzy
 msgid "_Add to Addressbook"
-msgstr "Aadressiraamat"
+msgstr "_Lisa paneelile"
 
 #: mail/em-popup.c:963
 #, fuzzy, c-format
 msgid "Open in %s..."
-msgstr "_Häälestus..."
+msgstr "_Avaneb"
 
 #: mail/em-subscribe-editor.c:606
 #, fuzzy
@@ -13711,13 +13767,13 @@ msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 #: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
-msgstr "Telli"
+msgstr "Tellitud"
 
 #: mail/em-subscribe-editor.c:639
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
-msgstr "_Kaust:"
+msgstr "Kataloog"
 
 #. FIXME: This is just to get the shadow, is there a better way?
 #: mail/em-subscribe-editor.c:827
@@ -13727,24 +13783,24 @@ msgstr "Palun vali server."
 #: mail/em-subscribe-editor.c:848
 #, fuzzy
 msgid "No server has been selected"
-msgstr "Antud sündmus on kustutatud."
+msgstr "Asukoht ei ole määratud!"
 
 #: mail/em-utils.c:97
 #, fuzzy
 msgid "Don't show this message again."
-msgstr "Seda küsimust rohkem mitte esitada."
+msgstr "Ä_ra näita seda teadet selle serveri kohta uuesti"
 
 #: mail/em-utils.c:279
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
-msgstr "Viga filtri analüüsil: %s: %s"
+msgstr "VIGA: info pole veel saadaval"
 
 #: mail/em-utils.c:288
 #, fuzzy
 msgid "Filters"
-msgstr "Kataloogi kui"
+msgstr "Filtrid"
 
 #: mail/em-utils.c:533
 msgid "-------- Forwarded Message --------"
@@ -13753,61 +13809,63 @@ msgstr "-------- Edastatud sõnum --------"
 #: mail/em-utils.c:1139
 #, fuzzy
 msgid "an unknown sender"
-msgstr "Tundmatu isik"
+msgstr "Tundmatu aken"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
 #: mail/em-utils.c:1149
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
+msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: mail/em-utils.c:1426
-#: mail/em-utils.c:1510
-#: mail/em-utils.c:1519
+#: mail/em-utils.c:1432
+#: mail/em-utils.c:1516
+#: mail/em-utils.c:1525
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
-msgstr ""
-"Ei saa kätte sõnumit: %s\n"
-"  %s"
+msgstr "Ei saa kävitaja muudatusi salvestada"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1437
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
-msgstr ""
-"%s on juba olemas\n"
-"Kas soovid üle kirjutada?"
+msgstr "Fail %s on juba olemas. Kas kirjutada üle?"
 
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1480
 #, fuzzy
 msgid "message"
 msgstr "Sõnum"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1532
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "'%s' ei ole kataloog"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1586
 #, fuzzy
 msgid "Save Message..."
-msgstr "Serveri teade:"
+msgstr "Salvesta artikkel faili"
 
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1635
 #, fuzzy
 msgid "Add address"
-msgstr "Aadress"
+msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
+
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:2070
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Andmed (%s -st)"
 
-#: mail/em-utils.c:2088
+#: mail/em-utils.c:2121
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/em-utils.c:2419
+#: mail/em-utils.c:2452
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%s'. If you continue, you will not be able to recover these messages.\n"
@@ -13818,7 +13876,7 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
-#: mail/em-utils.c:2445
+#: mail/em-utils.c:2477
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. If you continue, you will not be able to recover these messages.\n"
@@ -13832,121 +13890,126 @@ msgstr ""
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
-msgstr "_Kontrolli uusi sõnumeid automaatselt"
+msgstr "Lisa _viit järjehoidjatesse..."
 
 #: mail/evolution-mail.schemas.in.in.h:2
 #, fuzzy
 msgid "Automatic smiley recognition"
-msgstr "_Kontrolli uusi sõnumeid automaatselt"
+msgstr "_Automaatse sisselogimise kasutajanimi:"
 
 #: mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Check incoming mail being junk for IMAP accounts"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:5
+#, fuzzy
 msgid "Citation highlight colour"
-msgstr ""
+msgstr "Tõsta esile kriitilised ülesanded"
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:5
+#, fuzzy
 msgid "Citation highlight colour."
-msgstr ""
+msgstr "Tõsta esile kriitilised ülesanded"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Muuda rea kõrguse vaikeväärtust"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Muuda veergude laiuse vaikeväärtust"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Lõikab valitud sõnumid"
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Lõikab valitud sõnumid"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Vaikimisi edastamisstiil"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
-msgstr "Lülitab kaustade riba sisse või välja"
+msgstr "Vaikimisi akna vertikaalsuurus"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
-msgstr "Lõikab valitud sõnumid"
+msgstr "Näitab sõnumi eelvaate akent"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default reply style"
-msgstr "Vaikimisi tähtsus:"
+msgstr "Vaikimisi raami laad:"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "Lülitab kaustade riba sisse või välja"
+msgstr "Vaikimisi akna vertikaalsuurus"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Message Window"
-msgstr "Lülitab kaustade riba sisse või välja"
+msgstr "Näitab sõnumi eelvaate akent"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:18
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:22
+#, fuzzy
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "Luba või keela heli"
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Saada sõnum hiljem"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:25
 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:26
+msgid "Last time empty trash was run"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:27
 msgid "List of Labels and their associated colours"
 msgstr ""
@@ -13954,7 +14017,7 @@ msgstr ""
 #: mail/evolution-mail.schemas.in.in.h:28
 #, fuzzy
 msgid "List of accounts"
-msgstr "Kontod"
+msgstr "Predikaatide loend:\n"
 
 #: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13983,7 +14046,7 @@ msgstr ""
 #: mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid "Log filter actions"
-msgstr "_Logi filtreerimised faili:"
+msgstr "Vali filtreerimislogi fail..."
 
 #: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
@@ -14017,290 +14080,303 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
 msgid "Message Window default hight"
-msgstr ""
+msgstr "Vaikimisi akna vertikaalsuurus"
 
 #: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
 msgid "Message Window default width"
-msgstr ""
+msgstr "Muuda veergude laiuse vaikeväärtust"
 
 #: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:46
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "E-posti seadistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 #, fuzzy
 msgid "New Mail Notify type"
-msgstr "E-posti seadistamine"
+msgstr "Uus parool uuesti: "
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
+#, fuzzy
 msgid "Prompt on empty subject"
-msgstr ""
+msgstr "tühi koht tableaul"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 #, fuzzy
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Run junk test on incoming mail for IMAP accounts (only valid if check_incoming is set to true)"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "S3kr3t 0pt10n"
 msgstr "S414j4n3 5uv4nd"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "S3kr3t 0pt10n."
 msgstr "S414j4n3 5uv4nd."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Send HTML mail by default"
-msgstr "Saata HTML sõnum?"
+msgstr "Saada sõnum HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:64
 #, fuzzy
 msgid "Send HTML mail by default."
-msgstr "Saata HTML sõnum?"
+msgstr "Saada sõnum HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Show Animations"
-msgstr "Näita kontakte"
+msgstr "Luba animatsioonid"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Näita aega kui"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:69
 #, fuzzy
 msgid "Show the \"Preview\" pane"
-msgstr "_Eelvaate paan"
+msgstr "Näita redigeerimispaani"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
 msgid "Show the \"Preview\" pane."
-msgstr ""
+msgstr "Näita redigeerimispaani"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
 msgid "Spell check inline"
-msgstr ""
+msgstr "Klõpsa õigekirja kontrollimiseks"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:74
 #, fuzzy
 msgid "Terminal font"
-msgstr "Esialgne kontakt:"
+msgstr "_Terminali kirjatüüp:"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 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:77
+#: mail/evolution-mail.schemas.in.in.h:79
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine meili näitamisel"
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 #, fuzzy
 msgid "Variable width font"
-msgstr "Muutlik"
+msgstr "Kirjaperekond määratud"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:102
 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:101
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:104
 #, fuzzy
 msgid "spamd port"
-msgstr "Impordi"
+msgstr "Pordi sisestusväli"
 
 # !PARANDA!
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Elm importer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Evolutioni VKaardi importija"
 
 # !PARANDA!
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
 msgid "Evolution Netscape Mail importer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Evolution'i intelligentne kalendriimportija"
 
 # !PARANDA!
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 #, fuzzy
 msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Impordib Outlook Express 4 faile Evolution'i"
 
 # !PARANDA!
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
 msgid "Evolution Pine importer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Evolutioni VKaardi importija"
 
 # !PARANDA!
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
 msgid "Evolution mbox importer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Evolutioni VKaardi importija"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
@@ -14315,17 +14391,17 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:215
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220
 #: mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Importing..."
-msgstr "Impordi..."
+msgstr "Impordin faile"
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:217
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222
 #: mail/importers/pine-importer.c:119
 msgid "Please wait"
@@ -14334,7 +14410,7 @@ msgstr "Palun oota"
 #: mail/importers/elm-importer.c:244
 #, fuzzy
 msgid "Importing Elm data"
-msgstr "Impordin faile"
+msgstr "   e   redigeerida sedame andmeid"
 
 #: mail/importers/elm-importer.c:436
 #, fuzzy
@@ -14349,28 +14425,28 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:115
+#: mail/importers/evolution-mbox-importer.c:116
 #, fuzzy
 msgid "Destination folder:"
-msgstr "Vali ülesannete kaust"
+msgstr "Vali sihtkataloog"
 
-#: mail/importers/evolution-mbox-importer.c:118
+#: mail/importers/evolution-mbox-importer.c:119
 #, fuzzy
 msgid "Select folder to import into"
-msgstr "Vali tegevus"
+msgstr "Määra kaust, mille alla tuleb kaust \"%s\" kopeerida:"
 
-#: mail/importers/evolution-mbox-importer.c:218
-#: mail/importers/evolution-outlook-importer.c:214
+#: mail/importers/evolution-mbox-importer.c:219
+#: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
 #, fuzzy, c-format
 msgid "Importing `%s'"
-msgstr "Impordi..."
+msgstr "Impordin faile"
 
-#: mail/importers/evolution-outlook-importer.c:261
+#: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
 #, fuzzy
 msgid "Importing mailbox"
-msgstr "Impordin faile"
+msgstr "Postkasti vorming"
 
 #: mail/importers/mail-importer.c:354
 #, c-format
@@ -14380,7 +14456,7 @@ msgstr "Kontrollin %s"
 #: mail/importers/netscape-importer.c:72
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
-msgstr "Tähtsus: %s"
+msgstr "Lisa filter"
 
 #: mail/importers/netscape-importer.c:650
 msgid ""
@@ -14421,17 +14497,17 @@ msgstr "Evolution impordib sinu Netscape andmeid"
 #: mail/importers/netscape-importer.c:1677
 #, fuzzy
 msgid "Importing Netscape data"
-msgstr "Evolution impordib sinu Netscape andmeid"
+msgstr "   e   redigeerida sedame andmeid"
 
 #: mail/importers/netscape-importer.c:1877
 #, fuzzy
 msgid "Settings"
-msgstr "_Sätted..."
+msgstr "Seaded"
 
 #: mail/importers/netscape-importer.c:1882
 #, fuzzy
 msgid "Mail Filters"
-msgstr "Postiprogramm:"
+msgstr "_Rakenda filtreid"
 
 #: mail/importers/netscape-importer.c:1903
 #, fuzzy
@@ -14449,7 +14525,7 @@ msgstr "Evolution impordib sinu Pine andmeid"
 #: mail/importers/pine-importer.c:313
 #, fuzzy
 msgid "Importing Pine data"
-msgstr "Impordin faile"
+msgstr "   e   redigeerida sedame andmeid"
 
 #: mail/importers/pine-importer.c:478
 msgid "Addressbook"
@@ -14467,22 +14543,22 @@ msgstr ""
 #: mail/importers/pine-importer.c:505
 #, fuzzy
 msgid "Pine"
-msgstr "Telefon"
+msgstr "Pine Bluff"
 
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
-msgstr "EI saa käivitada wombatit"
+msgstr "Kohandatud kellaformaat"
 
 #: mail/local-config.glade.h:2
 #, fuzzy
 msgid "Index body contents"
-msgstr "Sisu sisaldab"
+msgstr "Vigane sõnumi sisu"
 
 #: mail/local-config.glade.h:3
 #, fuzzy
 msgid "New store format:"
-msgstr "Aja vorming:"
+msgstr "Kohandatud kellaformaat"
 
 #: mail/local-config.glade.h:4
 msgid ""
@@ -14494,7 +14570,7 @@ msgstr ""
 #: mail/local-config.glade.h:7
 #, fuzzy
 msgid "maildir"
-msgstr "E-post"
+msgstr "ei ole maildir vormingus kataloog"
 
 #: mail/local-config.glade.h:8
 msgid "mbox"
@@ -14512,34 +14588,34 @@ msgstr ""
 #: mail/mail-account-editor.c:140
 #, fuzzy
 msgid "Evolution Account Editor"
-msgstr "Evolution'i uudiseredaktor"
+msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-account-gui.c:755
-#: mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:790
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Host:"
-msgstr "Kodu"
+msgstr "Server"
 
-#: mail/mail-account-gui.c:759
-#: mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:794
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
-msgstr "_Serveri nimi:"
+msgstr "Kasutajanimi"
 
-#: mail/mail-account-gui.c:763
-#: mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:798
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Path:"
-msgstr "_Perekonnanimi:"
+msgstr "_Otsingutee:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2074
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua ühe nimega kahte kontot."
 
 #: mail/mail-autofilter.c:75
 #, fuzzy, c-format
 msgid "Mail to %s"
-msgstr "Sõnumi saaja: %s"
+msgstr "Meiliaadressile"
 
 #: mail/mail-autofilter.c:261
 #, c-format
@@ -14554,20 +14630,21 @@ msgstr "Sõnumi saatja: %s"
 #: mail/mail-autofilter.c:294
 #, fuzzy, c-format
 msgid "%s mailing list"
-msgstr "Viga listi muutmisel"
+msgstr "Filter _postiloendi järgi"
 
 #: mail/mail-autofilter.c:318
 #, fuzzy, c-format
 msgid "Replies to %s"
-msgstr "Vastatud kellele"
+msgstr "Võrdne:"
 
 #: mail/mail-autofilter.c:373
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
 #: mail/mail-autofilter.c:422
+#, fuzzy
 msgid "The following filter rule(s):\n"
-msgstr ""
+msgstr "Lisa filtreerimisreegel"
 
 #: mail/mail-autofilter.c:428
 #, c-format
@@ -14577,32 +14654,47 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:587
 #, fuzzy
 msgid "New Mail Message"
-msgstr "Vigane koosoleku sõnum"
+msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:588
 #, fuzzy
 msgid "_Mail Message"
-msgstr "Kalendri sõnum"
+msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:589
 #, fuzzy
 msgid "Compose a new mail message"
-msgstr "Sõnumi koostamine"
+msgstr "Uute sõnumite kontroll"
+
+#: mail/mail-component.c:594
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Uus kataloogi nimi"
+
+#: mail/mail-component.c:595
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Avab kataloog"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:596
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Loo uus isehoidjate kaust"
+
+#: mail/mail-component.c:760
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, mida kalender näitab"
 
 #: mail/mail-config-druid.c:367
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identiteet"
 
@@ -14617,7 +14709,7 @@ msgstr ""
 #: mail/mail-config-druid.c:382
 #, fuzzy
 msgid "Receiving Mail"
-msgstr "Posti vastuvõtmine"
+msgstr "Teile on kirju\n"
 
 #: mail/mail-config-druid.c:377
 #, fuzzy
@@ -14633,7 +14725,7 @@ msgstr ""
 #: mail/mail-config-druid.c:387
 #, fuzzy
 msgid "Sending Mail"
-msgstr "Saada sõnum"
+msgstr "Meilisõnumi saatmine"
 
 #: mail/mail-config-druid.c:389
 #, fuzzy
@@ -14643,10 +14735,10 @@ msgstr ""
 "parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
 #: mail/mail-config-druid.c:394
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Account Management"
-msgstr "Konto nimi"
+msgstr "Failihaldus"
 
 #: mail/mail-config-druid.c:396
 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."
@@ -14660,135 +14752,134 @@ msgstr "Teenuse kontrollimine"
 #: mail/mail-config.c:1174
 #, fuzzy
 msgid "Connecting to server..."
-msgstr "Ühendan uuesti LDAP serveriga..."
+msgstr "Meiliserveriga ühendamine"
 
 #: mail/mail-config.glade.h:3
-msgid "    "
-msgstr ""
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad tüübid"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "See šiffer ei toeta allkirjastamist"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
+#, fuzzy
 msgid "<b>_Displayed Mail Headers</b>"
-msgstr ""
+msgstr "Päised ja jalused"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Editor"
-msgstr "Kontaktiredaktor"
+msgstr "Toimeti käivitusfail:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Account Information"
-msgstr "Info puudub"
+msgstr "Üldine teave"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Add Sc_ript"
-msgstr "Lisa tingimus"
+msgstr "_Lisa paneelile"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Add new signature..."
-msgstr "Allkirja salvestamine"
+msgstr "   n   lisada uus partitsioon"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Attach original message"
-msgstr "Lisa sõnumile manus"
+msgstr "Teatel puudub algne tekst!"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Authentication"
-msgstr "Autentimine ebaõnnestus."
+msgstr "autentimine"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
+#, fuzzy
 msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
+#, fuzzy
 msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
-msgstr "Tundmatu märgistik: %s"
+msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
-msgstr "_Sulge"
+msgstr "_Värvid"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
-msgstr "Uute sõnumite kontroll"
+msgstr "Tõmba uued sissetulevad kirjad"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Color for _misspelled words:"
-msgstr "Täna lõppevate ülesannete värvus"
+msgstr "Hilinenud ülesannete värvus"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Composing Messages"
-msgstr "Sõnumi koostamine"
+msgstr "Teadete tabel"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Configuration"
-msgstr "Info puudub"
+msgstr "Seadistus"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14805,349 +14896,349 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Lõpeta\"."
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default Behavior"
-msgstr "Vaikimisi tähtsus:"
+msgstr "Fookuse käitumine"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Default character _encoding:"
-msgstr "Vaikimisi kodeering: "
+msgstr "Puuduvad sümbolid tekstikoodis"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Deleting Mail"
-msgstr "Koosoleku ettepanek<b>%s</b> soovib lisada olemasolevale koosolekule"
+msgstr "Teile on kirju\n"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:48
-msgid "Do _Not Check Incoming Mail For IMAP Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Do not quote original message"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "_Ära näita seda teadet uuesti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:49
 #: shell/glade/evolution-startup-wizard.glade.h:1
 #, fuzzy
 msgid "Done"
-msgstr "Puudub"
+msgstr "valmis (D)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Drafts _folder:"
-msgstr "_Kaust:"
+msgstr "Avab kataloog"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Email Accounts"
-msgstr "Kirjaalarmi häälestus"
+msgstr "meili info"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Email _address:"
-msgstr "E-posti _aadress:"
+msgstr "E-posti aadress: "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "Programmist väljumisel _puhasta prügikaust"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
-msgstr "_Sertifikaadi ID:"
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Execute Command..."
-msgstr "Käivita tegevused"
+msgstr "%s: Vigane --execute käsklus `%s'\n"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Fi_xed -width:"
-msgstr "lõppeb"
+msgstr "Renderdatava teksti laius"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
-msgstr "Häälestus"
+msgstr "Valikuvõimaluste menüü"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Font Properties"
-msgstr "Töös"
+msgstr "Käivitaja häälestus"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Format messages in _HTML"
-msgstr "Edasi saadetud sõnumid"
+msgstr "Saada sõnum HTML formaadis"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "H_eaders"
 msgstr "Päis"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Highlight _quotations with"
-msgstr "_Rõhuta tsitaate"
+msgstr "Käivita _failiga..."
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Inline"
-msgstr "Lükka tagasi"
+msgstr "Saada sõnumi sees"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Kerberos "
-msgstr "Liikmed"
+msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Labels and Colors"
-msgstr "Salvesta ja sulge"
+msgstr "Kirjastiilid ja värvid"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Loading Images"
-msgstr "Kalendri laadimine"
+msgstr "Kõik pildid"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Mail Configuration"
-msgstr "LDAP konfigureerimise abimees"
+msgstr "Meili konfiguratsioon"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
 msgid "Mailbox location"
-msgstr ""
+msgstr "Käivitaja asukoht"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Composer"
-msgstr "Sõnumialarmi häälestus"
+msgstr "Sõnumi kuulajaskond"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Message Display"
-msgstr "Näidatav sõnum:"
+msgstr "Näita teadet"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
-msgstr "Sõnumialarmi häälestus"
+msgstr "Rakenda _fondid"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "New Mail Notification"
-msgstr "E-posti seadistamine"
+msgstr "Teile on uusi kirju\n"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
-msgstr "koosoleku info"
+msgstr "Valikuline info"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
-msgstr "T_öökoht:"
+msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP _Võtme ID:"
+msgstr " (peamise võtme ID %08lX)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
-msgstr "Trüki kirje"
+msgstr "Rakenda _fondid"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:93
+#, fuzzy
 msgid "Qmail maildir "
-msgstr ""
+msgstr "ei ole maildir vormingus kataloog"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Teatel puudub algne tekst!"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
-msgstr "Vastus:"
+msgstr "Kasutatav X'i kuva"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
-msgstr "_Häälestus"
+msgstr "Valikuvõimaluste menüü"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Jäta see parool meelde"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Required Information"
-msgstr "iKalendri informatsioon"
+msgstr "Kohustuslik info"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Restore Defaults"
-msgstr "Vaikimisi"
+msgstr "Taasta vaikeväärtused"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME"
+msgstr "S/MIME fail"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sending Email"
-msgstr "Saada sõnum"
+msgstr "meili info"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Vigane ülesande sõnum"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server Configuration"
-msgstr "Samm 1: serveri info"
+msgstr "Konfiguratsioonifailid"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
-msgstr "_Serveri nimi:"
+msgstr "Serveri tüüp"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
-msgstr "Ei leia häälestusandmebaasi"
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
-msgstr "Stiili nimi:"
+msgstr "Määra failinimi"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
+#, fuzzy
 msgid "Spell _Checking"
-msgstr ""
+msgstr "Õigekirja kontroll"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
 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:128
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:128
+#, fuzzy
 msgid "Use _Daemon"
-msgstr ""
+msgstr "Deemoni käivitamine..."
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
-msgstr "Muutlik"
+msgstr "Eelistatud laius"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15158,199 +15249,201 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Järgmine\". "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "_Add Signature"
-msgstr "_HTML allkiri:"
+msgstr "PGP allkiri"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati võrgust"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Authentication Type: "
-msgstr "Autentimine ebaõnnestus."
+msgstr "Blogi tüüp:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Authentication type: "
-msgstr "Autentimine ebaõnnestus."
+msgstr "Blogi tüüp:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Confirm when expunging a folder"
-msgstr "Kausta puhastamisel küsi kinnitust"
+msgstr "Valiti fail, kui oodati kataloogi."
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Default signature:"
-msgstr "Vaikimisi tähtsus:"
+msgstr "PGP allkiri"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Defaults"
-msgstr "Täpsustused"
+msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Enable"
-msgstr "Luba"
+msgstr "enable"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Full name:"
-msgstr "Ees- ja perekonna_nimi"
+msgstr "Täisnimi"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Saata HTML sõnum?"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "_P"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:159
+#, fuzzy
 msgid "_Local Tests Only"
-msgstr ""
+msgstr "Ainult kohalikke faile"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Mark messages as read after"
-msgstr "_Märgi sõnum loetuks peale"
+msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Name:"
-msgstr "Nimi"
+msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Ära lae ühtegi pilti võrgust"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Täpsustus, kui püütakse saata sõnumit ilma teemata"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Receiving Mail"
-msgstr "Posti vastuvõtmine"
+msgstr "Teile on kirju\n"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Reply style:"
-msgstr "Vasta kõigile"
+msgstr "Kirjalaad"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:170
+#, fuzzy
 msgid "_Restore defaults"
-msgstr ""
+msgstr "Taasta vaikeväärtused"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Script:"
-msgstr "_Turvalisus"
+msgstr ", ISMAP skript"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
-msgstr "Valitud:"
+msgstr "Vali..."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Sending Mail"
-msgstr "Saada sõnum"
+msgstr "Meilisõnumi saatmine"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Show animated images"
-msgstr "Näita aega kui"
+msgstr "Näita animeeritud pilte"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Signatures"
-msgstr "_Olek:"
+msgstr "%d halba allkirja\n"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
-msgstr "Sand Point"
+msgstr "Kirjatüübi kirjeldus"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
-msgstr "Esialgne kontakt:"
+msgstr "_Terminali kirjatüüp:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Use secure connection (SSL):"
-msgstr "Kasuta turvalist ühendust (_SSL)"
+msgstr "Turvaline %d-bitti %s (%s) HTTP ühendus"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "description"
-msgstr "Kirjeldus:"
+msgstr "kirjeldus"
 
 #: mail/mail-folder-cache.c:796
 #, fuzzy, c-format
@@ -15362,200 +15455,189 @@ msgstr "Kontrollin %s"
 msgid ""
 "Error while '%s':\n"
 "%s"
-msgstr ""
-"Viga tegevusel %s:\n"
-" %s"
+msgstr "Viga \"%s\" kopeerimisel."
 
 #: mail/mail-mt.c:263
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
-msgstr "Viga otsingu teostamisel"
+msgstr "Viga faili sulgemisel, viga : %s"
 
 #: mail/mail-mt.c:902
 #, fuzzy
 msgid "Working"
-msgstr "Hoiatus"
+msgstr "_Töökataloog:"
 
 #: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:536
+#: mail/mail-ops.c:534
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
+msgstr "Rakenda filtreid Sisendkasti uutele sõnumitele"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:559
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:570
+#: mail/mail-ops.c:568
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ebaõnnestud posti salvestamine ajutisse faili %s: %s"
 
-#: mail/mail-ops.c:612
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Saadan \"%s\""
-
-#: mail/mail-ops.c:730
+#: mail/mail-ops.c:664
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Saadan teie teadet..."
 
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:695
 #, fuzzy, c-format
-msgid "Failed on message %d of %d"
-msgstr "%d. teate juures %d'st tekkis viga"
+msgid "Failed to send %d of %d messages"
+msgstr "/_Postita/Saada _ootel artiklid"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:699
 #, fuzzy
 msgid "Complete."
-msgstr "Lõpetatud"
+msgstr "(%) valmis"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:796
 #, fuzzy
 msgid "Saving message to folder"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:881
 #, fuzzy, c-format
 msgid "Moving messages to %s"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Kus näidata veateateid: \\w"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:881
 #, fuzzy, c-format
 msgid "Copying messages to %s"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Kus näidata veateateid: \\w"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:994
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Kaustade sünkroniseerimine"
+msgstr "Kontrollin %s all olevaid kaustu serveris \"%s\""
 
-#: mail/mail-ops.c:1239
+#: mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1282
+#: mail/mail-ops.c:1233
 #, fuzzy, c-format
 msgid "Opening folder %s"
-msgstr "Kaustade sünkroniseerimine"
+msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1354
+#: mail/mail-ops.c:1305
 #, fuzzy, c-format
 msgid "Opening store %s"
-msgstr "Avan %s ülesanded"
+msgstr "--store [failinimi]"
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1383
 #, fuzzy, c-format
 msgid "Removing folder %s"
-msgstr "Meeldetuletajad"
+msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1526
+#: mail/mail-ops.c:1477
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
-msgstr "Kaustade sünkroniseerimine"
+msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1543
 #, fuzzy, c-format
 msgid "Storing account '%s'"
-msgstr "Kaustade sünkroniseerimine"
+msgstr "Konto nimi"
 
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1598
 #, fuzzy
 msgid "Refreshing folder"
-msgstr "Kausta sünkroniseerimine"
+msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1683
-#: mail/mail-ops.c:1734
+#: mail/mail-ops.c:1634
+#: mail/mail-ops.c:1685
 #, fuzzy
 msgid "Expunging folder"
-msgstr "Kausta sünkroniseerimine"
+msgstr "Avab kataloog"
 
-#: mail/mail-ops.c:1731
-#, c-format
+#: mail/mail-ops.c:1682
+#, fuzzy, c-format
 msgid "Emptying trash in '%s'"
-msgstr ""
+msgstr "Kustuta prügikastist kõik asjad"
 
-#: mail/mail-ops.c:1732
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1815
+#: mail/mail-ops.c:1766
 #, fuzzy, c-format
 msgid "Retrieving message %s"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Sõnumi kuulajaskond"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1838
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
-msgstr "Võetakse vastu teadet %d (%d%%)"
+msgstr "Sõnumi kuulajaskond"
 
-#: mail/mail-ops.c:1971
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d sõnumit"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:1970
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgstr "Ei õnnestu avada läbimise vigade väljundfaili"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:1998
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
-msgstr "Viga %s salvestamisel: %s"
+msgstr "Kus näidata veateateid: \\w"
 
-#: mail/mail-ops.c:2118
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2135
-#, c-format
+#: mail/mail-ops.c:2086
+#, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
-msgstr ""
+msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: mail/mail-ops.c:2165
+#: mail/mail-ops.c:2116
 #, fuzzy, c-format
 msgid "Could not write data: %s"
-msgstr "EI saa käivitada wombatit"
+msgstr "Andmeid ei õnnestu laadida."
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:2264
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Ühendan uuesti LDAP serveriga..."
 
-#: mail/mail-ops.c:2415
-msgid "Changing junk status"
-msgstr ""
-
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Tõstutundlik"
@@ -15563,73 +15645,73 @@ msgstr "Tõstutundlik"
 #: mail/mail-search.glade.h:3
 #, fuzzy
 msgid "Find in Message"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Leia tõlgetest"
 
 #: mail/mail-search.glade.h:4
 #, fuzzy
 msgid "Find:"
-msgstr "Otsing"
+msgstr "Otsing:"
 
 #: mail/mail-search.glade.h:5
 #, fuzzy
 msgid "Search"
-msgstr "Otsin"
+msgstr "Otsi"
 
 #: mail/mail-security.glade.h:2
 #, fuzzy
 msgid "Digital Signature"
-msgstr "Lisa tingimus"
+msgstr "PGP allkiri"
 
 #: mail/mail-security.glade.h:3
 #, fuzzy
 msgid "Encryption"
-msgstr "Erandid"
+msgstr "kasutatakse %s krüpteerimist\n"
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
-msgstr "Vaba/hõivatud info"
+msgstr "Kas võtad vastu kehtivuse kaotanud turvainfo?"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-send-recv.c:151
 #, fuzzy
 msgid "Cancelling..."
-msgstr "Otsin..."
+msgstr "Katkestan!!!"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:260
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:262
 #, fuzzy, c-format
 msgid "Type: %s"
-msgstr "Tüüp:"
+msgstr "    tüüp: %s    %s  "
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:312
 #, fuzzy
 msgid "Send & Receive Mail"
-msgstr "Saada sõnum"
+msgstr "Saata HTML sõnum?"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:315
 #, fuzzy
 msgid "Cancel _All"
-msgstr "Tühista"
+msgstr "Katkesta kõik ootel allalaadimised?"
 
-#: mail/mail-send-recv.c:392
+#: mail/mail-send-recv.c:396
 #, fuzzy
 msgid "Updating..."
-msgstr "Laen..."
+msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:392
-#: mail/mail-send-recv.c:444
+#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:448
 #, fuzzy
 msgid "Waiting..."
-msgstr "Laen..."
+msgstr "viga %s oodates"
 
 #: mail/mail-session.c:233
 msgid "User canceled operation."
@@ -15638,24 +15720,24 @@ msgstr "Kasutaja katkestas töö."
 #: mail/mail-session.c:266
 #, fuzzy, c-format
 msgid "Enter Password for %s"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+msgstr "Sisesta sisesta parool %s jaoks"
 
 #: mail/mail-session.c:268
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
 #: mail/mail-signature-editor.c:80
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
-msgstr "Ei leidnud vidinat väljale: `%s'"
+msgstr "Statistika faili ei saa lugeda."
 
 #: mail/mail-signature-editor.c:226
 #, fuzzy
@@ -15671,32 +15753,32 @@ msgstr ""
 #: mail/mail-signature-editor.c:229
 #, fuzzy
 msgid "_Discard changes"
-msgstr "Dinard"
+msgstr "Salvesta muudatused"
 
 #: mail/mail-signature-editor.c:233
 #, fuzzy
 msgid "Save signature"
-msgstr "Salvesta aadressiraamatusse"
+msgstr "PGP allkiri"
 
 #: mail/mail-signature-editor.c:382
 #, fuzzy
 msgid "Edit signature"
-msgstr "Lisa tingimus"
+msgstr "PGP allkiri"
 
 #: mail/mail-signature-editor.c:422
 #, fuzzy
 msgid "Enter a name for this signature."
-msgstr "_HTML allkiri:"
+msgstr "Sisestage nimi uuele kataloogile: "
 
 #: mail/mail-signature-editor.c:425
 #, fuzzy
 msgid "Name:"
-msgstr "Nimi"
+msgstr "Nimi:"
 
 #: mail/mail-tools.c:114
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Ei saa avada '%s' kausta"
+msgstr "Ajutise kataloogi loomine nurjus: %s"
 
 #: mail/mail-tools.c:141
 #, c-format
@@ -15715,12 +15797,12 @@ msgstr "Edastatud sõnum"
 #: mail/mail-tools.c:319
 #, fuzzy, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Avan kausta %s"
+msgstr "Avab kataloog"
 
 #: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
-msgstr "Kaustade sünkroniseerimine"
+msgstr "%s: Viga signaali %s käsitleja ülesseadmisel: %s"
 
 #: mail/mail-vfolder.c:206
 #, c-format
@@ -15744,7 +15826,7 @@ msgstr "_Kaust:"
 #: mail/mail-vfolder.c:964
 #, fuzzy
 msgid "Edit VFolder"
-msgstr "Redigeeri kõike"
+msgstr "vKausta allikad"
 
 #: mail/mail-vfolder.c:984
 #, c-format
@@ -15754,7 +15836,7 @@ msgstr "Proovitake redigeerida olematut vkausta '%s'."
 #: mail/mail-vfolder.c:1056
 #, fuzzy
 msgid "New VFolder"
-msgstr "_Kaust:"
+msgstr "vKausta allikad"
 
 #: mail/message-list.c:927
 msgid "Unseen"
@@ -15776,7 +15858,7 @@ msgstr "Mitu nägemata sõnumit"
 #: mail/message-list.c:931
 #, fuzzy
 msgid "Multiple Messages"
-msgstr "Mitu VKaarti"
+msgstr "Mitu nägemata sõnumit"
 
 #: mail/message-list.c:935
 #, fuzzy
@@ -15786,7 +15868,7 @@ msgstr "Madal"
 #: mail/message-list.c:936
 #, fuzzy
 msgid "Lower"
-msgstr "Madal"
+msgstr "Alumine"
 
 #: mail/message-list.c:940
 #, fuzzy
@@ -15828,40 +15910,41 @@ msgstr "%a, %d. %Y"
 #: mail/message-list.c:3115
 #, fuzzy
 msgid "Generating message list"
-msgstr "Tõmban %d. sõnumit %dst"
+msgstr "Esitab sõnumeid jutulõngadena"
 
 #: mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
-msgstr "Tähtaeg "
+msgstr "Grupeeritud:"
 
 #: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Flag Status"
-msgstr "Olek"
+msgstr "Olekutekst"
 
 #: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Tähistatud"
 
 #: mail/message-list.etspec.h:6
+#, fuzzy
 msgid "Follow Up Flag"
-msgstr ""
+msgstr "   a   lülitada buuditavuse lipp sisse/välja"
 
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
-msgstr "Esialgne kontakt:"
+msgstr "Käivitaja asukoht"
 
 #: mail/message-list.etspec.h:9
 #, fuzzy
 msgid "Received"
-msgstr "Tagasi lükatud"
+msgstr "Vastuvõtmise kuupäev"
 
 #: mail/message-list.etspec.h:11
 #, fuzzy
 msgid "Size"
-msgstr "Suurus:"
+msgstr "Suurus"
 
 #: mail/message-tag-followup.c:62
 #, fuzzy
@@ -15873,31 +15956,33 @@ msgid "Do Not Forward"
 msgstr "Ära edasta"
 
 #: mail/message-tag-followup.c:64
+#, fuzzy
 msgid "Follow-Up"
-msgstr ""
+msgstr "Liiguta üles"
 
 #: mail/message-tag-followup.c:65
 #, fuzzy
 msgid "For Your Information"
-msgstr "Info puudub"
+msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
 #: mail/message-tag-followup.c:66
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
 #: mail/message-tag-followup.c:67
+#, fuzzy
 msgid "No Response Necessary"
-msgstr ""
+msgstr "Käsule %s ei tulnud vastust."
 
 #: mail/message-tag-followup.c:69
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Reply"
-msgstr "Ülesande vastus"
+msgstr "Vasta"
 
 #: mail/message-tag-followup.c:70
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -15908,8 +15993,9 @@ msgstr "Eelvaade"
 
 #: mail/message-tag-followup.c:281
 #: mail/message-tags.glade.h:3
+#, fuzzy
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "ümardatud üles %u bitini\n"
 
 #: mail/message-tags.glade.h:2
 #, fuzzy
@@ -15925,22 +16011,22 @@ msgstr ""
 #: mail/message-tags.glade.h:6
 #, fuzzy
 msgid "_Due by:"
-msgstr "Tähtaeg "
+msgstr "Grupeeritud:"
 
 #: mail/message-tags.glade.h:7
 #, fuzzy
 msgid "_Flag:"
-msgstr "Faili nimi:"
+msgstr "Lipp"
 
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
-msgstr "Kirjeldus:"
+msgstr "Kanalite t_ellimused..."
 
 #: mail/subscribe-dialog.glade.h:2
 #, fuzzy
 msgid "None Selected"
-msgstr "Valitud:"
+msgstr "valitud keel %s"
 
 #: mail/subscribe-dialog.glade.h:3
 #, fuzzy
@@ -15958,17 +16044,17 @@ msgstr "_Lõpeta tellimus"
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Shell"
-msgstr "Evolution'i alarm "
+msgstr "Uus shell"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Test"
-msgstr "Evolution'i alarm "
+msgstr "Html test"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:2
 #, fuzzy
 msgid "Evolution Test component"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+msgstr "Testi vaate komponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -15978,7 +16064,7 @@ msgstr "40%"
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Default shortcut group"
-msgstr "Nimeta see kiirvalikute grupp ümber"
+msgstr "Nimeta kiirvalikute grupp ümber"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
@@ -15993,17 +16079,17 @@ msgstr "Peidab kiirvalikute riba"
 #: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Default window height"
-msgstr "Vaikimisi tähtsus:"
+msgstr "Vaikimisi aknahaldur"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "Default window width"
-msgstr "Vaikimisi tähtsus:"
+msgstr "Akna äärise laius."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
 #, fuzzy
 msgid "Evolution configuration version"
-msgstr "E-posti seadistamisliides"
+msgstr "GNU find versioon %s\n"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -16022,23 +16108,24 @@ msgid "List of paths for the folders to be synchronized to disk for offline usag
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+#, fuzzy
 msgid "Path to the default calendar folder"
-msgstr ""
+msgstr "Lisa järjehoidja sellele lingile vaikimisi kausta"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
 msgid "Path to the default contacts folder"
-msgstr "Avan kausta %s"
+msgstr "Lisa järjehoidja sellele lingile vaikimisi kausta"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "Path to the default mail folder"
-msgstr "Avan kausta %s"
+msgstr "Lisa järjehoidja sellele lingile vaikimisi kausta"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:15
 #, fuzzy
 msgid "Path to the default tasks folder"
-msgstr "Avan kausta %s"
+msgstr "Kuvatava ülesannete kausta URI"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Physical URI to the default calendar folder"
@@ -16078,36 +16165,37 @@ msgstr ""
 #: shell/apps_evolution_shell.schemas.in.in.h:24
 #, fuzzy
 msgid "mail"
-msgstr "E-post"
+msgstr "meil"
 
 #: shell/e-shell-about-box.c:45
+#, fuzzy
 msgid "Brought to you by"
-msgstr ""
+msgstr "Teieni tõid:"
 
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
-msgstr "Lõpetamise kuupäev"
+msgstr "Värskenda kaustade nimekirja"
 
 #: shell/e-shell-config-default-folders.c:149
 #, fuzzy
 msgid "Select Default Folder"
-msgstr "Vali ülesannete kaust"
+msgstr "Vali kalendrikaust"
 
 #: shell/e-shell-config-folder-settings.c:70
 #, fuzzy
 msgid "Default Folders"
-msgstr "Vaikimisi tähtsus:"
+msgstr "_Loo kataloogid uuesti"
 
 #: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
 msgid "Offline Folders"
-msgstr "Erikaustad"
+msgstr "_Loo kataloogid uuesti"
 
 #: shell/e-shell-config-folder-settings.c:76
 #, fuzzy
 msgid "Autocompletion Folders"
-msgstr "Lõpetamise kuupäev"
+msgstr "_Loo kataloogid uuesti"
 
 #: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
@@ -16142,7 +16230,7 @@ msgstr ""
 #: shell/e-shell-importer.c:154
 #, fuzzy
 msgid "Choose the destination for this import"
-msgstr "Muudab kokkuvõtte sätteid"
+msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
 #: shell/e-shell-importer.c:157
 #: shell/e-shell-startup-wizard.c:737
@@ -16170,29 +16258,29 @@ msgstr ""
 #: shell/e-shell-importer.c:332
 #, fuzzy
 msgid "Select importer"
-msgstr "Vali nimed"
+msgstr "Vali maatr_iks"
 
 #: shell/e-shell-importer.c:448
 #: shell/e-shell-importer.c:1020
 #, fuzzy, c-format
 msgid "File %s does not exist"
-msgstr "Aadressiraamatut ei leitud"
+msgstr "Faili pole olemas"
 
 #: shell/e-shell-importer.c:456
 #, fuzzy
 msgid "Importing"
-msgstr "Impordi..."
+msgstr "Impordin faile"
 
 #: shell/e-shell-importer.c:463
 #, fuzzy, c-format
 msgid "Importing %s.\n"
-msgstr "Impordi..."
+msgstr "Impordin faile"
 
 #: shell/e-shell-importer.c:473
 #: shell/e-shell-importer.c:474
 #, fuzzy, c-format
 msgid "Error loading %s"
-msgstr "Viga listi lisamisel"
+msgstr "Viga %s laadimisel: %s"
 
 #: shell/e-shell-importer.c:490
 #, c-format
@@ -16206,22 +16294,22 @@ msgstr ""
 #: shell/e-shell-importer.c:544
 #, fuzzy
 msgid "Automatic"
-msgstr "_Automaatne valik"
+msgstr "Automaatne"
 
 #: shell/e-shell-importer.c:593
 #, fuzzy
 msgid "_Filename:"
-msgstr "_Hüüdnimi"
+msgstr "_Faili nimi:"
 
 #: shell/e-shell-importer.c:598
 #, fuzzy
 msgid "Select a file"
-msgstr "Vali nimed"
+msgstr "Vali fail"
 
 #: shell/e-shell-importer.c:608
 #, fuzzy
 msgid "File _type:"
-msgstr "Fai_l kui:"
+msgstr "Faili tüüp"
 
 #: shell/e-shell-importer.c:647
 #, fuzzy
@@ -16231,7 +16319,7 @@ msgstr "Impordi teiste programmide andmeid ja sätted"
 #: shell/e-shell-importer.c:650
 #, fuzzy
 msgid "Import a _single file"
-msgstr "Impordi üksikut faili"
+msgstr "Impordi failist"
 
 # !PARANDA!
 #: shell/e-shell-importer.c:718
@@ -16247,7 +16335,7 @@ msgstr ""
 #: shell/e-shell-importer.c:721
 #, fuzzy
 msgid "Starting Intelligent Importers"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
+msgstr "Vali importijad (samm 2/3)"
 
 #: shell/e-shell-importer.c:847
 #: shell/e-shell-startup-wizard.c:692
@@ -16258,19 +16346,20 @@ msgstr "Programmist %s:"
 #: shell/e-shell-importer.c:1034
 #, fuzzy, c-format
 msgid "No importer available for file %s"
-msgstr ""
-"Puudub importija, mis suudaks hakkama saada failiga\n"
-"%s"
+msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
 
 #: shell/e-shell-importer.c:1046
 #, fuzzy
 msgid "Unable to execute importer"
-msgstr "Autentimine ebaõnnestus.\n"
+msgstr ""
+"Ei saa käivitada käsku '%s'\n"
+"\n"
+"Info: %s"
 
 #: shell/e-shell-importer.c:1156
 #, fuzzy
 msgid "_Import"
-msgstr "Impordi..."
+msgstr "_Import"
 
 #: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
@@ -16279,7 +16368,7 @@ msgstr "Sulgen ühendused..."
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
-msgstr "Pilot pihuarvuti sätted..."
+msgstr "Muuda Evolutioni seadeid "
 
 #. It would be nice to insensitivize the OK button appropriately
 #. instead of doing this, but unfortunately we can't do this for the
@@ -16287,22 +16376,22 @@ msgstr "Pilot pihuarvuti sätted..."
 #: shell/e-shell-shared-folder-picker-dialog.c:281
 #, fuzzy
 msgid "Please select a user."
-msgstr "Palun vali server."
+msgstr "vali kasutaja ID N"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:387
 #, fuzzy
 msgid "Opening Folder"
-msgstr "Kausta sünkroniseerimine"
+msgstr "Avab kataloog"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:393
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
-msgstr "Avan %s kalendri"
+msgstr "Avab kataloog"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:398
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
-msgstr "Ava programmiga %s..."
+msgstr "M_in"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:482
 #, fuzzy, c-format
@@ -16312,14 +16401,12 @@ msgstr "Ei saa avada kausta '%s'"
 #: shell/e-shell-shared-folder-picker-dialog.c:535
 #, fuzzy
 msgid "Cannot find the specified shared folder."
-msgstr ""
-"Kirjeldatud kausta loomine nurjus:\n"
-"%s"
+msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
 #: shell/e-shell-startup-wizard.c:569
 #, fuzzy
 msgid "Starting import"
-msgstr "Algus:"
+msgstr "_Impordi järjehoidjad"
 
 #: shell/e-shell-startup-wizard.c:784
 msgid ""
@@ -16328,11 +16415,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kausta nimi on kirjeldamata."
@@ -16362,11 +16444,12 @@ msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 #: shell/e-shell-window-commands.c:71
 #, fuzzy, c-format
 msgid "Error executing %s."
-msgstr "Viga filtri täitmisel: %s: %s"
+msgstr "Viga %s täitmisel\n"
 
 #: shell/e-shell-window-commands.c:121
+#, fuzzy
 msgid "Bug buddy is not installed."
-msgstr ""
+msgstr "Vajalikku lahtipakkimise programmi '%s' ei ole installeeritud!"
 
 #: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
@@ -16376,16 +16459,16 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:394
+#: shell/e-shell-window-commands.c:395
 #: ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:407
+#: shell/e-shell-window-commands.c:408
 #: ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
@@ -16412,11 +16495,12 @@ msgstr ""
 #: shell/e-shell.c:1063
 #, fuzzy
 msgid "Invalid arguments"
-msgstr "vigane aeg"
+msgstr "Vigane argumentide arv"
 
 #: shell/e-shell.c:1065
+#, fuzzy
 msgid "Cannot register on OAF"
-msgstr ""
+msgstr "ioctl `%s' ei õnnestu"
 
 #: shell/e-shell.c:1067
 msgid "Configuration Database not found"
@@ -16425,12 +16509,12 @@ msgstr "Ei leia häälestusandmebaasi"
 #: shell/e-shell.c:1069
 #, fuzzy
 msgid "Generic error"
-msgstr "Muu viga"
+msgstr "Üldine viga"
 
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
-msgstr "Chico"
+msgstr "Kontrollkast"
 
 #: shell/e-user-creatable-items-handler.c:601
 #: shell/e-user-creatable-items-handler.c:642
@@ -16444,7 +16528,7 @@ msgid ""
 "%s\n"
 "\n"
 "Unknown error."
-msgstr "Tundmatu viga"
+msgstr "viga (mitteassotsiatiivne)\n"
 
 #: shell/evolution-shell-component-utils.c:127
 #, c-format
@@ -16467,22 +16551,22 @@ msgstr ""
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
-msgstr "Uus ülesanne"
+msgstr "Html test"
 
 #: shell/evolution-test-component.c:141
 #, fuzzy
 msgid "_Test"
-msgstr "_T"
+msgstr "_Test"
 
 #: shell/evolution-test-component.c:142
 #, fuzzy
 msgid "Create a new test item"
-msgstr "Lisab uue ülesande"
+msgstr "Loo uus vaade tööraamatust"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
-msgstr "Ühendamine"
+msgstr "%u aktiivset ühenduse avamist"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
@@ -16495,61 +16579,55 @@ msgstr "Hetkel on aktiivsed järgnevad ühendused:"
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 #, fuzzy
 msgid "C_alendar:"
-msgstr "Kalender"
+msgstr "_Kalender:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:2
 #, fuzzy
 msgid "_Contacts:"
-msgstr "Kontaktid:"
+msgstr "Kontaktid"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:3
 #, fuzzy
 msgid "_Mail:"
-msgstr "Mobiil"
+msgstr "Post"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:4
-#, fuzzy
 msgid "_Tasks:"
-msgstr "Ülesanded"
+msgstr "Ü_lesanded:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
 msgid "Folder _type:"
-msgstr "_Kaust:"
+msgstr "Kausta _tüüp:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 #, fuzzy
 msgid "Open Other User's Folder"
-msgstr "Loo _uus kaust..."
+msgstr "Avab kausta uues aknas"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "Konto nimi"
+msgstr "_Konto:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
 msgid "_Folder Name:"
-msgstr "_Kaust:"
+msgstr "_Kausta nimi:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "_Konto nimi:"
+msgstr "_Kasutaja:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
-msgstr "LDAP konfigureerimise abimees"
+msgstr "Evolution'i kontoassistent"
 
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Impordin faile"
 
 #: shell/glade/evolution-startup-wizard.glade.h:4
-#, fuzzy
 msgid "Timezone "
-msgstr "Ajav_öönd:"
+msgstr "Ajavöönd"
 
 #: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
@@ -16587,29 +16665,24 @@ msgid "Evolution Import Assistant"
 msgstr "Evolution'i impordiassistent"
 
 #: shell/importer/import.glade.h:3
-#, fuzzy
 msgid "Import File"
-msgstr "Impordin faile"
+msgstr "Impordi failist"
 
 #: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import Location"
-msgstr "Asukoht:"
+msgstr "Impordi asukohast"
 
 #: shell/importer/import.glade.h:5
-#, fuzzy
 msgid "Importer Type"
-msgstr "Impordi..."
+msgstr "Importija tüüp"
 
 #: shell/importer/import.glade.h:6
-#, fuzzy
 msgid "Select Importers"
-msgstr "Vali nimed"
+msgstr "Vali importijad"
 
 #: shell/importer/import.glade.h:7
-#, fuzzy
 msgid "Select a File"
-msgstr "Vali nimed"
+msgstr "Vali fail"
 
 #: shell/importer/import.glade.h:8
 msgid ""
@@ -16619,24 +16692,21 @@ msgid ""
 msgstr ""
 
 #: shell/importer/intelligent.c:189
-#, fuzzy
 msgid "Importers"
-msgstr "Impordi..."
+msgstr "Importijad"
 
 #: shell/importer/intelligent.c:191
 #: smime/gui/smime-ui.glade.h:28
-#, fuzzy
 msgid "Import"
-msgstr "Impordi..."
+msgstr "Impordi"
 
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ära impordi"
 
 #: shell/importer/intelligent.c:199
-#, fuzzy
 msgid "Don't ask me again"
-msgstr "Seda küsimust rohkem mitte esitada."
+msgstr "Ära küsi enam uuesti"
 
 #: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
@@ -16664,11 +16734,12 @@ msgid ""
 msgstr ""
 
 #: shell/main.c:241
-#, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
-msgstr "Ximian Evolution"
+msgstr ""
+"Tänud\n"
+"Ximian Evolution'i meeskond\n"
 
 #: shell/main.c:249
 #, fuzzy
@@ -16691,12 +16762,12 @@ msgstr ""
 #: shell/main.c:489
 #, fuzzy
 msgid "Start in offline mode"
-msgstr "Impordi alustamine"
+msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: shell/main.c:491
 #, fuzzy
 msgid "Start in online mode"
-msgstr "Alusta uuelt leheküljelt"
+msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: shell/main.c:494
 msgid "Forcibly shut down all evolution components"
@@ -16711,9 +16782,8 @@ msgid "Send the debugging output of all components to a file."
 msgstr ""
 
 #: shell/main.c:524
-#, fuzzy
 msgid "Evolution"
-msgstr "Evolution'i alarm "
+msgstr "Evolution"
 
 #: shell/main.c:528
 #, c-format
@@ -16727,14 +16797,13 @@ msgstr ""
 #: smime/gui/certificate-manager.c:463
 #, fuzzy
 msgid "Select a cert to import..."
-msgstr "Vali tegevus"
+msgstr "Imporditavate ridade arv"
 
 #: smime/gui/certificate-manager.c:238
 #: smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
-#, fuzzy
+#: smime/gui/certificate-manager.c:545
 msgid "Certificate Name"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sertifikaati nimi"
 
 #: smime/gui/certificate-manager.c:246
 #: smime/gui/certificate-manager.c:416
@@ -16746,72 +16815,86 @@ msgstr "Edenemine"
 #: smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
-msgstr ""
+msgstr "Seerianumber"
 
 #: smime/gui/certificate-manager.c:262
-#, fuzzy
 msgid "Expires"
-msgstr "Avaldis"
+msgstr "Lõpeb"
 
 #: smime/gui/certificate-manager.c:408
-#, fuzzy
 msgid "E-Mail Address"
-msgstr "Ühenda e-posti aadressid"
+msgstr "E-posti aadress"
 
-#: smime/gui/certificate-viewer.c:331
-#, fuzzy, c-format
+#: smime/gui/certificate-viewer.c:334
+#, c-format
 msgid "Certificate Viewer: %s"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sertifikaadivaatur: %s"
 
 #: smime/gui/component.c:41
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+msgstr "Sisesta sisesta parool %s jaoks"
+
+#. we're setting the password initially
+#: smime/gui/component.c:64
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Sisesta sisesta parool %s jaoks"
+
+#: smime/gui/component.c:66
+#, fuzzy
+msgid "Enter new password"
+msgstr "Uus parool: "
 
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
-msgstr ""
+msgstr "Alluta piirangutele:"
 
 #: smime/gui/e-cert-selector.c:122
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
-msgstr ""
+msgstr "Alluta piirangutele:"
 
 #: smime/gui/smime-ui.glade.h:1
+#, fuzzy
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/gui/smime-ui.glade.h:2
 #, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sertifikaadi _väljad"
 
 #: smime/gui/smime-ui.glade.h:3
+#, fuzzy
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "I_mpordi sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:4
 #, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "E-posti saatmine"
+msgstr "Välja _väärtus"
 
 #: smime/gui/smime-ui.glade.h:5
+#, fuzzy
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>Sõrmejäljed</b>"
 
 #: smime/gui/smime-ui.glade.h:6
+#, fuzzy
 msgid "<b>Issued By</b>"
-msgstr ""
+msgstr "<b>Väljastaja</b>"
 
 #: smime/gui/smime-ui.glade.h:7
+#, fuzzy
 msgid "<b>Issued To</b>"
-msgstr ""
+msgstr "<b>Omanik</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
@@ -16820,7 +16903,7 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:9
 #, fuzzy
 msgid "<b>Validity</b>"
-msgstr "_Olek:"
+msgstr "<b>Kehtivus</b>"
 
 #: smime/gui/smime-ui.glade.h:10
 #, fuzzy
@@ -16830,12 +16913,12 @@ msgstr "Poitiers"
 #: smime/gui/smime-ui.glade.h:11
 #, fuzzy
 msgid "Backup"
-msgstr "Blackpool"
+msgstr " (varukoopia: %s)"
 
 #: smime/gui/smime-ui.glade.h:12
 #, fuzzy
 msgid "Backup All"
-msgstr "Blackpool"
+msgstr "Kogu päev"
 
 #: smime/gui/smime-ui.glade.h:13
 msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
@@ -16845,27 +16928,27 @@ msgstr ""
 #: smime/lib/e-cert.c:1024
 #, fuzzy
 msgid "Certificate"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:15
 #, fuzzy
 msgid "Certificate Authority Trust"
-msgstr "_Sertifikaadi ID:"
+msgstr " %d = EI usalda\n"
 
 #: smime/gui/smime-ui.glade.h:16
 #, fuzzy
 msgid "Certificate details"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sertifikaadi sisu"
 
 #: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
-msgstr "Ühine nimi"
+msgstr "Hiina (zh_CN)"
 
 #: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
-msgstr "Kontaktide _nimekiri"
+msgstr "Kontaktisiku nimi"
 
 #: smime/gui/smime-ui.glade.h:21
 #, no-c-format
@@ -16873,59 +16956,62 @@ msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:22
+#, fuzzy
 msgid "Dummy window only"
-msgstr ""
+msgstr "Näita ainult _ikoone"
 
 #: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
-msgstr "_Redaktor"
+msgstr "Muuda"
 
 #: smime/gui/smime-ui.glade.h:24
+#, fuzzy
 msgid "Email Recipient Certificate"
-msgstr ""
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
-msgstr "Avaldis"
+msgstr "Aegub:"
 
 #: smime/gui/smime-ui.glade.h:29
+#, fuzzy
 msgid "Issued On"
-msgstr ""
+msgstr "Väljastatud:"
 
 #: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5 sõrmejälg"
 
 #: smime/gui/smime-ui.glade.h:31
-#, fuzzy
 msgid "Organization (O)"
-msgstr "Organisatsioon"
+msgstr "Organisatsioon (O)"
 
 #: smime/gui/smime-ui.glade.h:32
-#, fuzzy
 msgid "Organizational Unit (OU)"
-msgstr "Üksus"
+msgstr "Organisatsiooniüksus (OÜ):"
 
 #: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
-msgstr ""
+msgstr "SHA1 sõrmejälg"
 
 #: smime/gui/smime-ui.glade.h:34
 #: smime/lib/e-cert.c:766
+#, fuzzy
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/gui/smime-ui.glade.h:35
 #: smime/lib/e-cert.c:770
+#, fuzzy
 msgid "SSL Server Certificate"
-msgstr ""
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
@@ -16940,14 +17026,13 @@ msgid "Trust this CA to identify web sites."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
 msgid "View"
-msgstr "Päeva vaade"
+msgstr "Vaade"
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View Certificate"
-msgstr "_Sertifikaadi ID:"
+msgstr "_Ava sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:42
 msgid "You have been asked to trust a new Certificate Authority (CA)."
@@ -16966,14 +17051,12 @@ msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-#, fuzzy
 msgid "Your Certificates"
-msgstr "_Sertifikaadi ID:"
+msgstr "Sinu sertifikaadid"
 
-#: smime/lib/e-cert-db.c:571
-#, fuzzy
+#: smime/lib/e-cert-db.c:582
 msgid "Certificate already exists"
-msgstr "Kaardi ID on juba olemas"
+msgstr "Sertifikaat on juba olemas."
 
 #: smime/lib/e-cert.c:234
 #: smime/lib/e-cert.c:244
@@ -16982,24 +17065,20 @@ msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #: smime/lib/e-cert.c:478
-#, fuzzy
 msgid "Version"
-msgstr "Vermont"
+msgstr "Versioon"
 
 #: smime/lib/e-cert.c:493
-#, fuzzy
 msgid "Version 1"
-msgstr "Vermillion"
+msgstr "Versioon 1"
 
 #: smime/lib/e-cert.c:496
-#, fuzzy
 msgid "Version 2"
-msgstr "Vermillion"
+msgstr "Versioon 2"
 
 #: smime/lib/e-cert.c:499
-#, fuzzy
 msgid "Version 3"
-msgstr "Vermillion"
+msgstr "Versioon 3"
 
 #: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
@@ -17014,94 +17093,89 @@ msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
 #: smime/lib/e-cert.c:590
-#, fuzzy
 msgid "C"
-msgstr "° C"
+msgstr "C"
 
 #: smime/lib/e-cert.c:593
-#, fuzzy
 msgid "CN"
-msgstr "Põ"
+msgstr "CN"
 
 #: smime/lib/e-cert.c:596
 msgid "OU"
-msgstr ""
+msgstr "OÜ"
 
 #: smime/lib/e-cert.c:599
-#, fuzzy
 msgid "O"
-msgstr "Olgu"
+msgstr "O"
 
 #: smime/lib/e-cert.c:602
 msgid "L"
 msgstr ""
 
 #: smime/lib/e-cert.c:605
-#, fuzzy
 msgid "DN"
-msgstr "ISDN"
+msgstr "DN"
 
 #: smime/lib/e-cert.c:608
 msgid "DC"
-msgstr ""
+msgstr "DC"
 
 #: smime/lib/e-cert.c:611
-#, fuzzy
 msgid "ST"
-msgstr "Lõ"
+msgstr "ST"
 
 #: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 RSA krüpteerimine"
 
 #: smime/lib/e-cert.c:617
 #, fuzzy
 msgid "Certificate Key Usage"
-msgstr "_Sertifikaadi ID:"
+msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
 #: smime/lib/e-cert.c:620
 #, fuzzy
 msgid "Netscape Certificate Type"
-msgstr "_Sertifikaadi ID:"
+msgstr "%s tüübi uuesti deklareerimine"
 
 #: smime/lib/e-cert.c:623
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
-msgstr "_Sertifikaadi ID:"
+msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
 #: smime/lib/e-cert.c:626
-#, fuzzy
 msgid "UID"
-msgstr "I"
+msgstr "UID"
 
 #: smime/lib/e-cert.c:635
-#, c-format
+#, fuzzy, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "Kustuta objekt"
 
 #: smime/lib/e-cert.c:686
+#, fuzzy
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
 #: smime/lib/e-cert.c:694
+#, fuzzy
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "Vigased parameetrid"
 
 #: smime/lib/e-cert.c:716
 #, fuzzy
 msgid "Subject Public Key Info"
-msgstr ""
-"\n"
-"Avalik võti: "
+msgstr "Avalik võti on blokeeritud.\n"
 
 #: smime/lib/e-cert.c:721
+#, fuzzy
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
 #: smime/lib/e-cert.c:736
 #, fuzzy
 msgid "Subject's Public Key"
-msgstr "Teema on %s"
+msgstr "halb avalik võti"
 
 #: smime/lib/e-cert.c:757
 #: smime/lib/e-cert.c:806
@@ -17111,119 +17185,121 @@ msgstr "Puhverkausta pole võimalik töödelda"
 
 #: smime/lib/e-cert.c:778
 #: smime/lib/e-cert.c:790
+#, fuzzy
 msgid "Object Signer"
-msgstr ""
+msgstr "Kustuta objekt"
 
 #: smime/lib/e-cert.c:782
 #, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "_Sertifikaadi ID:"
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/lib/e-cert.c:786
 #, fuzzy
 msgid "Email Certificate Authority"
-msgstr "Sertifikaatide kontroll ebaõnnestus."
+msgstr "Tühistamise sertifikaat on loodud.\n"
 
 #: smime/lib/e-cert.c:814
-#, fuzzy
 msgid "Signing"
-msgstr "Stauning"
+msgstr "Allkirjastamine"
 
 #: smime/lib/e-cert.c:818
 #, fuzzy
 msgid "Non-repudiation"
-msgstr "Info puudub"
+msgstr "Mittenegatiivne"
 
 #: smime/lib/e-cert.c:822
+#, fuzzy
 msgid "Key Encipherment"
-msgstr ""
+msgstr "/Muuda võtit"
 
 #: smime/lib/e-cert.c:826
 #, fuzzy
 msgid "Data Encipherment"
-msgstr "manus"
+msgstr "Andmed (%s -st)"
 
 #: smime/lib/e-cert.c:830
+#, fuzzy
 msgid "Key Agreement"
-msgstr ""
+msgstr "/Muuda võtit"
 
 #: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "Certificate Signer"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: smime/lib/e-cert.c:838
 msgid "CRL Signer"
 msgstr ""
 
 #: smime/lib/e-cert.c:886
-#, fuzzy
 msgid "Critical"
-msgstr "Horvaatia"
+msgstr "Kriitiline"
 
 #: smime/lib/e-cert.c:888
 #: smime/lib/e-cert.c:891
 #, fuzzy
 msgid "Not Critical"
-msgstr "Põhja-Carolina"
+msgstr "Mittesiduv"
 
 #: smime/lib/e-cert.c:912
-#, fuzzy
 msgid "Extensions"
-msgstr "Erandid"
+msgstr "Laiendused"
 
 #: smime/lib/e-cert.c:983
-#, fuzzy, c-format
+#, c-format
 msgid "%s = %s"
-msgstr "%s @ %s"
+msgstr "%s = %s"
 
 #: smime/lib/e-cert.c:1039
 #: smime/lib/e-cert.c:1159
 #, fuzzy
 msgid "Certificate Signature Algorithm"
-msgstr "Allkirjafail"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
 #: smime/lib/e-cert.c:1048
-#, fuzzy
 msgid "Issuer"
-msgstr "_Lisa"
+msgstr "Väljaandja"
 
 #: smime/lib/e-cert.c:1102
+#, fuzzy
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "(halb dokumendi id)"
 
 #: smime/lib/e-cert.c:1121
 #, fuzzy
 msgid "Subject Unique ID"
-msgstr "Teema on %s"
+msgstr "(halb dokumendi id)"
 
 #: smime/lib/e-cert.c:1164
 #, fuzzy
 msgid "Certificate Signature Value"
-msgstr "Allkirjafail"
+msgstr "Vigane silindrite arv"
 
 #: smime/lib/e-pkcs12.c:266
+#, fuzzy
 msgid "PKCS12 File Password"
-msgstr ""
+msgstr "Parooli pole pakutud"
 
 #: smime/lib/e-pkcs12.c:266
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+msgstr "Sisestage faili uus asukoht: "
 
 #: smime/lib/e-pkcs12.c:365
 #, fuzzy
 msgid "Imported Certificate"
-msgstr "_Sertifikaadi ID:"
+msgstr "I_mpordi sertifikaat"
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
 msgid "An attachment to add."
-msgstr "Lisa manus..."
+msgstr "Lisa fail manuste nimekirja"
 
 #: tools/evolution-launch-composer.c:325
+#, fuzzy
 msgid "Content type of the attachment."
-msgstr ""
+msgstr "Post sisu tüüp:"
 
 #: tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
@@ -17232,7 +17308,7 @@ msgstr ""
 #: tools/evolution-launch-composer.c:327
 #, fuzzy
 msgid "Description of the attachment."
-msgstr "Kirjeldus sisaldab"
+msgstr "Lisa manus..."
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
@@ -17241,25 +17317,23 @@ msgstr ""
 #: tools/evolution-launch-composer.c:329
 #, fuzzy
 msgid "Default subject for the message."
-msgstr "Lõikab valitud sõnumid"
+msgstr "On vaikimisi elemndi \"%s\" jaoks."
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
+#  This most likely means that KILL_PROCESS_CMD wasn't
+#  * found, so just bail completely.
 #: tools/killev.c:63
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr "Kausta ümbernimetamine ebaõnnestus: %s"
+msgstr "Ei saa käivitada käsku %s: %s\n"
 
 #: tools/killev.c:78
-#, c-format
+#, fuzzy, c-format
 msgid "Shutting down %s (%s)\n"
-msgstr ""
+msgstr "Liiguta alla"
 
 #: ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Contact(s) to Another Folder..."
-msgstr "Kopeeri kausta..."
+msgstr "Kopeeri kontakt(id) teise kausta..."
 
 #: ui/evolution-addressbook.xml.h:4
 #: ui/evolution-calendar.xml.h:2
@@ -17267,7 +17341,6 @@ msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
 #: ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
@@ -17277,17 +17350,14 @@ msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
 #: ui/evolution-addressbook.xml.h:9
-#, fuzzy
 msgid "Delete selected contacts"
-msgstr "Kustutan valitud objektid"
+msgstr "Kustuta valitud kontaktid"
 
 #: ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Contact(s) to Another Folder..."
-msgstr "Tõsta kausta..."
+msgstr "Liiguta kontakt(id) teise kausta..."
 
 #: ui/evolution-addressbook.xml.h:12
-#, fuzzy
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
@@ -17303,39 +17373,32 @@ msgstr "Trükitavate kontaktide eelvaatlemine"
 #: ui/evolution-addressbook.xml.h:17
 #: ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
 msgid "Print Pre_view"
-msgstr "Väljatrüki eelvaade"
+msgstr "Printimise eel_vaade"
 
 #: ui/evolution-addressbook.xml.h:18
-#, fuzzy
 msgid "Print selected contacts"
-msgstr "Valitud kontaktid:"
+msgstr "Prindi valitud kontaktid"
 
 #: ui/evolution-addressbook.xml.h:20
-#, fuzzy
 msgid "Save selected contacts as a VCard."
-msgstr "Kontakti salvestamine VKaardina"
+msgstr "Salvesta valitud kontaktid VKaardina."
 
 #: ui/evolution-addressbook.xml.h:21
-#, fuzzy
 msgid "Select All"
-msgstr "Valitud:"
+msgstr "Vali kõik"
 
 #: ui/evolution-addressbook.xml.h:22
-#, fuzzy
 msgid "Select all contacts"
-msgstr "Valitud kontaktid:"
+msgstr "Vali kõik kontaktid"
 
 #: ui/evolution-addressbook.xml.h:23
-#, fuzzy
 msgid "Send a mess to the selected contacts."
-msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
+msgstr "Saada sõnum valitud kontaktidele."
 
 #: ui/evolution-addressbook.xml.h:24
-#, fuzzy
 msgid "Send message to contact"
 msgstr "Saada kontaktile sõnum"
 
@@ -17344,23 +17407,20 @@ msgid "Send selected contacts to another person."
 msgstr "Saadab valitud kontaktid teisele isikule."
 
 #: ui/evolution-addressbook.xml.h:26
-#, fuzzy
 msgid "Show contact preview window"
-msgstr "Näitab sõnumi eelvaate akent"
+msgstr "Kuva kontakt eelvaateaknas"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Peata"
 
 #: ui/evolution-addressbook.xml.h:28
-#, fuzzy
 msgid "Stop Loading"
-msgstr "Laen..."
+msgstr "Peata laadimine"
 
 #: ui/evolution-addressbook.xml.h:29
-#, fuzzy
 msgid "View the current contact"
-msgstr "käesoleva hetkega"
+msgstr "Kuva käesolev kontakt"
 
 #: ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:33
@@ -17370,14 +17430,13 @@ msgstr "käesoleva hetkega"
 #: ui/evolution-event-editor.xml.h:11
 #: ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:17
 #: ui/evolution.xml.h:25
-#, fuzzy
 msgid "_Actions"
-msgstr "_Häälestus"
+msgstr "_Tegevused"
 
 #: ui/evolution-addressbook.xml.h:35
 #: ui/evolution-contact-editor.xml.h:16
@@ -17385,65 +17444,53 @@ msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
 #: ui/evolution-addressbook.xml.h:36
-#, fuzzy
 msgid "_Move to Folder..."
-msgstr "Tõsta kausta..."
+msgstr "_Tõsta kausta..."
 
 #: ui/evolution-addressbook.xml.h:39
 #: ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Preview Pane"
-msgstr "Eelvaade"
+msgstr "_Eelvaatepaan"
 
 #: ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "_Save as VCard"
-msgstr "Salvesta VKaardina"
+msgstr "_Salvesta VKaardina"
 
 #: ui/evolution-addressbook.xml.h:42
-#, fuzzy
 msgid "_Search for Contacts"
-msgstr "Otsi kontakte..."
+msgstr "_Otsi kontakte"
 
 #: ui/evolution-addressbook.xml.h:43
-#, fuzzy
 msgid "_Select All"
-msgstr "Valitud:"
+msgstr "Vali _kõik"
 
 #: ui/evolution-addressbook.xml.h:44
-#, fuzzy
 msgid "_Send Message to Contact..."
-msgstr "Saada kontaktile sõnum"
+msgstr "_Saada kontaktile sõnum..."
 
 #: ui/evolution-calendar.xml.h:4
-#, fuzzy
 msgid "Day"
-msgstr "Päev(a)"
+msgstr "Päev"
 
 #: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Delete All Occurrences"
-msgstr "Kustuta k_õik sündmused"
+msgstr "Kustuta kõik sündmused"
 
 #: ui/evolution-calendar.xml.h:6
-#, fuzzy
 msgid "Delete the appointment"
-msgstr "Lisab uue kokkusaamise"
+msgstr "Kustuta kohtumine"
 
 #: ui/evolution-calendar.xml.h:7
-#, fuzzy
 msgid "Delete this Occurrence"
-msgstr "Ku_stuta see sündmus"
+msgstr "Kustuta see kohtumine"
 
 #: ui/evolution-calendar.xml.h:8
-#, fuzzy
 msgid "Delete this occurrence"
-msgstr "Ku_stuta see sündmus"
+msgstr "Kustuta see kohtumine"
 
 #: ui/evolution-calendar.xml.h:9
-#, fuzzy
 msgid "Go To"
-msgstr "Mine kuupäevale"
+msgstr "Liigu"
 
 #: ui/evolution-calendar.xml.h:10
 msgid "Go back"
@@ -17454,27 +17501,24 @@ msgid "Go forward"
 msgstr "Liigub edasi"
 
 #: ui/evolution-calendar.xml.h:12
-#, fuzzy
 msgid "Go to _Date"
-msgstr "Mine kuupäevale"
+msgstr "Liigu _kuupäevale"
 
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Aktiveerib valitud kuupäeva"
 
 #: ui/evolution-calendar.xml.h:15
-#, fuzzy
 msgid "Go to today"
-msgstr "Mine tänasele _päevale"
+msgstr "Liigu tänasele"
 
 #: ui/evolution-calendar.xml.h:16
 msgid "List"
 msgstr "Loend"
 
 #: ui/evolution-calendar.xml.h:17
-#, fuzzy
 msgid "Month"
-msgstr "iga"
+msgstr "Kuu"
 
 #: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
@@ -17483,7 +17527,7 @@ msgstr "Trükitava kalendri eelvaatlemine"
 #: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this calendar"
-msgstr "Trüki kaart"
+msgstr "   m   näidata sedasama menüüd"
 
 #: ui/evolution-calendar.xml.h:22
 #, fuzzy
@@ -17502,14 +17546,12 @@ msgid "Purge old appointments and meetings"
 msgstr "Kohtumisi ja sündmusi sisaldav avalik kaust"
 
 #: ui/evolution-calendar.xml.h:25
-#, fuzzy
 msgid "Show as list"
-msgstr "Näita detaile"
+msgstr "Vaata loeteluna"
 
 #: ui/evolution-calendar.xml.h:26
-#, fuzzy
 msgid "Show one day"
-msgstr "Näita kontakte"
+msgstr "Näita ühte päeva"
 
 #: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
@@ -17526,17 +17568,16 @@ msgstr "Näitab ühte töönädalat"
 #: ui/evolution-calendar.xml.h:30
 #, fuzzy
 msgid "View the current appointment"
-msgstr "%s kokkusaamise lõpus"
+msgstr "Eemaldab käesoleva puhvri vaate"
 
 #: ui/evolution-calendar.xml.h:31
-#, fuzzy
 msgid "Week"
-msgstr "K"
+msgstr "Nädal"
 
 #: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Open Appointment"
-msgstr "_Kokkusaamine"
+msgstr "Nimetu sündmus"
 
 #: ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:2
@@ -17545,9 +17586,8 @@ msgstr "_Kokkusaamine"
 #: ui/evolution-message-composer.xml.h:3
 #: ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:3
-#, fuzzy
 msgid "Close"
-msgstr "_Sulge"
+msgstr "Sulge"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
@@ -17557,14 +17597,15 @@ msgstr "Sulgeb elemendi"
 #: ui/evolution-contact-editor.xml.h:4
 #, fuzzy
 msgid "Delete this item"
-msgstr "Ku_stuta see sündmus"
+msgstr "Kustuta see "
 
 #: ui/evolution-comp-editor.xml.h:6
 #: ui/evolution-event-editor.xml.h:5
 #: ui/evolution-mail-messagedisplay.xml.h:3
 #: ui/evolution.xml.h:11
+#, fuzzy
 msgid "Main toolbar"
-msgstr ""
+msgstr "Peatööriistariba"
 
 #: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
@@ -17574,7 +17615,7 @@ msgstr "Trükitava elemendi eelvaatlemine"
 #: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Print this item"
-msgstr "Trüki kirje"
+msgstr "Eemalda see rida"
 
 #: ui/evolution-comp-editor.xml.h:11
 #: ui/evolution-contact-editor.xml.h:8
@@ -17594,9 +17635,8 @@ msgstr "Salvesta ja sulge"
 #: ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
 msgid "Save and _Close"
-msgstr "Salvesta ja sulge"
+msgstr "Salvesta ja _sulge"
 
 #: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
@@ -17614,56 +17654,49 @@ msgstr "Salvestab elemendi kettale"
 #: ui/evolution-signature-editor.xml.h:13
 #: ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:27
-#, fuzzy
 msgid "_File"
-msgstr "Kataloogi kui"
+msgstr "_Fail"
 
 #: ui/evolution-comp-editor.xml.h:20
 #: ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
 #: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
-#, fuzzy
 msgid "_Save"
-msgstr "_L"
+msgstr "_Salvesta"
 
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
-msgstr "Kopeerib valitud sõnumi teise kausta"
+msgstr "Kopeeri märgitud teksti lõikelauale"
 
 #: ui/evolution-composer-entries.xml.h:2
 #: ui/evolution-mail-message.xml.h:21
-#, fuzzy
 msgid "Cu_t"
-msgstr "Lõika"
+msgstr "Lõ_ika"
 
 #: ui/evolution-composer-entries.xml.h:3
-#, fuzzy
 msgid "Cut selected text to the clipboard"
-msgstr "Asetab lõikepuhvris oleva sõnumi"
+msgstr "Lõika valitud tekst lõikelauale"
 
 #: ui/evolution-composer-entries.xml.h:4
-#, fuzzy
 msgid "Paste text from the clipboard"
-msgstr "Asetab lõikepuhvrist ülesande"
+msgstr ""
 
 #: ui/evolution-composer-entries.xml.h:5
 #: ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
-#, fuzzy
 msgid "Select _All"
-msgstr "Valitud:"
+msgstr "Vali _kõik"
 
 #: ui/evolution-composer-entries.xml.h:6
-#, fuzzy
 msgid "Select all text"
-msgstr "Vali nimed"
+msgstr "Vali kogu tekst"
 
 #: ui/evolution-contact-editor.xml.h:6
 #, fuzzy
 msgid "Print En_velope..."
-msgstr "Trüki ümbrik"
+msgstr "Austraalia (en_AU)"
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
@@ -17675,9 +17708,8 @@ msgid "Send _Message to Contact..."
 msgstr "Saada kontaktile sõnum"
 
 #: ui/evolution-contact-list-editor.xml.h:4
-#, fuzzy
 msgid "Delete this list"
-msgstr "Ku_stuta see sündmus"
+msgstr "Kustuta see loetelu"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
@@ -17694,14 +17726,13 @@ msgid "Send _message to list..."
 msgstr "Saada kontaktile sõnum"
 
 #: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
 msgid "_Delete..."
-msgstr "_Kustuta"
+msgstr "_Kustuta..."
 
 #: ui/evolution-event-editor.xml.h:1
 #, fuzzy
 msgid "Cancel Mee_ting"
-msgstr "Uus koosolek"
+msgstr "Katkesta aktiivne ülesanne"
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
@@ -17725,7 +17756,7 @@ msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 #: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Meeting"
-msgstr "Uus koosolek"
+msgstr "_Värskendussagedus:"
 
 #: ui/evolution-event-editor.xml.h:9
 #, fuzzy
@@ -17772,17 +17803,17 @@ msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 #: ui/evolution-mail-global.xml.h:9
 #, fuzzy
 msgid "Post Ne_w Message"
-msgstr "Sõnumi avamine ebaõnnestus"
+msgstr "Postitan selle teate?"
 
 #: ui/evolution-mail-global.xml.h:10
 #, fuzzy
 msgid "Post a message to a Public folder"
-msgstr "Salvestan sõnumi kausta"
+msgstr "Ülesandeid sisaldav avalik kaust"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "S_ubscribe to Folders..."
-msgstr "Mine kausta..."
+msgstr "Värskenda kaustade nimekirja"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
@@ -17797,9 +17828,8 @@ msgid "Virtual Folder _Editor..."
 msgstr "Virtuaalse kausta _redaktor..."
 
 #: ui/evolution-mail-global.xml.h:16
-#, fuzzy
 msgid "_Filters..."
-msgstr "_Kutsu teisi..."
+msgstr "_Filtrid..."
 
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
@@ -17809,13 +17839,13 @@ msgstr "Muuda kausta omadusi"
 #: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
-msgstr "Kopeerib valitud sõnumi teise kausta"
+msgstr "Kopeeri märgitud teksti lõikelauale"
 
 #: ui/evolution-mail-list.xml.h:3
 #: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
-msgstr "Asetab lõikepuhvris oleva sõnumi"
+msgstr "Lõika märgitud tekst lõikelauale"
 
 #: ui/evolution-mail-list.xml.h:4
 #, fuzzy
@@ -17825,17 +17855,17 @@ msgstr "_Puhasta"
 #: ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Hide S_elected Messages"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Viib valitud sõnumid ajutiselt peitu"
 
 #: ui/evolution-mail-list.xml.h:6
 #, fuzzy
 msgid "Hide _Deleted Messages"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Hävitan kustutatud sõnumid"
 
 #: ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Hide _Read Messages"
-msgstr "Vigane ülesande sõnum"
+msgstr "Viib valitud sõnumid ajutiselt peitu"
 
 #: ui/evolution-mail-list.xml.h:8
 msgid "Hide deleted messages rather than displaying them with a line through them"
@@ -17844,17 +17874,17 @@ msgstr ""
 #: ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "Mark All as _Read"
-msgstr "Märgi kõik loetuk_s"
+msgstr "Märgib kõik peitmata sõnumid loetuks"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
 #: ui/evolution-mail-list.xml.h:11
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
-msgstr "Asetab lõikepuhvris oleva sõnumi"
+msgstr "Asetab lõikepuhvrist ülesande"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
@@ -17863,7 +17893,7 @@ msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 #: ui/evolution-mail-list.xml.h:14
 #, fuzzy
 msgid "Select _Thread"
-msgstr "Valitud:"
+msgstr "/_Jälgi teemalõnga"
 
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
@@ -17898,14 +17928,14 @@ msgid "Threaded Message list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
 #: ui/evolution-mail-list.xml.h:25
-#, fuzzy
 msgid "_Folder"
-msgstr "_Kaust:"
+msgstr "_Kaust"
 
 #: ui/evolution-mail-list.xml.h:26
 #: ui/evolution-subscribe.xml.h:12
+#, fuzzy
 msgid "_Invert Selection"
-msgstr ""
+msgstr "Kopeeri valik"
 
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
@@ -17917,14 +17947,13 @@ msgid "A_dd Sender to Address Book"
 msgstr "Salvesta aadressiraamatusse"
 
 #: ui/evolution-mail-message.xml.h:2
-#, fuzzy
 msgid "A_pply Filters"
-msgstr "Rakenda filtrid"
+msgstr "_Rakenda filtreid"
 
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
 msgid "Add Sender to Address Book"
-msgstr "Salvesta aadressiraamatusse"
+msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
@@ -17933,7 +17962,7 @@ msgstr "Rakendab filtreerimisreeglid valitud sõnumitele"
 #: ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "Caret _Mode"
-msgstr "Teksti _suurus"
+msgstr "vigane mood `%s'"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -17994,17 +18023,17 @@ msgstr "Vähendab teksti suurust"
 #: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the next important message"
-msgstr "Näita teadet"
+msgstr "Kuvab järgmise lugemata jutulõnga"
 
 #: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the next message"
-msgstr "Näita teadet"
+msgstr "Näidatav sõnum:"
 
 #: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the next unread message"
-msgstr "Näita teadet"
+msgstr "Kuvab järgmise lugemata jutulõnga"
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
@@ -18018,365 +18047,375 @@ msgstr "Näita teadet"
 #: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Display the previous message"
-msgstr "Näita teadet"
+msgstr "Näidatav sõnum:"
 
 #: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Display the previous unread message"
-msgstr "Näita teadet"
+msgstr "Kuvab järgmise lugemata jutulõnga"
 
 #: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "F_orward As..."
-msgstr "_Salvesta kui..."
+msgstr "Fail kui"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Lisa filter"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja järgi"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide järgi"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter _teema järgi"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Märgib valitud sõnumi vähetähtsaks"
+
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Märgib valitud sõnumi kustutamisele kuuluvaks"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Follow _Up..."
-msgstr "T_äisnimi..."
+msgstr "Liiguta üles"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Saadab valitud sõnumi kellelegi edasi (saadetava sõnumi sees)"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Saadab valitud sõnumi kellelegi edasi (tsitaadina)"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Suurendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "_Lae pildid"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark as I_mportant"
-msgstr "_Märgi lõpetatuks"
+msgstr "Märgi kui l_ugemata"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Märgi kui l_ugemata"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Märgi vähetä_htsaks"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Märgib valitud sõnumi loetuks"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
-msgstr "Märgib valitud sõnumi vähetähtsaks"
+msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Märgib valitud sõnumi lugemata sõnumiks"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Märgib valitud sõnumi lugemata sõnumiks"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
-msgstr "Märgib valitud sõnumi vähetähtsaks"
+msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Mark the selected messages for deletion"
-msgstr "_Märgi valitud ülesanne lõpetatuks"
+msgstr "Märgista valitud paketid installimiseks"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Move"
-msgstr "Molde"
+msgstr "Liiguta"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Move selected message(s) to another folder"
-msgstr "Tõstab valitud sõnumi teise kausta"
+msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Järgmine"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Important Message"
-msgstr "Järgmisele tähtsale sõnumile"
+msgstr "Mine järgmise näruse teate juurde"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Next _Thread"
-msgstr "Holland"
+msgstr "Kuvab järgmise lugemata jutulõnga"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Next _Unread Message"
-msgstr "Serveri teade:"
+msgstr "Kuvab järgmise lugemata jutulõnga"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Not Junk"
-msgstr "Ei leitud"
+msgstr "Mittesiduv"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Valitud sõnumi uuesti saatmiseks ava see sõnumiredaktoris"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "_Algne suurus"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "P_revious Unread Message"
-msgstr "Eelmisele lugemata sõnumile"
+msgstr "Teade kõigile kasutajalt %s@%s"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Post a Repl_y"
-msgstr "Ülesande vastus"
+msgstr "_Postita sissekane"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Eelmisele tähtsale sõnumile"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Previous"
-msgstr "Eelvaade"
+msgstr "Eelmine"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Trükib valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Re_direct"
-msgstr "Woensdrecht"
+msgstr "Otsene kasutamine"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Saadab valitud sõnumi kellelegi edasi"
+msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "S_earch in Message..."
-msgstr "Otsin..."
+msgstr "Sõnum mitmes vormingus"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Väiksem"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "_Näita e-post lähtekoodi"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Näita kõiki _päiseid"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Näita sõnumit normaalse stiiliga"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Näita sõnumit koos kõigi päistega"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "Näita sõnumit töötlemata kujul"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Teksti _suurus"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "Un-delete the selected messages"
-msgstr "_Kustuta valitud ülesanded"
+msgstr "Viib valitud sõnumid ajutiselt peitu"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "VFolder on Mailing _List..."
-msgstr "Ülesandeid sisaldav kaust"
+msgstr "Filter _postiloendi järgi"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VKaust _saatja järgi..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VKaust _adressaatide järgi..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VKaust _teema järgi..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Attached"
 msgstr "Manusta"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Create Filter From Message"
-msgstr "Kalendri sõnum"
+msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Go To"
-msgstr "Mine kuupäevale"
+msgstr " (%s veel)"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Inline"
-msgstr "Sõnumi sees"
+msgstr "Saada sõnumi sees"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Larger"
 msgstr "Piipar"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Message Display"
-msgstr "Näidatav sõnum:"
+msgstr "Näita teadet"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Tõsta kausta..."
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 #, fuzzy
 msgid "_Next Message"
-msgstr "Serveri teade:"
+msgstr "Sõnumi kuulajaskond"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Normal Display"
-msgstr "Kuvamine"
+msgstr "Näita _valemeid"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Open Message"
-msgstr "Kalendri sõnum"
+msgstr "Sõnumi avamine ebaõnnestus"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Previous Message"
-msgstr "Vigane vaba/hõivatud sõnum"
+msgstr "Sõnumi kuulajaskond"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Quoted"
 msgstr "Tsitaadina"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution-mail-message.xml.h:127
+#: ui/evolution-mail-message.xml.h:129
 #: ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_ööriistad"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 #, fuzzy
 msgid "_Undelete"
-msgstr "_Kustuta"
+msgstr "_Taasta"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2
 #: ui/evolution.xml.h:4
@@ -18389,7 +18428,7 @@ msgstr "Sulgeb akna"
 #: ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Close"
-msgstr "_Sulge"
+msgstr "Sul_ge"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -18420,7 +18459,7 @@ msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "For_mat"
-msgstr "Vorming"
+msgstr "%s uuesti deklareerimine %s jaoks"
 
 #: ui/evolution-message-composer.xml.h:9
 #, fuzzy
@@ -18451,7 +18490,7 @@ msgstr "S/MIME allkiri"
 #: ui/evolution-signature-editor.xml.h:6
 #, fuzzy
 msgid "Save"
-msgstr "L"
+msgstr "Salvesta"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
@@ -18464,7 +18503,7 @@ msgstr "Salvesta _mustand"
 #: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save in folder..."
-msgstr "Tõsta kausta..."
+msgstr "Salvesta _kataloogi:"
 
 #: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:9
@@ -18492,7 +18531,7 @@ msgstr "Saada sõnum HTML formaadis"
 #: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Send this message"
-msgstr "Vigane koosoleku sõnum"
+msgstr "Saata teie teade?"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
@@ -18501,12 +18540,12 @@ msgstr "Näita / peida manused"
 #: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Show _attachments"
-msgstr "Näita kontakte"
+msgstr "Näita / peida manused"
 
 #: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Show attachments"
-msgstr "Näita kontakte"
+msgstr "Näita / peida manused"
 
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
@@ -18527,7 +18566,7 @@ msgstr "Lülitab koopiavälja näitamise sisse või välja"
 #: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
-msgstr "URI, mida kaustalehitseja näitab"
+msgstr "Lülitab pimekoopia välja näitamise sisse või välja"
 
 #: ui/evolution-message-composer.xml.h:35
 #, fuzzy
@@ -18541,32 +18580,32 @@ msgstr "Lülitab vasta-kellele välja näitamise sisse või välja"
 #: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "Toggles whether the To field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
+msgstr "Lülitab vasta-kellele välja näitamise sisse või välja"
 
 #: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_Attachment..."
-msgstr "Uus _kokkusaamine..."
+msgstr "\"%s\" tüüpi manus"
 
 #: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Bcc Field"
-msgstr "Fairfield"
+msgstr "(Vormi väli)"
 
 #: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "_Cc Field"
-msgstr "Fairfield"
+msgstr "(Vormi väli)"
 
 #: ui/evolution-message-composer.xml.h:42
 #, fuzzy
 msgid "_Delete all"
-msgstr "_Kustuta"
+msgstr "_Kustuta KÕIK"
 
 #: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_From Field"
-msgstr "Fairfield"
+msgstr "(Vormi väli)"
 
 #: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
@@ -18576,7 +18615,7 @@ msgstr "_Lisa"
 #: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Open..."
-msgstr "A_va"
+msgstr "_Ava..."
 
 #: ui/evolution-message-composer.xml.h:48
 #, fuzzy
@@ -18594,7 +18633,7 @@ msgstr "_Turvalisus"
 #: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_To Field"
-msgstr "Fairfield"
+msgstr "_Vasta-kellele väli"
 
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
@@ -18612,12 +18651,12 @@ msgstr "Lisab kausta sinu tellitud kaustade nimekirja"
 #: ui/evolution-subscribe.xml.h:2
 #, fuzzy
 msgid "F_older"
-msgstr "_Kaust:"
+msgstr "Vaata _kataloogina"
 
 #: ui/evolution-subscribe.xml.h:3
 #, fuzzy
 msgid "Refresh List"
-msgstr "Värskenda"
+msgstr "Värskenda kaustade nimekirja"
 
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
@@ -18647,7 +18686,7 @@ msgstr "Määra ülesanne teistele"
 #: ui/evolution-task-editor.xml.h:3
 #, fuzzy
 msgid "Cancel Task"
-msgstr "Tühista"
+msgstr "Katkesta aktiivne ülesanne"
 
 #: ui/evolution-task-editor.xml.h:4
 msgid "Cancel this task"
@@ -18661,7 +18700,7 @@ msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 #: ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Task"
-msgstr "Värskenda ülesannet"
+msgstr "_Värskendussagedus:"
 
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
@@ -18670,7 +18709,7 @@ msgstr "Kopeeri valitud ülesanne"
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
-msgstr "_Kustuta valitud ülesanded"
+msgstr "Kopeeri valitud ülesanne"
 
 #: ui/evolution-tasks.xml.h:6
 #, fuzzy
@@ -18749,7 +18788,7 @@ msgstr "Ava uus aken"
 #: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Pi_lot Settings..."
-msgstr "Pilot pihuarvuti sätted..."
+msgstr "Lisa uued sätted"
 
 #: ui/evolution.xml.h:14
 msgid "Send / Receive"
@@ -18763,7 +18802,7 @@ msgstr "Saadab järjekorras olevad väljaminevad kirjad ja tõmbab ära uued kir
 #: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Set up Pilot configuration"
-msgstr "E-posti seadistamine"
+msgstr "Määra _grupi ID"
 
 #: ui/evolution.xml.h:17
 msgid "Show information about Ximian Evolution"
@@ -18806,8 +18845,9 @@ msgid "_New"
 msgstr "_Uus"
 
 #: ui/evolution.xml.h:31
+#, fuzzy
 msgid "_Quick Reference"
-msgstr ""
+msgstr "Vigane tagasi viide"
 
 #: ui/evolution.xml.h:32
 msgid "_Send / Receive"
@@ -18824,12 +18864,12 @@ msgstr "_Firma järgi"
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
 msgid "_Address Cards"
-msgstr "_Aadress:"
+msgstr "Jaga kaardid"
 
 #: views/addressbook/galview.xml.h:3
 #, fuzzy
 msgid "_Phone List"
-msgstr "Telefon"
+msgstr "Predikaatide loend:\n"
 
 #: views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -18850,7 +18890,7 @@ msgstr "_Töönädala vaade"
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As _Sent Folder"
-msgstr "_Kaust:"
+msgstr "Saadetud _sõnumite kaust:"
 
 #: views/mail/galview.xml.h:2
 msgid "By S_tatus"
@@ -18865,8 +18905,9 @@ msgid "By Su_bject"
 msgstr "_Teema järgi"
 
 #: views/mail/galview.xml.h:5
+#, fuzzy
 msgid "By _Follow Up Flag"
-msgstr ""
+msgstr "Järjesta _nime järgi"
 
 #: views/mail/galview.xml.h:6
 msgid "_Messages"
@@ -18875,7 +18916,7 @@ msgstr "_Sõnumid"
 #: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "With _Category"
-msgstr "Kate_gooria:"
+msgstr "Suvaline kategooria"
 
 #: views/tasks/galview.xml.h:2
 msgid "_Tasks"
@@ -18912,6 +18953,7 @@ msgid "_Current View"
 msgstr "_Käesolev vaade"
 
 #  bonobo displays this string so it must be in locale
+#. bonobo displays this string so it must be in locale
 #: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Kohandatud vaade"
@@ -18926,23 +18968,26 @@ msgstr "Kirjelda vaateid..."
 
 #  Translators: These are the first characters of each day of the
 #  week, 'M' for 'Monday', 'T' for Tuesday etc.
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #  This is a strftime() format. %B = Month name, %Y = Year.
+#. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1128
 #, fuzzy
 msgid "%B %Y"
-msgstr "%d. %B %Y"
+msgstr "%B %Y"
 
 #: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Praegu"
 
 #: widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Täna"
 
@@ -18959,62 +19004,54 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
 #: widgets/misc/e-charset-picker.c:61
-#, fuzzy
 msgid "Baltic"
-msgstr "Peamine"
+msgstr "balti"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
 #: widgets/misc/e-charset-picker.c:63
-#, fuzzy
 msgid "Chinese"
-msgstr "Tšiili"
+msgstr "hiina"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
 #: widgets/misc/e-charset-picker.c:65
-#, fuzzy
 msgid "Greek"
-msgstr "Kreeka"
+msgstr "kreeka"
 
 #: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
-msgstr ""
+msgstr "heebrea"
 
 #: widgets/misc/e-charset-picker.c:67
-#, fuzzy
 msgid "Japanese"
-msgstr "Jaapan"
+msgstr "jaapani"
 
 #: widgets/misc/e-charset-picker.c:68
-#, fuzzy
 msgid "Korean"
-msgstr "Jordaania"
+msgstr "korea"
 
 #: widgets/misc/e-charset-picker.c:69
-#, fuzzy
 msgid "Turkish"
-msgstr "Türkmenistan"
+msgstr "türgi"
 
 #: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:71
-#, fuzzy
 msgid "Western European"
-msgstr "Lääne-Sahara"
+msgstr "lääne-euroopa"
 
 #: widgets/misc/e-charset-picker.c:88
 #: widgets/misc/e-charset-picker.c:89
 #: widgets/misc/e-charset-picker.c:90
-#, fuzzy
 msgid "Traditional"
-msgstr "Organisatsioon"
+msgstr "traditsiooniline"
 
 #: widgets/misc/e-charset-picker.c:91
 #: widgets/misc/e-charset-picker.c:92
@@ -19026,12 +19063,11 @@ msgstr "Lihtsustatud"
 #: widgets/misc/e-charset-picker.c:97
 #, fuzzy
 msgid "Ukrainian"
-msgstr "Ukraina"
+msgstr "ukraina"
 
 #: widgets/misc/e-charset-picker.c:100
-#, fuzzy
 msgid "Visual"
-msgstr "Visalia"
+msgstr "visuaalne"
 
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
@@ -19056,9 +19092,8 @@ msgid "..."
 msgstr "..."
 
 #: widgets/misc/e-expander.c:181
-#, fuzzy
 msgid "Expanded"
-msgstr "_Puhasta"
+msgstr "Laiendatud"
 
 #: widgets/misc/e-expander.c:182
 #, fuzzy
@@ -19066,8 +19101,9 @@ msgid "Whether or not the expander is expanded"
 msgstr "_Küsi luba kirjete kustutamisel"
 
 #: widgets/misc/e-expander.c:190
+#, fuzzy
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "Lipp ja nimi"
 
 #: widgets/misc/e-expander.c:197
 msgid "Use underline"
@@ -19086,36 +19122,40 @@ msgid "Space to put between the label and the child"
 msgstr ""
 
 #: widgets/misc/e-expander.c:215
+#, fuzzy
 msgid "Label widget"
-msgstr ""
+msgstr "** tundmatu vidin **  "
 
 #: widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
 #: widgets/misc/e-expander.c:222
+#, fuzzy
 msgid "Expander Size"
-msgstr ""
+msgstr "bloki suurus"
 
 #: widgets/misc/e-expander.c:223
+#, fuzzy
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "suuruste logi histogramm\n"
 
 #: widgets/misc/e-expander.c:231
 #, fuzzy
 msgid "Indicator Spacing"
-msgstr "Indian Springs"
+msgstr "Indikaatori asetsus"
 
 #: widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
 #  FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
@@ -19133,33 +19173,35 @@ msgstr "_Redigeeri salvestatud otsinguid..."
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "_Advanced..."
-msgstr "_Edasijõudnutele..."
+msgstr "Täpsemalt"
 
 #: widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Vali pilt"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 #, fuzzy
 msgid "_Find Now"
-msgstr "Otsing"
+msgstr "Käivita nüüd"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:547
 #: widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
 #: widgets/misc/e-search-bar.c:837
+#, fuzzy
 msgid "Item ID"
-msgstr ""
+msgstr "Indoneesia (id_ID)"
 
 #: widgets/misc/e-search-bar.c:844
+#, fuzzy
 msgid "Subitem ID"
-msgstr ""
+msgstr "Indoneesia (id_ID)"
 
 #: widgets/misc/e-search-bar.c:851
 msgid "Text"
@@ -19168,7 +19210,7 @@ msgstr "Tekst"
 #: widgets/misc/e-search-bar.c:931
 #, fuzzy
 msgid "Find _Now"
-msgstr "Otsing"
+msgstr "Käivita nüüd"
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format