Translation updated.

2004-04-29  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated.

svn path=/trunk/; revision=25684

2 files changed, 1228 insertions, 837 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index b8f2ba4f0b..cb16c94d1a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-29  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
 2004-04-28  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
diff --git a/po/et.po b/po/et.po
index 31ea64881f..4e1726f111 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution pre-2.0\n"
 "POT-Creation-Date: 2004-02-27 03:15+0100\n"
-"PO-Revision-Date: 2004-04-25 17:57+0300\n"
+"PO-Revision-Date: 2004-04-29 14:36+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "_Salvesta värv siia"
 #. 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:364
+#: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -176,19 +176,19 @@ msgstr "_Kontaktide grupp"
 msgid "Create a new contacts group"
 msgstr "Uue kontaktide grupi loomine"
 
-#: addressbook/gui/component/addressbook-config.c:406
+#: addressbook/gui/component/addressbook-config.c:466
 msgid "Failed to connect to LDAP server"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:490
 msgid "Failed to authenticate with LDAP server"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: addressbook/gui/component/addressbook-config.c:458
+#: addressbook/gui/component/addressbook-config.c:518
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:784
+#: addressbook/gui/component/addressbook-config.c:822
 msgid "The server responded with no supported search bases"
 msgstr ""
 
@@ -205,14 +205,14 @@ msgstr "Viga GSM faili info hankimisel: "
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:61
-#: calendar/gui/migration.c:128
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137
 #: mail/em-migrate.c:1070
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
-#: addressbook/gui/component/addressbook-migrate.c:113
-#: calendar/gui/migration.c:175
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184
 #: mail/em-migrate.c:1111
 #, c-format
 msgid "Migrating `%s':"
@@ -228,12 +228,12 @@ msgstr "Siirdamine `%s':"
 #  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:431
-#: calendar/gui/migration.c:437
-#: calendar/gui/migration.c:520
+#: addressbook/gui/component/addressbook-migrate.c:438
+#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:192
 #: mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:241
+#: mail/mail-component.c:242
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -247,10 +247,10 @@ msgstr "Kohalik arvuti"
 #. Create the default Person calendar
 #. Create the default Person task list
 #. orange
-#: addressbook/gui/component/addressbook-migrate.c:439
+#: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#: calendar/gui/migration.c:445
-#: calendar/gui/migration.c:528
+#: calendar/gui/migration.c:454
+#: calendar/gui/migration.c:536
 #: filter/filter-label.c:123
 #: mail/em-migrate.c:924
 #: mail/mail-config.c:67
@@ -260,40 +260,47 @@ msgstr "Isiklik"
 
 #  Create the LDAP source group
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:447
+#: addressbook/gui/component/addressbook-migrate.c:454
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:575
+#: addressbook/gui/component/addressbook-migrate.c:582
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: addressbook/gui/component/addressbook-migrate.c:695
+#: addressbook/gui/component/addressbook-migrate.c:702
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Vaikimisi sätted"
 
-#: addressbook/gui/component/addressbook-migrate.c:993
+#: addressbook/gui/component/addressbook-migrate.c:1076
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1007
+#: addressbook/gui/component/addressbook-migrate.c:1090
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1016
+#: addressbook/gui/component/addressbook-migrate.c:1099
 msgid ""
-"The way evolutions stores some phone numbers has changed.\n"
+"The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
+#: addressbook/gui/component/addressbook-migrate.c:1109
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+
 #: addressbook/gui/component/addressbook.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
@@ -354,127 +361,203 @@ msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1"
+msgstr "1"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:7
+#, fuzzy
+msgid "5"
+msgstr "5"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "Address Book Creation Assistant"
-msgstr "Aadressiraamatu loomise assistent"
+#: addressbook/gui/component/ldap-config.glade.h:10
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "autentimine"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "KUVA"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr "Allalaadimine..."
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "Otsin..."
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Serveri info"
+
+#  and now for the action area
+#  and now for the action area
+#  and now for the action area
+#: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>Tüüp:</b>"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "Uus kontaktide grupp"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alati"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid ""
-"Congratulations, you are\n"
-"\t      finished setting up this address book.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:20
+#: calendar/gui/dialogs/task-editor.c:193
+msgid "Basic"
+msgstr "Peamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Värv:"
+
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Ühendamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/task-editor.c:200
+#: mail/mail-security.glade.h:3
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Täpsustused"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished _name:"
 msgstr "_Eraldusnimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "Distinguished name"
+msgstr "_Eraldusnimi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Download limit:"
+msgstr "_Allalaadimise piirang:"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Email address"
+msgstr "E-posti aadress: "
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email address:"
 msgstr "E-posti aadress: "
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution esitab selle eraldusnime serverile audentsuse kontrollil"
 
 # !PARANDA! - sõnasus on kuidagi mäda
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Finished"
-msgstr "Lõpetatud"
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Find Possible Search Bases"
+msgstr "Otsi faile"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Group:"
-msgstr "Grupp:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:33
 #: mail/mail-account-gui.c:70
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "New Address Book"
-msgstr "Uus aadressiraamat"
-
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses these protocols."
-msgstr ""
-"Nüüd pead määrama viisi, kuidas sa tahad ühendada LDAP serverisse. SSL(Secure Sockets Layer)\n"
-"ja TLS (Transport Layer Security) protokolle kasutatakse osade serverite pooltsinu ühenduse krüptograafiliseks kaitseks. \n"
-"Küsi oma süsteemiülemalt, kas sinu LDAP server kasutab neid protokolle."
-
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "One"
 msgstr "Üks"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "Only locations within starting point"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Vali värvus"
+
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "S_earch scope: "
 msgstr "Otsingu _kehtivuspiirkond: "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:38
+#, fuzzy
+msgid "Search base only"
+msgstr "&Otsitakse ainult kaustast:"
+
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
+msgid "Search base:"
+msgstr "_Otsingu baas:"
+
+#: addressbook/gui/component/ldap-config.glade.h:40
+#, fuzzy
+msgid "Search scope:"
+msgstr "Otsingu ulatus"
+
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Searching"
 msgstr "Otsin"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
 "insecure environment. For example, if you and your LDAP server are behind a firewall\n"
@@ -482,117 +565,61 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Selecting this option means that your server does not support either SSL or TLS.  This \n"
 "means that your connection will be insecure, and that you will be vulnerable to security\n"
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"Selecting this option will let you change Evolution's default settings for LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Specifying a\n"
-"\t\t\t  display name and group is the first step in setting\n"
-"\t\t\t  up an address book."
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "Step 1: Folder Characteristics"
-msgstr "1. samm: Kausta omadused"
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "Step 2: Server Information"
-msgstr "2. samm: Serveri informatsioon"
-
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 3: Connecting to Server"
-msgstr "3. samm: Serveriga ühendamine"
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 4: Searching the Directory"
-msgstr "4. samm: Kausta otsimine"
-
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
 msgstr "Alam"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Otsi faile"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid ""
-"The options on this page control how many entries should be included in your\n"
-"searches, and how long a search should take. Ask your system administrator if you\n"
-"need to change these options."
-msgstr ""
-"Valikud sellel lehel määravad, kui palju kirjeid peaks olema lisatud sinuotsingutele\n"
-"ja kui kaua otsing võib kesta. Kui pead vajalikuks nende parameetrite muutmist,\n"
-"siis küsi abi oma süsteemiülemalt."
-
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your searches will \n"
 "begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
 "The search scope defines how deep you would like the search to extend down the \n"
 "directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
-msgid ""
-"This assistant will help you\n"
-"\t      create a new address book. \n"
-"\n"
-"Depending on the type of address book you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"See abimees aitab\n"
-"\t      sul luua uut aadressiraamatud. \n"
-"\n"
-"Olenevalt loodava aadressiraamatu tüübist on vaja lisada\n"
-" mõningat spetsiaalinfot. Kui vajad selle info leidmisel abi,\n"
-"siis palun kontakteeru oma süsteemiadministraatoriga."
-
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 msgstr "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the name for this server that will appear in your Evolution folder list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
-#, fuzzy
-msgid "This is the name that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "Seda nime kasutatakse sinu konto tuvastamiseks (programmisiseselt ja ainult näitamiseks."
-
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
@@ -602,80 +629,115 @@ msgstr ""
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
 "millise pordi sa peaksid määrama."
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Timeout:"
+msgstr "ajaületus"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "U_se SSL/TLS:"
 msgstr "_Kasuta SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: mail/mail-account-gui.c:69
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:75
 #, fuzzy
-msgid ""
-"You have decided to configure an LDAP server. The first step in doing this is to provide its name and your\n"
-"log in information. Please ask your system administrator if you are unsure of this information."
-msgstr ""
-"Esimene samm LDAP serveri seadistamisel on serveri nimi ja sinu sisselogimiseinformatsioon.\n"
-" Kui sa neid ei tea, siis küsi abi oma süsteemiadministraatorilt. "
+msgid "_Add Contacts Group"
+msgstr "Uus kontaktide grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:76
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Näidatav nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:78
+#, fuzzy
+msgid "_Email address:"
+msgstr "E-posti aadress: "
+
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:80
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: mail/mail-config.glade.h:170
+msgid "_Name:"
+msgstr "_Nimi:"
+
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Port number:"
 msgstr "_Pordi number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:82
+#, fuzzy
+msgid "_Port:"
+msgstr "_Port:"
+
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Search base:"
 msgstr "_Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
+#, fuzzy
+msgid "_Server:"
+msgstr "_Server:"
+
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Timeout (minutes):"
 msgstr "_Taimaut (minutites):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:87
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "_Turvalise ühenduse kasutamine (SSL):"
+
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "cards"
 msgstr "kaardid"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Uus s_akk"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "general-tab"
 msgstr "üldine-sakk"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:91
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+#: filter/filter.glade.h:17
+#: mail/mail-config.glade.h:182
+msgid "minutes"
+msgstr "minutit"
+
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "searching-tab"
 msgstr "otsingu-sakk"
 
@@ -2043,7 +2105,7 @@ msgstr "Kategooriaredaktor pole saadaval."
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2491
+#: addressbook/gui/contact-editor/e-contact-editor.c:2495
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat väljale: `%s'"
@@ -2285,7 +2347,7 @@ msgstr ""
 "antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:121
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
@@ -2326,13 +2388,13 @@ msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
@@ -2445,7 +2507,6 @@ msgstr "Aseta"
 #: calendar/gui/calendar-component.c:427
 #: calendar/gui/tasks-component.c:361
 #: filter/libfilter-i18n.h:11
-#: mail/em-account-prefs.c:223
 #: ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5
 #: ui/evolution-comp-editor.xml.h:4
@@ -2471,7 +2532,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:359
+#: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
@@ -2834,8 +2895,8 @@ msgstr "Mitte toetatud protokoll"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:599
+#: calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:627
 #: calendar/gui/e-calendar-table.c:450
 #: calendar/gui/print.c:2349
 #: camel/camel-service.c:728
@@ -2848,6 +2909,7 @@ msgid "Cancelled"
 msgstr "Katkestatud"
 
 #  E_BOOK_ERROR_COULD_NOT_CANCEL
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
@@ -3747,31 +3809,31 @@ msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr ""
+msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: calendar/gui/cal-search-bar.c:363
-#: mail/mail-ops.c:1005
+#: calendar/gui/cal-search-bar.c:366
+#: camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -3797,7 +3859,7 @@ msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:362
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
+#: calendar/gui/dialogs/calendar-setup.glade.h:19
 #: filter/filter.glade.h:15
 msgid "days"
 msgstr "päeva"
@@ -3844,7 +3906,7 @@ msgstr "%d. %B"
 #: calendar/gui/calendar-component.c:367
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
+msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 
 #: calendar/gui/calendar-component.c:423
 msgid "New Calendar"
@@ -4039,18 +4101,11 @@ msgid "extra times every"
 msgstr "korda, vahemikuga"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
 #: filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
-#: filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
-msgid "minutes"
-msgstr "minutit"
-
 #: calendar/gui/dialogs/alarm-page.c:800
 #, fuzzy
 msgid "Action/Trigger"
@@ -4128,7 +4183,7 @@ msgid "hour(s)"
 msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4143,9 +4198,9 @@ msgstr "kokkusaamise algust"
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
 #: calendar/gui/dialogs/cal-prefs-dialog.c:567
-#: mail/em-account-prefs.c:480
-#: mail/em-composer-prefs.c:665
-#: mail/em-composer-prefs.c:893
+#: mail/em-account-prefs.c:463
+#: mail/em-composer-prefs.c:663
+#: mail/em-composer-prefs.c:891
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -4160,24 +4215,24 @@ msgstr "Ära eemalda"
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
 #: calendar/gui/dialogs/cal-prefs-dialog.c:844
-#: mail/em-account-prefs.c:302
-#: mail/em-account-prefs.c:343
-#: mail/em-account-prefs.c:386
-#: mail/em-composer-prefs.c:584
-#: mail/em-composer-prefs.c:642
-#: mail/em-composer-prefs.c:672
+#: mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326
+#: mail/em-account-prefs.c:369
+#: mail/em-composer-prefs.c:582
+#: mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Disable"
 msgstr "Keela"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
 #: calendar/gui/dialogs/cal-prefs-dialog.c:846
-#: mail/em-account-prefs.c:302
-#: mail/em-account-prefs.c:343
-#: mail/em-account-prefs.c:388
-#: mail/em-composer-prefs.c:584
-#: mail/em-composer-prefs.c:642
-#: mail/em-composer-prefs.c:672
+#: mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326
+#: mail/em-account-prefs.c:371
+#: mail/em-composer-prefs.c:582
+#: mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Enable"
 msgstr "Luba"
 
@@ -4420,27 +4475,27 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne iga kokkusaamise algust"
 
-#: calendar/gui/dialogs/calendar-setup.c:163
+#: calendar/gui/dialogs/calendar-setup.c:166
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Stiili nimi:"
 
-#: calendar/gui/dialogs/calendar-setup.c:171
+#: calendar/gui/dialogs/calendar-setup.c:174
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/dialogs/calendar-setup.c:186
+#: calendar/gui/dialogs/calendar-setup.c:189
 #, fuzzy, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Asukoha URL ei ole absoluutne."
 
-#: calendar/gui/dialogs/calendar-setup.c:231
+#: calendar/gui/dialogs/calendar-setup.c:234
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:244
+#: calendar/gui/dialogs/calendar-setup.c:247
 #, c-format
 msgid "The group '%s' is remote. You must specify a location to get the calendar from"
 msgstr ""
@@ -4453,66 +4508,47 @@ msgstr "Kalendri lisamine"
 msgid "Add Tasks Group"
 msgstr "Ülesannetegrupi lisamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Värv:"
-
 #: calendar/gui/dialogs/calendar-setup.glade.h:5
 msgid "Calendar Properties"
 msgstr "Kalendri atribuudid"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "Chillonia"
-msgstr "Hiina"
-
 #: calendar/gui/dialogs/calendar-setup.glade.h:8
-#: mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Vali värvus"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "Remote"
 msgstr "Võrgus"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "Task List Properties"
 msgstr "Ülesandeloetelu omadused"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Add Calendar"
 msgstr "_Kalendri lisamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_Add Group"
 msgstr "_Grupi lisamine"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: mail/mail-config.glade.h:170
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
 msgid "_Refresh Interval:"
 msgstr "_Uuendamise intervall:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
 msgid "_Refresh:"
 msgstr "_Värskenda:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid "_Source URL:"
 msgstr "_LähteURL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
 msgid "_Type:"
 msgstr "_Tüüp:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
 #: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
@@ -4650,7 +4686,7 @@ msgstr "Kokkuvõte puudub"
 #: calendar/gui/dialogs/comp-editor.c:1377
 #: calendar/gui/e-calendar-table.c:1175
 #: calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1196
+#: composer/e-msg-composer.c:1183
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
@@ -4896,9 +4932,9 @@ msgstr "_Algus:"
 #. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591
-#: composer/e-msg-composer.c:2171
-#: mail/em-account-prefs.c:441
+#: calendar/gui/e-cal-model-tasks.c:619
+#: composer/e-msg-composer.c:2102
+#: mail/em-account-prefs.c:424
 #: mail/em-folder-view.c:804
 #: mail/mail-account-gui.c:1540
 #: mail/mail-account-gui.c:2034
@@ -4934,7 +4970,7 @@ msgstr "_Delegeerida..."
 #: calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1295
 #: calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2571
+#: mail/em-folder-tree.c:2541
 #: mail/em-folder-view.c:795
 #: ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:40
@@ -5163,7 +5199,7 @@ msgid "_No recurrence"
 msgstr "E_i kordu"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:457
+#: composer/e-msg-composer-attachment-bar.c:450
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -5206,7 +5242,6 @@ msgstr ""
 "Kas sa soovid muudatused salvestada?"
 
 #: calendar/gui/dialogs/save-comp.c:57
-#: composer/e-msg-composer.c:1613
 msgid "_Discard Changes"
 msgstr "_Loobu muudatustest"
 
@@ -5223,6 +5258,7 @@ msgstr ": vali lähteplaneet..."
 
 #  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
 #  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
 #: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy, c-format
 msgid "Select destination %s"
@@ -5263,8 +5299,8 @@ msgid "% _Complete"
 msgstr "(%) _valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:597
+#: calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:625
 #: calendar/gui/e-calendar-table.c:449
 #: calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210
@@ -5279,9 +5315,9 @@ msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-cal-model-tasks.c:662
+#: calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:623
+#: calendar/gui/e-cal-model-tasks.c:698
 #: calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
@@ -5301,8 +5337,8 @@ msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:593
+#: calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:621
 #: calendar/gui/e-calendar-table.c:447
 #: calendar/gui/print.c:2340
 msgid "Not Started"
@@ -5333,16 +5369,6 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "_Kodulehekülg:"
 
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "Peamine"
-
-#: calendar/gui/dialogs/task-editor.c:200
-#: mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Täpsustused"
-
 #: calendar/gui/dialogs/task-editor.c:207
 #: calendar/gui/dialogs/task-editor.c:270
 #: calendar/gui/dialogs/task-editor.c:407
@@ -5528,24 +5554,24 @@ msgstr "Vaba"
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "Põ"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 #: smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ida"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "Lä"
 
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:573
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5555,12 +5581,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:743
-#: calendar/gui/e-cal-model-tasks.c:771
-msgid "Due date is before start date!"
-msgstr "Tähtaja kuupäev on enne alustamiskuupäeva!"
-
-#: calendar/gui/e-cal-model-tasks.c:971
+#: calendar/gui/e-cal-model-tasks.c:981
 #: calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168
 #: calendar/gui/e-meeting-store.c:159
@@ -5569,7 +5590,7 @@ msgstr "Tähtaja kuupäev on enne alustamiskuupäeva!"
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/e-cal-model-tasks.c:971
+#: calendar/gui/e-cal-model-tasks.c:981
 #: calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169
 #: calendar/gui/e-meeting-store.c:171
@@ -5591,7 +5612,7 @@ msgstr "Ei"
 #: 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:2134
+#: mail/em-utils.c:2120
 #: shell/e-component-registry.c:168
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
@@ -5711,7 +5732,7 @@ msgstr "_Lõika"
 #: calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1283
 #: calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2564
+#: mail/em-folder-tree.c:2534
 #: ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7
@@ -6755,28 +6776,28 @@ msgstr "iKalendri info"
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: calendar/gui/migration.c:137
+#: calendar/gui/migration.c:146
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:141
+#: calendar/gui/migration.c:150
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:367
+#: calendar/gui/migration.c:376
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja tähtpäevad"
 
 #  Create the Webcal source group
 #. Create the Webcal source group
-#: calendar/gui/migration.c:453
-#: calendar/gui/migration.c:536
+#: calendar/gui/migration.c:462
+#: calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr "Veebis"
 
@@ -8928,7 +8949,7 @@ msgstr ""
 #: camel/camel-gpg-context.c:1425
 #: camel/camel-gpg-context.c:1517
 #: camel/camel-gpg-context.c:1624
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:695
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
@@ -9450,6 +9471,87 @@ msgstr "Kataloogi loomine ebaõnnestus"
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Palun sisesta oma %s parool %s jaoks"
 
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "Ei leia \"%s\" programmifaili"
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "Loo uus eemalolekusõnum"
+
+#: camel/camel-smime-context.c:272
+#, fuzzy
+msgid "Cannot create CMS signedData"
+msgstr "Ei saa luua andmebaasikataloogi!"
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "XML andmete parsimine ei õnnestunud."
+
+#: camel/camel-smime-context.c:291
+#, fuzzy
+msgid "Cannot create CMS SignerInfo"
+msgstr "Ei saa luua andmebaasikataloogi!"
+
+#: camel/camel-smime-context.c:297
+#, fuzzy
+msgid "Cannot find cert chain"
+msgstr "Ei suuda kindlaks teha Teie kasutajanime"
+
+#: camel/camel-smime-context.c:303
+#, fuzzy
+msgid "Cannot add CMS SigningTime"
+msgstr "Sama gruppi pole võimalik kaks korda lisada."
+
+#: camel/camel-smime-context.c:325
+#: camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
+
+#: camel/camel-smime-context.c:344
+#, fuzzy
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr "Sama gruppi pole võimalik kaks korda lisada."
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add add encryption certificate"
+msgstr "Vali sertifikaat [%1] krüptimise jaoks"
+
+#: camel/camel-smime-context.c:360
+#, fuzzy
+msgid "Cannot add CMS SignerInfo"
+msgstr "Sama gruppi pole võimalik kaks korda lisada."
+
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "Ei saa luua andmebaasikataloogi!"
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
+
+#: camel/camel-smime-context.c:441
+#: camel/camel-smime-context.c:890
+#, fuzzy
+msgid "Failed to encode data"
+msgstr "Ei saa lugeda METAR andmeid.\n"
+
 #: camel/camel-smime-context.c:514
 #, fuzzy
 msgid "Unverified"
@@ -9483,8 +9585,8 @@ msgstr "tundmatu šifri algoritm"
 
 #: camel/camel-smime-context.c:528
 #, fuzzy
-msgid "Siganture algorithm unsupported"
-msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
+msgid "Signature algorithm unsupported"
+msgstr "Toetamata allkirjavorming"
 
 #: camel/camel-smime-context.c:530
 #, fuzzy
@@ -9495,11 +9597,127 @@ msgstr "PGP allkiri"
 msgid "Processing error"
 msgstr "Vea töötlemine"
 
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589
+#: camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "faili ei õnnestu sulgeda"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "Sõnumi tähtsuseks määratakse:"
+
+#: camel/camel-smime-context.c:614
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "vCardi importimine ebaõnnestus"
+
+#: camel/camel-smime-context.c:624
+msgid "Certficate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:627
+msgid "Certficate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "Ei leia tühja kohta"
+
 #: camel/camel-smime-context.c:647
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Objekti allkirjastaja"
 
+#  we should have gotten instructions on how to use the DATA command:
+#  * 354 Enter mail, end with "." on a line by itself
+#: camel/camel-smime-context.c:748
+#, fuzzy
+msgid "Decoder failed"
+msgstr "Trükkimine ebaõnnestus"
+
+#: camel/camel-smime-context.c:800
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
+
+#: camel/camel-smime-context.c:807
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:816
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:827
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "Loo uus eemalolekusõnum"
+
+#: camel/camel-smime-context.c:833
+#, fuzzy
+msgid "Can't create CMS EnvelopedData"
+msgstr "ei suuda luua objekti '%s'"
+
+#: camel/camel-smime-context.c:839
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:845
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:854
+#, fuzzy
+msgid "Can't create CMS RecipientInfo"
+msgstr "ei suuda luua objekti '%s'"
+
+#: camel/camel-smime-context.c:859
+#, fuzzy
+msgid "Can't add CMS RecipientInfo"
+msgstr "Ei saa lisada uut aadressi"
+
+#: camel/camel-smime-context.c:873
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "ei suuda luua objekti '%s'"
+
+#: camel/camel-smime-context.c:884
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "Ei saa lugeda METAR andmeid.\n"
+
+#: camel/camel-smime-context.c:970
+#, fuzzy, c-format
+msgid "Decoder failed, error %d"
+msgstr "KIRC viga - meetod ebaõnnestus: "
+
+#: camel/camel-smime-context.c:977
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1004
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "impordi/mesti võtmed"
+
+#: camel/camel-smime-context.c:1012
+#, fuzzy
+msgid "export keys: unimplemented"
+msgstr "ekspordi võtmed võtmeserverisse"
+
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
@@ -9891,31 +10109,31 @@ msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kataloogi %s ei saa luua: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s kokkuvõtet ei saa laadida"
 
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:326
 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:566
+#: camel/providers/imap/camel-imap-folder.c:569
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1963
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumite ei saa vastu võtta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9931,25 +10149,25 @@ msgstr ""
 "Sõnumit %s ei saadud: \n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: 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:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
+#: camel/providers/imap/camel-imap-folder.c:2044
+#: camel/providers/imap/camel-imap-folder.c:2646
 #: camel/providers/nntp/camel-nntp-folder.c:233
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2310
+#: camel/providers/imap/camel-imap-folder.c:2380
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2684
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -10139,9 +10357,7 @@ msgstr ""
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr ""
-"Kirjeldatud kausta loomine nurjus:\n"
-"%s"
+msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
 #: camel/providers/imap/camel-imap-store.c:2196
 #, c-format
@@ -10492,12 +10708,12 @@ msgstr "Uus failinimi on tühi!"
 #: camel/providers/local/camel-mbox-store.c:486
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "Arhiivi nime muutmine ei õnnestunud."
+msgstr "Ei saa ümber nimetada '%s': %s"
 
 #: camel/providers/local/camel-mbox-store.c:561
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Faili %1 salvestamine ebaõnnestus"
+msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
@@ -10539,7 +10755,6 @@ msgid "Could not close temp folder: %s"
 msgstr "Ajutist kausta ei saa sulgeda: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:592
-#: mail/em-folder-tree.c:2524
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kataloogi ei saa ümber nimetada : %s"
@@ -10938,6 +11153,8 @@ msgid "Retrieving POP message %d"
 msgstr "POP sõnumi %d vastuvõtt"
 
 #: camel/providers/pop3/camel-pop3-folder.c:501
+#: composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1236
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
@@ -11372,20 +11589,20 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:302
-#: mail/em-utils.c:1486
+#: composer/e-msg-composer-attachment-bar.c:295
+#: mail/em-utils.c:1478
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:458
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:491
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:499
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Attach a file to the message"
 msgstr "Faili manustamine sõnumile"
 
@@ -11417,10 +11634,6 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:308
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -11506,152 +11719,67 @@ msgstr "Vea valimiseks numbri järgi klõpsa siia"
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, fuzzy
 msgid "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:701
 #, fuzzy
 msgid "Cannot encrypt outgoing message: No encryption certificate set for from account"
 msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
 
-#: composer/e-msg-composer.c:831
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"Viga faili: %s lugemisel\n"
-"%s"
-
-#: composer/e-msg-composer.c:1211
-msgid "File exists, overwrite?"
-msgstr "Fail on juba olemas. Kirjutada üle?"
-
-#: composer/e-msg-composer.c:1222
-#: composer/e-msg-composer.c:1238
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Viga faili: %s salvestamisel"
-
-#: composer/e-msg-composer.c:1262
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Viga faili: %s laadimisel"
-
-#: composer/e-msg-composer.c:1300
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "Tõrge faili: %s avamisel"
+#: composer/e-msg-composer.c:1273
+#, fuzzy
+msgid "Could not open file"
+msgstr "Faili avamine ebaõnnestus"
 
-#: composer/e-msg-composer.c:1308
+#: composer/e-msg-composer.c:1281
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: composer/e-msg-composer.c:1315
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-"Failis ei saa kerida: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1322
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-"Faili ei saa kärpida: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1331
-#, fuzzy, c-format
-msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-msgstr ""
-"Ei saa kopeerida faili:\n"
-"%s\n"
-"faili:\n"
-"%s"
-
-#: composer/e-msg-composer.c:1340
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-"Viga sõnumi automaatsalvestamisel: %s\n"
-" %s"
-
-#: composer/e-msg-composer.c:1444
-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 pärit salvestamata faile.\n"
-"Kas sa soovid üritada nende taastamist?"
-
-#: composer/e-msg-composer.c:1608
-#, fuzzy, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Allkiri on muudetud kuid salvestamata.\n"
-"\n"
-"Kas sa soovid muudatused salvestada?"
-
-#: composer/e-msg-composer.c:1610
+#: composer/e-msg-composer.c:1551
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
-#: composer/e-msg-composer.c:1617
-msgid "Warning: Modified Message"
-msgstr "Hoiatus: salvestamata sõnum"
-
-#: composer/e-msg-composer.c:1650
+#: composer/e-msg-composer.c:1581
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:2057
+#: composer/e-msg-composer.c:1988
 #: mail/mail-account-gui.c:1461
 msgid "Autogenerated"
 msgstr "Automaatselt genereeritud"
 
-#: composer/e-msg-composer.c:2156
+#: composer/e-msg-composer.c:2087
 msgid "Signature:"
 msgstr "Allkiri:"
 
-#: composer/e-msg-composer.c:2357
-#: composer/e-msg-composer.c:2386
+#: composer/e-msg-composer.c:2288
+#: composer/e-msg-composer.c:2317
 #, c-format
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba peitmine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2389
-#: composer/e-msg-composer.c:3293
+#: composer/e-msg-composer.c:2320
+#: composer/e-msg-composer.c:3224
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba kuvamine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2406
-#: composer/e-msg-composer.c:3172
-#: composer/e-msg-composer.c:3173
+#: composer/e-msg-composer.c:2337
+#: composer/e-msg-composer.c:3103
+#: composer/e-msg-composer.c:3104
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:3206
+#: composer/e-msg-composer.c:3137
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3234
+#: composer/e-msg-composer.c:3165
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11663,7 +11791,7 @@ msgstr ""
 "Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
 "versioonid on paigaldatud.\n"
 
-#: composer/e-msg-composer.c:3338
+#: composer/e-msg-composer.c:3269
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11671,10 +11799,117 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4343
+#: composer/e-msg-composer.c:4274
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr ""
 
+#: composer/mail-composer-errors.xml.in.h:1
+msgid "${1}"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:2
+#, fuzzy
+msgid "All accounts have been removed."
+msgstr "Kas võib KÕIK tõlked failist '%s' eemaldada?"
+
+#: composer/mail-composer-errors.xml.in.h:3
+#, fuzzy
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
+
+#: composer/mail-composer-errors.xml.in.h:4
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:5
+msgid "Because \"${1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:6
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:7
+#, fuzzy
+msgid "Could not create message."
+msgstr "Sõnumi saatmine ebaõnnestus"
+
+#: composer/mail-composer-errors.xml.in.h:8
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "Signatuurifaili: %s ei õnnestu salvestada"
+
+#: composer/mail-composer-errors.xml.in.h:9
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Ajutisse faili kirjutamine ei õnnestunud."
+
+#: composer/mail-composer-errors.xml.in.h:10
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:11
+#, fuzzy
+msgid "Discard Changes"
+msgstr "unustatakse muudatused"
+
+#: composer/mail-composer-errors.xml.in.h:12
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+"Kas tõesti kustutada %n kiri?\n"
+"Kas tõesti kustutada %n kirja?"
+
+#: composer/mail-composer-errors.xml.in.h:13
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Ä_ra taasta"
+
+#: composer/mail-composer-errors.xml.in.h:14
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
+
+#: composer/mail-composer-errors.xml.in.h:15
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:16
+#, fuzzy
+msgid "Recover"
+msgstr "_Taasta"
+
+#: composer/mail-composer-errors.xml.in.h:17
+#, fuzzy
+msgid "Save Message"
+msgstr "Sõnumi salvestamine..."
+
+#: composer/mail-composer-errors.xml.in.h:18
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:19
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:20
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Topeltkirju ei leitud."
+
+#: composer/mail-composer-errors.xml.in.h:21
+msgid "Warning: Modified Message"
+msgstr "Hoiatus: salvestamata sõnum"
+
+#: composer/mail-composer-errors.xml.in.h:22
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Faili manustamine sõnumile"
+
+#: composer/mail-composer-errors.xml.in.h:23
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution grupitarkvarakomplekt"
@@ -11964,28 +12199,24 @@ msgstr "%I %p"
 #: filter/filter-datespec.c:77
 #: filter/filter-datespec.c:78
 #: filter/filter-datespec.c:79
-#: filter/filter-datespec.c:187
+#: filter/filter-datespec.c:280
 #, c-format
-msgid "You must choose a date."
-msgstr "Kuupäeva valimine on kohustuslik."
-
-#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:290
-#: filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid "now"
 msgstr "praegu"
 
 #  strftime for date filter display, only needs to show a day date (i.e. no time)
 #  strftime for date filter display, only needs to show a day date (i.e. no time)
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Vali aeg, millega võrrelda"
 
@@ -11993,16 +12224,82 @@ msgstr "Vali aeg, millega võrrelda"
 msgid "_Filter Rules"
 msgstr "_Filtri reeglid"
 
-#: filter/filter-file.c:166
+#: filter/filter-errors.xml.in.h:1
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr "Vigane regulaaravaldis"
+
+#: filter/filter-errors.xml.in.h:2
+#, fuzzy
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "ei vasta regulaaravaldisele"
+
+#: filter/filter-errors.xml.in.h:3
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Faili '%s' ei ole olemas või see pole tavaline fail."
+
+#: filter/filter-errors.xml.in.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "Kopeeri _kuupäev"
+
+#: filter/filter-errors.xml.in.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "Faili nimi peale -C on puudu"
+
+#: filter/filter-errors.xml.in.h:6
+#, fuzzy
+msgid "Missing folder."
+msgstr "Puuduv kataloog!"
+
+#: filter/filter-errors.xml.in.h:7
+#, fuzzy
+msgid "Missing name."
+msgstr "Puuduv funktsioonide kategooria nimi."
+
+#: filter/filter-errors.xml.in.h:8
+#, fuzzy
+msgid "Name \"{0}\" already used."
+msgstr "Nimi \"%1\" on juba kasutusel"
+
+#: filter/filter-errors.xml.in.h:9
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ühtegi printerit pole valitud"
+
+#: filter/filter-errors.xml.in.h:10
+#, fuzzy
+msgid "Please choose another name."
+msgstr "Palun vali mõni teine embleemi nimi."
+
+#: filter/filter-errors.xml.in.h:11
+msgid "You must choose a date."
+msgstr "Kuupäeva valimine on kohustuslik."
+
+#: filter/filter-errors.xml.in.h:12
+msgid "You must name this filter."
+msgstr "Sa pead sellele filtrile nime määrama."
+
+#: filter/filter-errors.xml.in.h:13
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Sa pead sellele vKaustale nime määrama."
+
+#: filter/filter-errors.xml.in.h:14
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
-#: filter/filter-file.c:185
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
-msgstr "Faili '%s' ei ole olemas või see pole tavaline fail."
+#: filter/filter-errors.xml.in.h:15
+msgid "You must specify a folder."
+msgstr "Kausta valimine on kohustuslik."
 
-#: filter/filter-file.c:301
+#: filter/filter-errors.xml.in.h:16
+msgid "You must specify at least one folder as a source. Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+msgstr ""
+
+#: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vali faili"
 
@@ -12014,25 +12311,12 @@ msgstr "Vali faili"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr "Kausta valimine on kohustuslik."
-
-#: filter/filter-folder.c:243
-#: filter/vfolder-rule.c:507
+#: filter/filter-folder.c:237
+#: filter/vfolder-rule.c:492
 #: mail/mail-account-gui.c:1327
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Viga regulaaravaldises '%s':\n"
-"%s"
-
 #: filter/filter-label.c:121
 #: filter/libfilter-i18n.h:26
 #: mail/em-migrate.c:922
@@ -12066,39 +12350,35 @@ msgstr "Hiljem"
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Sa pead sellele filtrile nime määrama."
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:746
 msgid "Rule name:"
 msgstr "Reegli nimi:"
 
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:750
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:773
 msgid "<b>If</b>"
 msgstr "<b>kui</b>"
 
-#: filter/filter-rule.c:810
+#: filter/filter-rule.c:804
 msgid "Execute actions"
 msgstr "Tegevused viiakse täide"
 
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:808
 msgid "if all criteria are met"
 msgstr "kui kõik tingimused on täidetud"
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:813
 msgid "if any criteria are met"
 msgstr "kui üks tingimustest on täidetud"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "outgoing"
 msgstr "väljaminev"
 
@@ -12455,23 +12735,15 @@ msgstr "Teema"
 msgid "Unset Status"
 msgstr "Kahtlase oleku a&utomaatne eemaldamine"
 
-#: filter/rule-context.c:682
-#: filter/rule-editor.c:239
-#: filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, fuzzy, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Reegli nimi on juba kasutusel, palun vali uus nimi:"
-
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: filter/rule-editor.c:375
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Muuda reeglit"
 
-#: filter/rule-editor.c:699
+#: filter/rule-editor.c:685
 msgid "Rule name"
 msgstr "Reegli nimi"
 
@@ -12517,15 +12789,7 @@ msgstr "Teema ei sisalda"
 msgid "Virtual _Folders"
 msgstr "Virtuaalsed _kaustad"
 
-#: filter/vfolder-rule.c:215
-msgid "You must name this vfolder."
-msgstr "Sa pead sellele vKaustale nime määrama."
-
-#: filter/vfolder-rule.c:230
-msgid "You need to to specify at least one folder as a source."
-msgstr ""
-
-#: filter/vfolder-rule.c:587
+#: filter/vfolder-rule.c:572
 msgid "VFolder source"
 msgstr "VKausta allikas"
 
@@ -12586,8 +12850,8 @@ msgstr "Evolutioni Netscape Mail'i importija"
 #: mail/importers/elm-importer.c:418
 #: mail/importers/netscape-importer.c:1872
 #: mail/importers/pine-importer.c:474
-#: mail/mail-component.c:538
-#: mail/mail-component.c:581
+#: mail/mail-component.c:539
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "E-Post"
 
@@ -12600,92 +12864,39 @@ msgstr "Meilikontod"
 msgid "Mail Preferences"
 msgstr "Meili häälestus"
 
-#: mail/em-account-prefs.c:220
-msgid "Are you sure you want to delete this account?"
-msgstr "Kas sa tõesti soovid kustutada seda kontot?"
-
-#: mail/em-account-prefs.c:228
-msgid "Don't delete"
-msgstr "Ära kustuta"
-
 #  translators: default account indicator
 #. translators: default account indicator
-#: mail/em-account-prefs.c:432
+#: mail/em-account-prefs.c:415
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:486
+#: mail/em-account-prefs.c:469
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:488
+#: mail/em-account-prefs.c:471
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:290
-#: mail/em-composer-prefs.c:413
+#: mail/em-composer-prefs.c:292
+#: mail/em-composer-prefs.c:411
 #: mail/mail-config.c:1038
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: mail/em-composer-prefs.c:397
-#, fuzzy
-msgid "You must specify a valid script name."
-msgstr "<qt>Sisestada tuleb kehtiv hüüdnimi.</qt>"
-
-#: mail/em-composer-prefs.c:897
+#: mail/em-composer-prefs.c:895
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:943
+#: mail/em-composer-prefs.c:941
 #, fuzzy
 msgid "Add signature script"
 msgstr "Lisa allkirjaskript"
 
-#: mail/em-composer-prefs.c:963
+#: mail/em-composer-prefs.c:961
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:124
-#, c-format
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-"%sSend anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Sellel sõnumil on teemaväli tühi.\n"
-"Kas saadame ilma teemata?"
-
-#: mail/em-composer-utils.c:153
-msgid "Since the contact list you are sending to is configured to hide the list's addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr "See sõnum sisaldab ainult BCC saajaid."
-
-#: mail/em-composer-utils.c:162
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:305
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/em-composer-utils.c:574
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
 #: mail/em-folder-browser.c:139
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
@@ -12723,8 +12934,8 @@ msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
 #: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2278
-#: mail/mail-component.c:741
+#: mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
@@ -12734,123 +12945,82 @@ msgstr "_Kausta nimi:"
 
 #: mail/em-folder-tree-model.c:196
 #: mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/mail-vfolder.c:852
 msgid "VFolders"
 msgstr "VKaustad"
 
-#: mail/em-folder-tree-model.c:206
-#: mail/em-folder-tree-model.c:208
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202
+#: mail/em-folder-tree-model.c:204
 #, fuzzy
 msgid "UNMATCHED"
 msgstr "Puudub \\{"
 
 #  Inbox is always first
-#: mail/em-folder-tree-model.c:236
-#: mail/em-folder-tree-model.c:238
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:208
+#: mail/em-folder-tree-model.c:210
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:493
-#: mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:465
+#: mail/em-folder-tree-model.c:774
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: mail/em-folder-tree.c:923
+#: mail/em-folder-tree.c:924
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:925
+#: mail/em-folder-tree.c:926
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:932
+#: mail/em-folder-tree.c:933
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:935
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:950
+#: mail/em-folder-tree.c:951
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:1998
-#, fuzzy, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
-
-#: mail/em-folder-tree.c:2027
-#: mail/em-folder-tree.c:2204
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: mail/em-folder-tree.c:2043
-#: mail/em-folder-tree.c:2056
+#: mail/em-folder-tree.c:2040
+#: mail/em-folder-tree.c:2053
 #: mail/em-folder-view.c:672
 #: mail/em-folder-view.c:686
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2083
+#: mail/em-folder-tree.c:2080
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2278
-#: mail/mail-component.c:741
+#: mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2397
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kausta ei õnnestunud kustutada: %s"
-
-#: mail/em-folder-tree.c:2424
-#, fuzzy, c-format
-msgid "Cannot delete local %s folder."
-msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
-
-#: mail/em-folder-tree.c:2430
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr ""
-"Kausta kustutamine nurjus:\n"
-"%s"
-
-#: mail/em-folder-tree.c:2440
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\" kustutamine"
-
-#: mail/em-folder-tree.c:2476
-#, fuzzy, c-format
-msgid "Cannot rename local %s folder."
-msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
-
-#: mail/em-folder-tree.c:2485
+#: mail/em-folder-tree.c:2458
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2487
+#: mail/em-folder-tree.c:2460
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2511
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Nimi \"%s\" on juba siin kaustas olemas. Palun kasuta teist nime."
-
-#: mail/em-folder-tree.c:2559
+#: mail/em-folder-tree.c:2529
 #: ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18
 #: ui/evolution-mail-messagedisplay.xml.h:8
@@ -12859,25 +13029,25 @@ msgstr "Nimi \"%s\" on juba siin kaustas olemas. Palun kasuta teist nime."
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2530
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2565
+#: mail/em-folder-tree.c:2535
 msgid "_Move"
 msgstr "_Liiguta"
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2569
+#: mail/em-folder-tree.c:2539
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2572
+#: mail/em-folder-tree.c:2542
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2575
+#: mail/em-folder-tree.c:2545
 #: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Omadused..."
@@ -13424,27 +13594,20 @@ msgstr "Palun vali server."
 msgid "No server has been selected"
 msgstr "Asukoht ei ole määratud!"
 
-#: mail/em-utils.c:100
+#: mail/em-utils.c:95
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Seda teadet rohkem ei näidata"
 
-#: mail/em-utils.c:282
-#, fuzzy, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr "VIGA: info pole veel saadaval"
-
-#: mail/em-utils.c:291
+#: mail/em-utils.c:285
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:536
+#: mail/em-utils.c:530
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-utils.c:1143
+#: mail/em-utils.c:1137
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
@@ -13452,77 +13615,29 @@ msgstr "tundmatu saatja"
 #  it must contain a single single %%+05d followed by a single '%%s'
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1153
+#: mail/em-utils.c:1147
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a. %Y-%m-%d, kell %H:%M %%+05d, %%s kirjutas:"
 
-#: mail/em-utils.c:1436
-#: mail/em-utils.c:1520
-#: mail/em-utils.c:1529
-#, fuzzy, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr "Ei saa kävitaja muudatusi salvestada"
-
-#: mail/em-utils.c:1441
-#, fuzzy, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr "Valitud mall on juba olemas. Kas kirjutada see üle?"
-
-#: mail/em-utils.c:1484
+#: mail/em-utils.c:1476
 msgid "message"
 msgstr "sõnum"
 
-#: mail/em-utils.c:1536
-#, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr "Viga: '%s' eksisteerib ja ei ole tavaline fail"
-
-#: mail/em-utils.c:1590
+#: mail/em-utils.c:1579
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: mail/em-utils.c:1639
+#: mail/em-utils.c:1628
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #  Drop filename for messages from a mailbox
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2074
+#: mail/em-utils.c:2063
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
 
-#: mail/em-utils.c:2125
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ajutise kataloogi loomine nurjus: %s"
-
-#: mail/em-utils.c:2456
-#, 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"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
-"\n"
-"Kas tõesti eemaldame kustutatud sõnumid?"
-
-#: mail/em-utils.c:2481
-#, 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"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
-"\n"
-"Kas tõesti eemaldame kustutatud sõnumid?"
-
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14159,10 +14274,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:110
-msgid "You have not filled in all of the required information."
-msgstr ""
-
 #  give our dialog an OK button and title
 #. give our dialog an OK button and title
 #: mail/mail-account-editor.c:153
@@ -14184,10 +14295,6 @@ msgstr "_Kasutajanimi:"
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
-#: mail/mail-account-gui.c:2269
-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"
@@ -14217,90 +14324,73 @@ msgstr "Vastused aadressile %s"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:430
-#, fuzzy
-msgid "The following filter rule(s):\n"
-msgstr "Lisa filtreerimisreegel"
-
-#: mail/mail-autofilter.c:436
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-component.c:491
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d deleted"
 msgstr "%d kustutatud"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d junk"
 msgstr "%d rämps"
 
-#: mail/mail-component.c:516
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d drafts"
 msgstr "%d mustandid"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:519
 #, c-format
 msgid "%d sent"
 msgstr "%d saadetud"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:521
 #, c-format
 msgid "%d unsent"
 msgstr "%d saatmata"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:525
 #, c-format
 msgid "%d total"
 msgstr "%d kokku"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:527
 #, c-format
 msgid ", %d unread"
 msgstr ", %d lugemata"
 
-#: mail/mail-component.c:530
+#: mail/mail-component.c:531
 #, fuzzy, c-format
 msgid ", %d selected"
 msgstr "Valitud:"
 
-#: mail/mail-component.c:625
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-
-#: mail/mail-component.c:693
+#: mail/mail-component.c:683
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:684
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:695
+#: mail/mail-component.c:685
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:701
+#: mail/mail-component.c:691
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:702
+#: mail/mail-component.c:692
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:703
+#: mail/mail-component.c:693
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:881
+#: mail/mail-component.c:871
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, mida kalender näitab"
@@ -14814,9 +14904,8 @@ msgid "Server _Type: "
 msgstr "Serveri _tüüp:"
 
 #: mail/mail-config.glade.h:133
-#, fuzzy
 msgid "Si_gning certificate:"
-msgstr "Tühistamise sertifikaat on loodud.\n"
+msgstr "All_kirjastamissertifikaat:"
 
 #: mail/mail-config.glade.h:134
 msgid "Signat_ure:"
@@ -14969,28 +15058,372 @@ msgstr "värv"
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-folder-cache.c:786
-#, c-format
-msgid "Pinging %s"
-msgstr "Kontrollin %s"
+#: mail/mail-errors.xml.in.h:1
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Nimi \"%s\" on juba siin kaustas olemas. Palun kasuta teist nime."
 
-#: mail/mail-mt.c:259
-#, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
+#: mail/mail-errors.xml.in.h:2
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:3
+msgid "Are you sure you want to delete this account?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#: mail/mail-errors.xml.in.h:4
+#, fuzzy
+msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
+msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
+
+#: mail/mail-errors.xml.in.h:5
+#, fuzzy
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
+
+#: mail/mail-errors.xml.in.h:6
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
+
+#: mail/mail-errors.xml.in.h:7
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+
+#: mail/mail-errors.xml.in.h:8
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
+#: mail/mail-errors.xml.in.h:9
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:10
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:11
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:12
+#, fuzzy
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "VKaust _adressaatide järgi"
+
+#: mail/mail-errors.xml.in.h:13
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Sõnumeid ei saa kopeerida Prügi kausta"
+
+#: mail/mail-errors.xml.in.h:14
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kausta \"{0}\" ei saa luua."
+
+#: mail/mail-errors.xml.in.h:15
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Ajutise kataloogi loomine nurjus: %s"
+
+#: mail/mail-errors.xml.in.h:16
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Kataloogi %s ei saa luua: %s"
+
+#: mail/mail-errors.xml.in.h:17
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Kausta \"{0}\" ei saa kustutada."
+
+#: mail/mail-errors.xml.in.h:18
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
+
+#: mail/mail-errors.xml.in.h:19
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
+
+#: mail/mail-errors.xml.in.h:20
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Liiguta kiri kausta"
+
+#: mail/mail-errors.xml.in.h:21
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr ""
+"\n"
+"*** Konsooli logiallika avamine ebaõnnestus ***"
+
+#: mail/mail-errors.xml.in.h:22
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr ""
+"\n"
+"*** Konsooli logiallika avamine ebaõnnestus ***"
+
+#: mail/mail-errors.xml.in.h:23
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "faili `%s' ei saa avada"
+
+#: mail/mail-errors.xml.in.h:24
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "%s: ei õnnestu ümber nimetada %s-ks"
+
+#: mail/mail-errors.xml.in.h:25
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
+
+#: mail/mail-errors.xml.in.h:26
+#, fuzzy
+msgid "Cannot save changes to account."
+msgstr "Ei saa kävitaja muudatusi salvestada"
+
+#: mail/mail-errors.xml.in.h:27
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "ei õnnestu minna kataloogi %s"
+
+#: mail/mail-errors.xml.in.h:28
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Salvesta kuvatõmmis _faili:"
+
+#: mail/mail-errors.xml.in.h:29
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Signatuurifaili pole võimalik avada!"
+
+#: mail/mail-errors.xml.in.h:30
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:31
+msgid "Could not save signature file."
+msgstr "Signatuurifaili ei saa salvestada."
+
+#: mail/mail-errors.xml.in.h:32
+msgid "Delete \"{0}\"?"
+msgstr "Kustuta \"{0}\"?"
+
+#: mail/mail-errors.xml.in.h:33
+msgid "Delete account?"
+msgstr "Kustuta konto?"
+
+#: mail/mail-errors.xml.in.h:34
+msgid "Discard changed?"
+msgstr "Loobu muudatustest?"
+
+#: mail/mail-errors.xml.in.h:35
+msgid "Do you wish to save your changes?"
+msgstr "Kas soovid tehtud muudatused salvestada?"
+
+#: mail/mail-errors.xml.in.h:36
+msgid "Don't delete"
+msgstr "Ära kustuta"
+
+#: mail/mail-errors.xml.in.h:37
+msgid "Enter password for {0}"
+msgstr "Sisesta sisesta parool {0} jaoks"
+
+#: mail/mail-errors.xml.in.h:38
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr "VIGA : sellist filtrit pole!"
+
+#: mail/mail-errors.xml.in.h:39
+msgid "Error while performing operation."
+msgstr "Viga käsu täitmisel."
+
+#: mail/mail-errors.xml.in.h:40
+#, fuzzy
+msgid "Error while {0}."
 msgstr ""
 "Viga tegevuse '%s' käigus:\n"
 "%s"
 
-#: mail/mail-mt.c:262
-#, fuzzy, c-format
-msgid ""
-"Error while performing operation:\n"
+#: mail/mail-errors.xml.in.h:41
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "Fail nimega \"%1\" on juba olemas. Kas kirjutada see üle?"
+
+#: mail/mail-errors.xml.in.h:42
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "%1 on olemas, aga pole tavaline fail"
+
+#: mail/mail-errors.xml.in.h:43
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:44
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:45
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:46
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:47
+msgid "Invalid authentication"
+msgstr "Vigane autentimine"
+
+#: mail/mail-errors.xml.in.h:48
+#, fuzzy
+msgid "Mail filters automatically updated."
+msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
+
+#: mail/mail-errors.xml.in.h:49
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:50
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:51
+msgid "Please make sure the following recipients are willing and able to receive HTML email: {0} Send anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:52
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+"Kausta kustutamine nurjus:\n"
 "%s"
-msgstr "Viga faili sulgemisel, viga : %s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-errors.xml.in.h:53
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:54
+msgid "The contact list you are sending to is configured to hide list recipients. Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:55
+msgid "The following filter rule(s): {0} Used the now removed folder: \"{1}\" And have been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:56
+msgid "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:57
+msgid "The message was sent via the \"sendmail\" external application. Sendmail reports the following error: status 67: mail not sent. The message is stored in the Outbox folder. Check the message for errors and resend."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:58
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:59
+msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:60
+msgid "This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:61
+#, fuzzy
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
+
+#: mail/mail-errors.xml.in.h:62
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Seda allkirja on muudetud, kuid seda ei ole salvestatud.\n"
+"\n"
+"Kas soovid muudatused salvestada?"
+
+#: mail/mail-errors.xml.in.h:63
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgstr ""
+
+#  default charset used in mail view
+#: mail/mail-errors.xml.in.h:64
+msgid "Use _Default"
+msgstr "Kasuta _vaikekodeeringut"
+
+#: mail/mail-errors.xml.in.h:65
+msgid "Use default drafts folder?"
+msgstr "Vaikekausta kasutamine mustandite jaoks?"
+
+#: mail/mail-errors.xml.in.h:66
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:67
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:68
+msgid "You may not create two accounts with the same name."
+msgstr "Sa ei saa luua ühe nimega kahte kontot."
+
+#: mail/mail-errors.xml.in.h:69
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:70
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:71
+msgid "_Discard changes"
+msgstr "_Muudatustest loobumine"
+
+#: mail/mail-errors.xml.in.h:72
+msgid "_Empty Trash"
+msgstr "_Tühjenda prügikast"
+
+#: mail/mail-errors.xml.in.h:73
+msgid "_Expunge"
+msgstr "_Puhasta"
+
+#: mail/mail-errors.xml.in.h:74
+msgid "_Send"
+msgstr "_Saada"
+
+#: mail/mail-errors.xml.in.h:75
+#, fuzzy
+msgid "vFolders automatically updated."
+msgstr "Osavõtja olek uuendatud\n"
+
+#: mail/mail-errors.xml.in.h:76
+msgid "{0}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:77
+msgid "{0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:78
+msgid "{1}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:79
+msgid "{1}."
+msgstr ""
+
+#: mail/mail-folder-cache.c:786
+#, c-format
+msgid "Pinging %s"
+msgstr "Kontrollin %s"
+
+#: mail/mail-mt.c:897
 msgid "Working"
 msgstr "Töötamine"
 
@@ -15002,116 +15435,116 @@ msgstr "Filtreerin kausta"
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:532
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Filtrite rakendamine väljuvatele sõnumitele ebaõnnestus: %s"
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:566
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:693
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Järjekorras olnud kirjade saatmine ebaõnnestus."
 
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:697
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:794
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: mail/mail-ops.c:1123
+#: mail/mail-ops.c:1105
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1148
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1220
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "--store [failinimi]"
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1475
+#: mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1458
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1567
-#: mail/mail-ops.c:1618
+#: mail/mail-ops.c:1549
+#: mail/mail-ops.c:1600
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1597
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1598
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1681
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1771
-#: mail/mail-ops.c:1857
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1889
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15120,7 +15553,7 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15129,11 +15562,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:1988
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2005
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15142,17 +15575,17 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
@@ -15217,59 +15650,36 @@ msgstr "Uuendamine..."
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: mail/mail-session.c:236
+#: mail/mail-session.c:237
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:270
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:299
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:86
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr "Signatuurifaili: %s ei õnnestu salvestada"
-
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Seda allkirja on muudetud, kuid seda ei ole salvestatud.\n"
-"\n"
-"Kas soovid muudatused salvestada?"
-
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr "_Muudatustest loobumine"
-
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "Allkirja salvestamine"
-
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -15307,29 +15717,15 @@ msgstr "vKausta ülesseadmine: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:922
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:961
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "Proovitake redigeerida olematut vkausta '%s'."
-
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1045
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
@@ -15393,7 +15789,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3107
+#: mail/message-list.c:3109
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -15535,14 +15931,12 @@ msgid "Default shortcut group"
 msgstr "Vaikimisi kiirvalikute grupp"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
-msgstr "Lülitab kaustade riba sisse või välja"
+msgstr "Vaikimisi kaustariba paani laius"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
 msgid "Default width of the shortcut bar pane"
-msgstr "Peidab kiirvalikute riba"
+msgstr "Vaikimisi lühikäskude riba paani kõrgus"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window height"
@@ -15754,17 +16148,13 @@ msgid "From %s:"
 msgstr "Programmist %s:"
 
 #: shell/e-shell-importer.c:1044
-#, fuzzy, c-format
+#, c-format
 msgid "No importer available for file %s"
-msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
+msgstr "Faili %s jaoks ei ühtegi importijat saadaval"
 
 #: shell/e-shell-importer.c:1056
-#, fuzzy
 msgid "Unable to execute importer"
-msgstr ""
-"Ei saa käivitada käsku '%s'\n"
-"\n"
-"Info: %s"
+msgstr "Importijat ei saa käivitada"
 
 #: shell/e-shell-importer.c:1169
 msgid "_Import"
@@ -15821,9 +16211,8 @@ msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
 #: shell/e-shell-window-commands.c:121
-#, fuzzy
 msgid "Bug buddy is not installed."
-msgstr "Viga #%1 (%2) pole võrguta olekus saadaval."
+msgstr "Veateatamisprogramm ei ole paigaldatud."
 
 #: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
@@ -15847,15 +16236,15 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-window.c:327
+#: shell/e-shell-window.c:338
 msgid "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks vajuta seda nuppu."
 
-#: shell/e-shell-window.c:334
+#: shell/e-shell-window.c:345
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-window.c:340
+#: shell/e-shell-window.c:351
 msgid "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
 
@@ -16190,14 +16579,12 @@ msgid ""
 msgstr "Näita lõimedena ka teema &järgi"
 
 #: smime/gui/smime-ui.glade.h:1
-#, fuzzy
 msgid "<Not Part of Certificate>"
-msgstr "KDE sertifikaadi komponent"
+msgstr "<Ei ole sertifikaadi osa>"
 
 #: smime/gui/smime-ui.glade.h:2
-#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr "Sertifikaadi _väljad"
+msgstr "<v>Sertifikaadi väljad</b>"
 
 #: smime/gui/smime-ui.glade.h:3
 #, fuzzy