Translation updated.

2004-05-05 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated. svn path=/trunk/; revision=25809
author: Priit Laes <plaes@cvs.gnome.org> 2004-05-06 02:37:44 +0800
committer: Priit Laes <plaes@src.gnome.org> 2004-05-06 02:37:44 +0800
commit: 60a9d81314d2d74f385ac2e3d6060bcb4df5af25 (patch)
tree: faed700e045e6ee3dea14be511e9f397b5ea8c31 /po/et.po
parent: 12fb773502ff61c55d40f78a513f6e8bb9b30380 (diff)
download: gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.tar.gz
gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.tar.zst
gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.zip
1 files changed, 2574 insertions, 2151 deletions
diff --git a/po/et.po b/po/et.po
index ad3cf30fd9..6619654386 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-05-03 22:03+0300\n"
+"PO-Revision-Date: 2004-05-05 21:34+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "kontakti päis:"
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolutioni minikaart"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "aktiivne aadressiraamatu kaust"
@@ -44,15 +52,6 @@ msgstr " kaarti"
 msgid " card"
 msgstr " kaart"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontakti päis:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution'i aadressiraamat"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
@@ -67,78 +66,20 @@ msgstr "Aadressiraamatut ei õnnestunud laadida"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Automaatne lõpetamine"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikaadid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "_Salvesta värv siia"
-
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#  Fix me *
-#  can not get name, should be a bug of e-book.Anyway, should set a default name.
-#  name = e_book_get_name (book);
-#  Create the contacts group
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution'i aadressiraamat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Factory for the Addressbook's address displayer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Control that displays an Evolution addressbook minicard."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution component for handling contacts."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution'i sõnumikausta kuvamise komponent."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Autentimine ebaõnnestus.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -192,16 +133,16 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1222
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1241
+#: addressbook/gui/component/addressbook-config.c:1243
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "Viga GSM faili info hankimisel: "
 
-#: addressbook/gui/component/addressbook-config.c:1249
+#: addressbook/gui/component/addressbook-config.c:1251
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
@@ -231,9 +172,9 @@ msgstr "Siirdamine `%s':"
 #: 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:242
+#: mail/em-folder-tree-model.c:195
+#: mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:243
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -248,12 +189,12 @@ msgstr "Kohalik arvuti"
 #. Create the default Person task list
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #: 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
+#: mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Isiklik"
@@ -269,9 +210,8 @@ msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
 #: addressbook/gui/component/addressbook-migrate.c:702
-#, fuzzy
 msgid "Autocompletion Settings"
-msgstr "Vaikimisi sätted"
+msgstr "Automaatlõpetamise sätted"
 
 #: addressbook/gui/component/addressbook-migrate.c:1076
 msgid ""
@@ -310,20 +250,65 @@ msgid ""
 "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"
+#: addressbook/gui/component/addressbook-view.c:687
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Autentimine ebaõnnestus.\n"
+#: addressbook/gui/component/addressbook-view.c:774
+msgid "New Address Book"
+msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+#: addressbook/gui/component/addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430
+#: calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Kustuta"
+
+#: addressbook/gui/component/addressbook-view.c:776
+#: calendar/gui/calendar-component.c:431
+#: calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Omadused..."
+
+#: addressbook/gui/component/addressbook-view.c:1001
+#, fuzzy
+msgid "UID of the contacts source that the view will display"
+msgstr "URI, mida kalender näitab"
+
+#: addressbook/gui/component/addressbook-view.c:1006
+#, fuzzy
+msgid "The URI that the address book will display"
+msgstr "URI, mida kaustalehitseja näitab"
+
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#  Fix me *
+#  can not get name, should be a bug of e-book.Anyway, should set a default name.
+#  name = e_book_get_name (book);
+#  Create the contacts group
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1031
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontaktid"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -341,6 +326,56 @@ msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõ
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Automaatne lõpetamine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr "Sertifikaadid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomplete here"
+msgstr "Seadista automaatlõpetamist siit"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution'i aadressiraamat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolutioni aadressiraamatu aadressikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolutioni aadressiraamatu kaardikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution'i sõnumikausta kuvamise komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -365,6 +400,7 @@ msgstr "Toetatud otsingubaasid"
 #: mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1
 #: mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -433,7 +469,7 @@ msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-account-gui.c:68
+#: mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alati"
@@ -448,104 +484,93 @@ msgid "Basic"
 msgstr "Peamine"
 
 #: 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:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Eraldusnimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-posti aadress: "
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:31
 #: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-#: mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Mitte kunagi"
 
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Üks"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 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
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Otsingu _kehtivuspiirkond: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "Otsi ainult baasist"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "Otsingu ulatus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Otsin"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP server if\n"
 "your LDAP server supports SSL or TLS."
@@ -553,7 +578,7 @@ msgstr ""
 "See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult siis\n"
 "kui LDAP server toetab SSL või TLS protokolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 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"
@@ -565,7 +590,7 @@ msgstr ""
 "siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus\n"
 "on juba turvaline."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 #, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or TLS.  This \n"
@@ -576,53 +601,53 @@ msgstr ""
 "on sinu ühendus ebaturvaline ja sa võid olla turvaaukude\n"
 "tõttu ohus."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
 # !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Alam"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 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:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 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"
@@ -632,102 +657,101 @@ 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:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr "See valik kontrollib kui kaua lubatakse otsingul töötada."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
-msgstr "ajaületus"
+msgstr "Taimaut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_Kasuta SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72
+#: mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "_Lisa kontaktide grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Näidatav nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "_E-posti aadress: "
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: 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
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Pordi number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Serveri nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Taimaut (minutites):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "_Turvalise ühenduse kasutamine:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kaardid"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Uus s_akk"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "üldine-sakk"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22
 #: filter/filter.glade.h:17
@@ -735,25 +759,31 @@ msgstr "üldine-sakk"
 msgid "minutes"
 msgstr "minutit"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "otsingu-sakk"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eemalda kõik"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eemalda"
 
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nimi"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Eemalda kõik"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Kuva Kontaktiloend"
@@ -776,22 +806,16 @@ msgstr "Lisa kontaktide hulka"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nimi"
-
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 #: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Allikas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Kontaktide valimine aadressiraamatust"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -856,183 +880,196 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:302
 #: addressbook/gui/widgets/eab-contact-display.c:321
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "2. Aadress:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Aadress:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Tähtpäev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Sünnipäev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "Linn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Firma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:270
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1523
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Riik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Osakond:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Vaba/hõivatud:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Kodu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "<b>Alguskülg</b>"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Ametinimetus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Kodune aadress"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Juht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "_Hüüdnimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Märkused:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "Personal Information"
 msgstr "Isiklik info"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Profession:"
 msgstr "Amet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "State/Province:"
 msgstr "Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
 
 #  URL
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Webcam:"
 msgstr "Veebikaamera:"
 
 #  red
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: addressbook/gui/contact-editor/e-contact-editor.c:200
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
 #: filter/filter-label.c:122
 #: mail/em-migrate.c:923
-#: mail/mail-config.c:66
+#: mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Töö"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
 msgid "Zip/Postal Code:"
 msgstr "Postiindeks:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Categories"
 msgstr "_Kategooriad"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_File under:"
 msgstr "_Salvesta kui:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Where:"
 msgstr "_Kus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "item7"
 msgstr "element7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item8"
 msgstr "element8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:311
 #: addressbook/gui/widgets/eab-contact-display.c:332
@@ -1040,16 +1077,16 @@ msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:291
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigeeritav"
 
@@ -2021,91 +2058,91 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL kiirsuhtlusklient"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:305
 #: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Kiirsuhtlusklient"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Teenus"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Asukoht"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Kasutajanimi"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:306
 #: addressbook/gui/widgets/eab-contact-display.c:325
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2592
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat väljale: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL kiirsuhtlusklient"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Kiirsuhtlusklient"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Teenus"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "Location"
+msgstr "Asukoht"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Kasutajanimi"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
@@ -2123,22 +2160,6 @@ msgstr "_Täisnimi:"
 msgid "E-_mail:"
 msgstr "E-Post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada need kontaktid?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
@@ -2285,8 +2306,8 @@ msgstr "kontaktide-nimekirja-redaktor"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Raamat"
 
@@ -2348,6 +2369,407 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#: addressbook/gui/widgets/eab-contact-display.c:177
+msgid "(map)"
+msgstr "(kaart)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:124
+#: addressbook/gui/widgets/eab-contact-display.c:190
+msgid "map"
+msgstr "kaart"
+
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:493
+msgid "List Members"
+msgstr "Nimekirja liikmed"
+
+#: addressbook/gui/widgets/eab-contact-display.c:293
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisatsioon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:301
+msgid "Position"
+msgstr "Ametikoht"
+
+#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:322
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:308
+msgid "Video Conferencing"
+msgstr "Videokonverents"
+
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:330
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:310
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:314
+msgid "work"
+msgstr "töö"
+
+#: addressbook/gui/widgets/eab-contact-display.c:327
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/widgets/eab-contact-display.c:547
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "personal"
+msgstr "isiklik"
+
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Märkus"
+
+#: addressbook/gui/widgets/eab-contact-display.c:508
+msgid "Job Title"
+msgstr "Ametinimetus"
+
+#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:539
+msgid "Home page"
+msgstr "Kodulehekülg"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Õnnestus"
+
+#  E_BOOK_ERROR_INVALID_ARG
+#  E_BOOK_ERROR_BUSY
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+#, fuzzy
+msgid "Backend busy"
+msgstr "Kataloog on töös"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Hoidla offlain"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Aadressiraamatut ei eksisteeri"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Ühtegi valikut pole määratud"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Juurdepääs keelatud"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontakti ei leitud"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Kontakti ID on juba olemas"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Mitte toetatud protokoll"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:626
+#: calendar/gui/print.c:2349
+#: camel/camel-service.c:728
+#: camel/camel-service.c:766
+#: camel/camel-service.c:850
+#: camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+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"
+msgstr "Kuulamist ei õnnestunud peatada"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autentimine ebaõnnestus."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Autentimine on vajalik"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS ei ole kättesaadav"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "%s: sellist partitsiooni ei ole\n"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Muu viga"
+
+#: addressbook/gui/widgets/eab-gui-util.c:102
+msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
+msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
+
+#: addressbook/gui/widgets/eab-gui-util.c:109
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
+
+#: addressbook/gui/widgets/eab-gui-util.c:114
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution you must compile the program from the CVS sources after retrieving OpenLDAP from the link below."
+msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+
+#: addressbook/gui/widgets/eab-gui-util.c:123
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
+
+#: addressbook/gui/widgets/eab-gui-util.c:140
+msgid "Unable to open addressbook"
+msgstr "Aadressiraamatu avamine ebaõnnestus"
+
+#: addressbook/gui/widgets/eab-gui-util.c:161
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:167
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:173
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:176
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:179
+msgid "This query did not complete successfully."
+msgstr "See päring ei lõpetanud edukalt."
+
+#: addressbook/gui/widgets/eab-gui-util.c:205
+msgid "Do you want to save changes?"
+msgstr "Kas soovid muudatused salvestada?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:207
+msgid "_Discard"
+msgstr "_Unusta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:228
+msgid "Error adding list"
+msgstr "Viga listi lisamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:651
+msgid "Error adding contact"
+msgstr "Viga kontakti lisamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:239
+msgid "Error modifying list"
+msgstr "Viga listi muutmisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:239
+msgid "Error modifying contact"
+msgstr "Viga kontakti muutmisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:251
+msgid "Error removing list"
+msgstr "Viga listi eemaldamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:609
+msgid "Error removing contact"
+msgstr "Viga kontakti eemaldamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:333
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"%d kontakti avamisega kaasneb %d uue akna avamine.\n"
+"Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:359
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s on juba olemas\n"
+"Kas soovid üle kirjutada?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:363
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#: addressbook/gui/widgets/eab-gui-util.c:399
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Viga %s salvestamisel: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:436
+msgid "card.vcf"
+msgstr "kaart.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:570
+msgid "list"
+msgstr "nimekiri"
+
+#: addressbook/gui/widgets/eab-gui-util.c:705
+msgid "Move contact to"
+msgstr "Liiguta kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:707
+msgid "Copy contact to"
+msgstr "Kopeeri kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:710
+msgid "Move contacts to"
+msgstr "Liiguta kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:712
+msgid "Copy contacts to"
+msgstr "Kopeeri kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:715
+msgid "Select target addressbook."
+msgstr "Vali sihtaadressiraamat."
+
+#: addressbook/gui/widgets/eab-gui-util.c:888
+msgid "Multiple VCards"
+msgstr "Mitu VKaarti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:891
+#, c-format
+msgid "VCard for %s"
+msgstr "VKaart %s kohta"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr "(puudub)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Peamine e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Vali tegevus"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Loo uus kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Pöördumine aadressiraamatu poole..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Muuda kontakti andmeid"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Ühenda e-posti aadressid"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, c-format
+msgid "Show Full VCard"
+msgstr "Kogu VKaardi kuvamine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Kompaktse VKaardi näitamine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Salvesta aadressiraamatusse"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Kontakte pole"
@@ -2356,8 +2778,8 @@ msgstr "Kontakte pole"
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, c-format
 msgid "Query"
 msgstr "Päring"
@@ -2485,8 +2907,8 @@ msgid "Cut"
 msgstr "Lõika"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425
-#: calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428
+#: calendar/gui/tasks-component.c:363
 #: ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
@@ -2499,20 +2921,6 @@ msgstr "Kopeeri"
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427
-#: calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-#: ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Kustuta"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
 #: calendar/gui/e-calendar-view.c:1279
 msgid "Current View"
@@ -2568,22 +2976,6 @@ msgstr "Kategooriad"
 msgid "Company Phone"
 msgstr "Firma telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512
-#: smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Perekonnanimi"
@@ -2620,29 +3012,14 @@ msgstr "Päevik"
 msgid "Manager"
 msgstr "Juht"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Märkus"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisatsioon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faks"
@@ -2694,22 +3071,31 @@ msgstr "Ühik"
 msgid "Web Site"
 msgstr "Koduleht"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Laius"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Kõrgus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 #, fuzzy
 msgid "Has Focus"
 msgstr "Fookuse käitumine"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valitud"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Vilkuv kursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Väli"
@@ -2728,10 +3114,6 @@ msgstr "CPU mudel"
 msgid "Max field name length"
 msgstr "Maks. erinevus lausepikkustes:"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Veeru laius"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2761,383 +3143,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valitud"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Vilkuv kursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(kaart)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "kaart"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Nimekirja liikmed"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Ametikoht"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Videokonverents"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "töö"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "isiklik"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Ametinimetus"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Kodulehekülg"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Õnnestus"
-
-#  E_BOOK_ERROR_INVALID_ARG
-#  E_BOOK_ERROR_BUSY
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-#, fuzzy
-msgid "Backend busy"
-msgstr "Kataloog on töös"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Hoidla offlain"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Aadressiraamatut ei eksisteeri"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Ühtegi valikut pole määratud"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "Juurdepääs keelatud"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontakti ei leitud"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Kontakti ID on juba olemas"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-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: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
-#: camel/camel-service.c:766
-#: camel/camel-service.c:850
-#: camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-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"
-msgstr "Kuulamist ei õnnestunud peatada"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Autentimine ebaõnnestus."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Autentimine on vajalik"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS ei ole kättesaadav"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "%s: sellist partitsiooni ei ole\n"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Muu viga"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
-msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution you must compile the program from the CVS sources after retrieving OpenLDAP from the link below."
-msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Aadressiraamatu avamine ebaõnnestus"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "See päring ei lõpetanud edukalt."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Kas soovid muudatused salvestada?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Unusta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Viga listi lisamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Viga kontakti lisamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Viga listi muutmisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Viga kontakti muutmisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Viga listi eemaldamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Viga kontakti eemaldamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"%d kontakti avamisega kaasneb %d uue akna avamine.\n"
-"Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s on juba olemas\n"
-"Kas soovid üle kirjutada?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Kirjuta üle"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Viga %s salvestamisel: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "kaart.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "nimekiri"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Liiguta kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kopeeri kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Liiguta kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kopeeri kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Vali sihtaadressiraamat."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Mitu VKaarti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VKaart %s kohta"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(puudub)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Peamine e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vali tegevus"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Loo uus kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pöördumine aadressiraamatu poole..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Muuda kontakti andmeid"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Ühenda e-posti aadressid"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, c-format
-msgid "Show Full VCard"
-msgstr "Kogu VKaardi kuvamine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Kompaktse VKaardi näitamine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Salvesta aadressiraamatusse"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Veeru laius"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3182,11 +3190,6 @@ msgstr "Evolutioni VKaardi importija"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Trüki ümbrik"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Prindi kontaktid"
@@ -3196,6 +3199,11 @@ msgstr "Prindi kontaktid"
 msgid "Print contact"
 msgstr "Prindi kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Trüki ümbrik"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
@@ -3382,16 +3390,6 @@ msgstr "Testlehekülje trükkimine"
 msgid "This should test the contact print code"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-msgid "Can not open file"
-msgstr "Faili ei saa avada"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI't ei saa laadida"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Specify the output file instead of standard output"
@@ -3447,6 +3445,16 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Võimatu sisemine viga."
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+msgid "Can not open file"
+msgstr "Faili ei saa avada"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "URI't ei saa laadida"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
@@ -3464,6 +3472,7 @@ msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
 #: calendar/common/authentication.c:37
+#: calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3498,74 +3507,6 @@ msgstr "Vaikimisi tähtsus:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:954
-msgid "Calendars"
-msgstr "Kalendrid"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutioni kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution'i kalendrivaa"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i intelligentne kalendriimportija"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution'i kalendrivaa"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution'i kalendrivaa"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutioni kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:991
-#: calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:591
-#: calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Ülesanded"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarmi teenus"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Algus:"
@@ -3658,6 +3599,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarmi teenus"
+
 #: calendar/gui/alarm-notify/notify-main.c:164
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
@@ -3805,28 +3751,9 @@ msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Kokkuvõte sisaldab"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Kirjeldus sisaldab"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentaar sisaldab"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Asukoht sisaldab"
-
-#: calendar/gui/cal-search-bar.c:366
-#: camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Puudub"
-
 #: calendar/gui/calendar-commands.c:116
+#: calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #: calendar/gui/gnome-cal.c:1706
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
@@ -3854,6 +3781,7 @@ msgid "days"
 msgstr "päeva"
 
 #: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -3864,8 +3792,9 @@ msgstr "%A, %d. %B %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434
-#: calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1589
+#: calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
@@ -3873,6 +3802,9 @@ msgstr "%a, %d. %b"
 #: calendar/gui/calendar-commands.c:436
 #: calendar/gui/calendar-commands.c:441
 #: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514
+#: calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
@@ -3880,6 +3812,10 @@ msgstr "%a, %d. %b %Y"
 #: calendar/gui/calendar-commands.c:466
 #: calendar/gui/calendar-commands.c:472
 #: calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-component.c:528
+#: calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541
+#: calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
@@ -3887,83 +3823,84 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337
 #: calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:428
-#: calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Omadused..."
-
-#: calendar/gui/calendar-component.c:800
+#: calendar/gui/calendar-component.c:908
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:812
+#: calendar/gui/calendar-component.c:920
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:846
+#: calendar/gui/calendar-component.c:954
 msgid "Selected calendar is read-only, events cannot be created. Please select a read-write calendar."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1110
+#: calendar/gui/calendar-component.c:1062
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/calendar-component.c:1225
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1226
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1227
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1233
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1234
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1235
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1241
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav kohtumine"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1242
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1243
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1134
+#: calendar/gui/calendar-component.c:1249
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1250
 msgid "C_alendar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1251
 msgid "Create a new calendar"
 msgstr "Loo uus kalender"
 
@@ -3993,6 +3930,27 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Kokkuvõte sisaldab"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Asukoht sisaldab"
+
+#: calendar/gui/cal-search-bar.c:366
+#: camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Puudub"
+
 #: calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4139,6 +4097,7 @@ msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -4178,6 +4137,93 @@ msgstr "minut(it)"
 msgid "start of appointment"
 msgstr "kokkusaamise algust"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Stiili nimi:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, 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:193
+#, 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:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid "The group '%s' is remote. You must specify a location to get the calendar from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+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:7
+#: mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Vali värvus"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "Võrgus"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "Ülesandeloetelu omadused"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Add Calendar"
+msgstr "_Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr "_Grupi lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "_Uuendamise intervall:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr "_Värskenda:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "_Lähte-URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr "_Tüüp:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#: filter/filter.glade.h:23
+msgid "weeks"
+msgstr "nädalat"
+
 #  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #  has "activatable" set.
 #  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
@@ -4185,9 +4231,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:463
-#: mail/em-composer-prefs.c:663
-#: mail/em-composer-prefs.c:891
+#: mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:676
+#: mail/em-composer-prefs.c:904
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -4202,24 +4248,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: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
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:595
+#: mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 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: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
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:595
+#: mail/em-composer-prefs.c:653
+#: mail/em-composer-prefs.c:683
 msgid "Enable"
 msgstr "Luba"
 
@@ -4468,84 +4514,6 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne iga kokkusaamise algust"
 
-#: 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: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: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:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: 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 ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Ülesannetegrupi lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendri atribuudid"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Võrgus"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Ülesandeloetelu omadused"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Add Calendar"
-msgstr "_Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr "_Grupi lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Uuendamise intervall:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr "_Värskenda:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Lähte-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr "_Tüüp:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nädalat"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
 msgstr "Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele teate koosoleku ärajätmise kohta?"
@@ -4614,36 +4582,6 @@ msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada red
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideerimisviga: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2258
-msgid " to "
-msgstr " kuni "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Lõpetatud "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Tähtaeg "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Tähtaeg "
-
 #: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
@@ -4679,7 +4617,7 @@ msgstr "Kokkuvõte puudub"
 #: calendar/gui/dialogs/comp-editor.c:1376
 #: calendar/gui/e-calendar-table.c:1175
 #: calendar/gui/e-calendar-view.c:1037
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1191
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
@@ -4693,6 +4631,36 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni ei saa kasutada!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideerimisviga: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187
+#: calendar/gui/print.c:2258
+msgid " to "
+msgstr " kuni "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191
+#: calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193
+#: calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Lõpetatud "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198
+#: calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Tähtaeg "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200
+#: calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Tähtaeg "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Lähteallika avamine ebaõnnestus"
@@ -4922,12 +4890,12 @@ 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: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
+#: calendar/gui/e-cal-model-tasks.c:618
+#: composer/e-msg-composer.c:2110
+#: mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:805
+#: mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:2039
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257
@@ -4960,8 +4928,8 @@ msgstr "_Delegeerida..."
 #: calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1312
 #: calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609
-#: mail/em-folder-view.c:795
+#: mail/em-folder-tree.c:2611
+#: mail/em-folder-view.c:796
 #: ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17
@@ -5241,27 +5209,18 @@ msgstr "Salvesta sündmus"
 
 #  create the dialog
 #  create the dialog
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 msgid "Select source"
 msgstr "Vali lähte "
 
-#  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);
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr "Vali sihtkoht %s"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalender"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Sihtkoht:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Ülesannete nimekiri"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5290,9 +5249,10 @@ msgid "% _Complete"
 msgstr "(%) _valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:625
+#: calendar/gui/e-cal-component-preview.c:230
 #: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:624
 #: calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
@@ -5300,37 +5260,42 @@ msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-cal-component-preview.c:249
 #: calendar/gui/e-calendar-table.c:374
-#: mail/message-list.c:923
+#: mail/message-list.c:928
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: 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-cal-component-preview.c:227
 #: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:622
+#: calendar/gui/e-cal-model-tasks.c:697
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:253
 #: calendar/gui/e-calendar-table.c:376
-#: mail/message-list.c:921
+#: mail/message-list.c:926
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:875
+#: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-model.c:875
+#: mail/message-list.c:927
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:621
+#: calendar/gui/e-cal-component-preview.c:237
 #: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:620
 #: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Pole alanud"
@@ -5380,6 +5345,7 @@ msgid "Con_fidential"
 msgstr "_Salajane"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:982
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
@@ -5500,122 +5466,63 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-component-preview.c:71
+#: mail/em-folder-view.c:2215
+#, c-format
+msgid "Click to open %s"
+msgstr "Avamiseks kliki %s"
+
+#: calendar/gui/e-cal-component-preview.c:156
+#: filter/filter-rule.c:750
+msgid "Untitled"
+msgstr "Nimetu"
+
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Alguskuupäev:"
+
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Tähtaeg:"
+
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Olek:"
+
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "Tähtsus:"
+
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Veebilehekülg:"
+
+#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-cal-list-view.c:257
 #: calendar/gui/e-cal-model.c:321
 #: calendar/gui/e-cal-model.c:328
-#: calendar/gui/e-calendar-table.c:352
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/e-cal-list-view.c:256
-#: calendar/gui/e-cal-model.c:330
 #: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:332
 #: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Lõppemise kuupäev"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Alguskuupäev"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kokkuvõte"
-
-#: calendar/gui/e-cal-model-calendar.c:163
-#: calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Vaba"
-
-#: calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Hõivatud"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Põ"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Lõ"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-#: smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Ida"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Lä"
-
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geograafiline asukoht peab olema sisestatud formaadis: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:981
-#: calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:168
-#: calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169
-#: calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Jah"
-
-#: calendar/gui/e-cal-model-tasks.c:981
-#: calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:169
-#: calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ei"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334
-#: calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967
-#: calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674
-#: camel/camel-gpg-context.c:1725
-#: 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:2120
-#: shell/e-component-registry.c:170
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tundmatu"
-
-#: calendar/gui/e-cal-model.c:877
-msgid "Recurring"
-msgstr "Korduv"
-
-#: calendar/gui/e-cal-model.c:879
-msgid "Assigned"
-msgstr "Määratud"
-
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
@@ -5660,6 +5567,17 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Vaba"
+
+#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Hõivatud"
+
 #: calendar/gui/e-calendar-table.c:683
 #: calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
@@ -5674,7 +5592,7 @@ msgstr "Objektide uuendamine"
 #: calendar/gui/e-calendar-table.c:1063
 #: calendar/gui/e-calendar-view.c:1292
 #: calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:771
 #: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
@@ -5687,9 +5605,9 @@ msgstr "_Ava veebilehekülg"
 #: calendar/gui/e-calendar-table.c:1069
 #: calendar/gui/e-calendar-view.c:1293
 #: calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:772
+#: mail/em-folder-view.c:773
 #: mail/em-popup.c:690
-#: mail/em-popup.c:805
+#: mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
@@ -5722,7 +5640,7 @@ msgstr "_Lõika"
 #: calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1300
 #: calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602
+#: mail/em-folder-tree.c:2604
 #: ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7
@@ -5798,6 +5716,12 @@ msgstr "Tähtsus"
 msgid "Start date"
 msgstr "Alguskuupäev"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "Kokkuvõte"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
@@ -5875,6 +5799,92 @@ msgstr "_Mine kuupäevale..."
 msgid "_Settings..."
 msgstr "_Sätted..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Lõppemise kuupäev"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Alguskuupäev"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334
+#: calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150
+#: calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1674
+#: camel/camel-gpg-context.c:1725
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: mail/em-utils.c:1046
+#: shell/e-component-registry.c:170
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: calendar/gui/e-cal-model.c:877
+msgid "Recurring"
+msgstr "Korduv"
+
+#: calendar/gui/e-cal-model.c:879
+msgid "Assigned"
+msgstr "Määratud"
+
+#: calendar/gui/e-cal-model.c:881
+#: calendar/gui/e-cal-model-tasks.c:980
+#: calendar/gui/e-meeting-list-view.c:168
+#: calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169
+#: calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Jah"
+
+#: calendar/gui/e-cal-model.c:881
+#: calendar/gui/e-cal-model-tasks.c:980
+#: calendar/gui/e-meeting-list-view.c:169
+#: calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ei"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Põ"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Lõ"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+#: smime/lib/e-cert.c:629
+msgid "E"
+msgstr "Ida"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Lä"
+
+#: calendar/gui/e-cal-model-tasks.c:572
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geograafiline asukoht peab olema sisestatud formaadis: \n"
+"\n"
+"45.436845,125.862501"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
@@ -5908,10 +5918,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, fuzzy, c-format
-msgid "%02i minute divisions"
-msgstr "Segmendilised alamjaotised"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:818
+#: calendar/gui/e-week-view.c:593
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "el"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:821
+#: calendar/gui/e-week-view.c:596
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pl"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -5919,8 +5938,8 @@ msgstr "Segmendilised alamjaotised"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320
 #: calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5931,25 +5950,16 @@ msgstr "%A, %d. %B"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818
-#: calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "el"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821
-#: calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pl"
+#: calendar/gui/e-day-view-time-item.c:532
+#, fuzzy, c-format
+msgid "%02i minute divisions"
+msgstr "Segmendilised alamjaotised"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6024,10 +6034,6 @@ msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  s
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Olek:"
-
 #: calendar/gui/e-itip-control.c:955
 #: calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179
@@ -6476,40 +6482,6 @@ msgstr "Delegeeritud"
 msgid "In Process"
 msgstr "Töös"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296
-#: e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460
-#: e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299
-#: widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
 #: calendar/gui/e-meeting-time-sel.c:400
 #: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
@@ -6571,7 +6543,46 @@ msgstr "Koosoleku _algus:"
 msgid "Meeting _end time:"
 msgstr "Koosoleku l_õpp:"
 
-#: calendar/gui/e-tasks.c:615
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296
+#: e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: calendar/gui/e-meeting-time-sel-item.c:460
+#: e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299
+#: widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Sisesta sisesta parool %s jaoks"
+
+#: calendar/gui/e-tasks.c:582
 #: calendar/gui/gnome-cal.c:2021
 #, c-format
 msgid ""
@@ -6581,7 +6592,7 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:610
 #: calendar/gui/gnome-cal.c:2060
 #, c-format
 msgid "The task backend for '%s' has crashed."
@@ -6589,34 +6600,45 @@ msgstr ""
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:717
+#: calendar/gui/e-tasks.c:684
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:740
+#: calendar/gui/e-tasks.c:707
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Tõrge faili %s avamisel!"
 
-#: calendar/gui/e-tasks.c:761
+#: calendar/gui/e-tasks.c:728
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: calendar/gui/e-tasks.c:865
+#: calendar/gui/e-tasks.c:832
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:855
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:915
+#: calendar/gui/e-tasks.c:882
 msgid "Expunging"
 msgstr "Puhastamine"
 
+#: calendar/gui/e-tasks.c:958
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:637
+#: calendar/gui/tasks-control.c:516
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Ülesanded"
+
 #: calendar/gui/gnome-cal.c:1879
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
@@ -6637,10 +6659,58 @@ msgstr "%s avamine"
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2895
+#: calendar/gui/gnome-cal.c:2897
 msgid "Purging"
 msgstr "Puhastamine"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutioni kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution'i kalendrivaa"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i intelligentne kalendriimportija"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution'i kalendrivaa"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution'i kalendrivaa"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutioni kalender ja ülesanded"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -7024,49 +7094,52 @@ msgstr "Trüki kirje"
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:469
+#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:400
+#: mail/mail-component.c:532
+#: calendar/gui/tasks-component.c:515
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:481
+#: calendar/gui/tasks-component.c:527
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:519
+#: calendar/gui/tasks-component.c:565
 msgid "Selected task list is read-only, events cannot be created. Please select a read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:793
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:794
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:795
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:801
 msgid "New tasks group"
 msgstr "Uus ülesannet grupp"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:802
 msgid "_Tasks Group"
 msgstr "Ü_lesannete grupp"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:803
 msgid "Create a new tasks group"
 msgstr "Loo uus kontaktide grupp"
 
@@ -8846,33 +8919,6 @@ msgstr "<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b><
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Otsinguavaldist ei ole võimalik analüüsida: %s\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, fuzzy, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr "Viga otsingu avaldises."
-
-#: camel/camel-folder-search.c:569
-#: camel/camel-folder-search.c:598
-#, fuzzy
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
-
-#: camel/camel-folder-search.c:650
-#, fuzzy, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Täidetakse päring tundmatul päisel: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8904,6 +8950,33 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Uute sõnumite filtreerimine"
 
+#: camel/camel-folder-search.c:348
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Otsinguavaldist ei ole võimalik analüüsida: %s\n"
+"%s"
+
+#: camel/camel-folder-search.c:358
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr "Viga otsingu avaldises."
+
+#: camel/camel-folder-search.c:569
+#: camel/camel-folder-search.c:598
+#, fuzzy
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
+
+#: camel/camel-folder-search.c:650
+#, fuzzy, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Täidetakse päring tundmatul päisel: %s"
+
 #: camel/camel-gpg-context.c:712
 #, c-format
 msgid ""
@@ -8938,7 +9011,7 @@ msgstr ""
 #: camel/camel-gpg-context.c:1425
 #: camel/camel-gpg-context.c:1517
 #: camel/camel-gpg-context.c:1624
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
@@ -9032,27 +9105,6 @@ msgstr "Krüpteeritud sisu"
 msgid "Unable to parse message content"
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
-#: camel/camel-lock-client.c:100
-#, fuzzy, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ei suuda luua lukustamisabilise toru: %s"
-
-#: camel/camel-lock-client.c:113
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
-
-#: camel/camel-lock-client.c:191
-#: camel/camel-lock-client.c:214
-#, fuzzy, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
-
-#: camel/camel-lock-client.c:204
-#, fuzzy, c-format
-msgid "Could not lock '%s'"
-msgstr "%s: Ei saa lukustada küpsise faili %s"
-
 #: camel/camel-lock.c:92
 #: camel/camel-lock.c:113
 #, fuzzy, c-format
@@ -9074,6 +9126,27 @@ msgstr "fcntl(2) abil lukustamine nurjus: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) abil lukustamine nurjus: %s"
 
+#: camel/camel-lock-client.c:100
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ei suuda luua lukustamisabilise toru: %s"
+
+#: camel/camel-lock-client.c:113
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
+
+#: camel/camel-lock-client.c:191
+#: camel/camel-lock-client.c:214
+#, fuzzy, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
+
+#: camel/camel-lock-client.c:204
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "%s: Ei saa lukustada küpsise faili %s"
+
 #: camel/camel-movemail.c:107
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
@@ -9644,6 +9717,7 @@ msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #  PORT_GetError(); ??
+#. PORT_GetError(); ??
 #: camel/camel-smime-context.c:816
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
@@ -9912,6 +9986,7 @@ msgstr ""
 
 #  construct our user prompt
 #  construct our user prompt
+#. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
 #, c-format
 msgid ""
@@ -9964,18 +10039,18 @@ msgstr "_Sertifikaadi ID:"
 msgid "Could not parse URL `%s'"
 msgstr "URL'i `%s' ei saa töödelda"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Viga `%s' salvestamisel: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:673
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:820
-#: camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:839
+#: camel/camel-vee-folder.c:845
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 
@@ -10003,10 +10078,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Sõnumeid ei saa kopeerida Rämpsu kausta"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Kontrollin uusi sõnumeid"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
@@ -10037,6 +10114,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -10056,6 +10134,290 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ootamatu vastus IMAP serverilt %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Ühendus serverisse suleti ootamatult"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Saadi BYE vastus"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Kaustad"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Näita ainult tellitud kaustu"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Nimeruum"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "E-posti loetakse ja hoitakse IMAP serveris."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:424
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Teenu&sest võrgus teatamine"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:565
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Ei saa ühenduda %s (port: %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL ei ole saadaval"
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:562
+#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Ühendus katkestatud"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
+msgstr "Ei saa luua ühendust LDAP serveriga"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:633
+#: camel/providers/imap/camel-imap-store.c:664
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Ei saa luua ühendust LDAP serveriga"
+
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545
+#: shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#, c-format
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1032
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1034
+msgid "Bad command"
+msgstr "Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1095
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1144
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Andmeid pole"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Konto tüüp: lahutatud IMAP konto"
+
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -10069,14 +10431,6 @@ msgstr "Operatsioon katekstatud"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545
-#: shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Tundmatu viga"
-
 #  for imap ALERT codes, account user@host
 #  for imap ALERT codes, account user@host
 #. for imap ALERT codes, account user@host
@@ -10210,23 +10564,6 @@ msgstr "Parool proxyserveriga ühendumiseks."
 msgid "Command:"
 msgstr "Käsk:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kaustad"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Näita ainult tellitud kaustu"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nimeruum"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Rakenda filtreid kõikidele Sisendkasti uutele sõnumitele"
@@ -10248,48 +10585,6 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Teenu&sest võrgus teatamine"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ei saa ühenduda %s (port: %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL ei ole saadaval"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Ühendus katkestatud"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Ei saa luua ühendust LDAP serveriga"
-
 #: camel/providers/imap/camel-imap-store.c:634
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
@@ -10348,7 +10643,7 @@ msgstr "Kausta %s ei leitud"
 #: camel/providers/imap/camel-imap-store.c:2185
 #, fuzzy, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
+msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
 
 #: camel/providers/imap/camel-imap-store.c:1865
 #: camel/providers/imap/camel-imap-store.c:2246
@@ -11159,8 +11454,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
+#: composer/e-msg-composer.c:1223
+#: composer/e-msg-composer.c:1244
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
@@ -11597,7 +11892,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: composer/e-msg-composer-attachment-bar.c:295
-#: mail/em-utils.c:1478
+#: mail/em-utils.c:404
 msgid "attachment"
 msgstr "manus"
 
@@ -11641,6 +11936,90 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
+#: composer/e-msg-composer.c:703
+#, 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:709
+#, 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:1281
+#, fuzzy
+msgid "Could not open file"
+msgstr "Faili avamine ebaõnnestus"
+
+#: composer/e-msg-composer.c:1289
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Sõnumi vastuvõtmine nurjus"
+
+#: composer/e-msg-composer.c:1559
+msgid "Untitled Message"
+msgstr "Pealkirjata sõnum"
+
+#: composer/e-msg-composer.c:1589
+msgid "Open file"
+msgstr "Ava fail"
+
+#: composer/e-msg-composer.c:1996
+#: mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automaatselt genereeritud"
+
+#: composer/e-msg-composer.c:2095
+msgid "Signature:"
+msgstr "Allkiri:"
+
+#: composer/e-msg-composer.c:2296
+#: composer/e-msg-composer.c:2325
+#, c-format
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba peitmine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2328
+#: composer/e-msg-composer.c:3232
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba kuvamine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2345
+#: composer/e-msg-composer.c:3111
+#: composer/e-msg-composer.c:3112
+msgid "Compose a message"
+msgstr "Sõnumi koostamine"
+
+#: composer/e-msg-composer.c:3145
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:3173
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"Ei saa luua sõnumiredaktori akent:\n"
+"Ei saa aktiveerida HTML redaktori komponenti.\n"
+"Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
+"versioonid on paigaldatud.\n"
+
+#: composer/e-msg-composer.c:3277
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Ei saa luua sõnumiredaktori akent:\n"
+"Ei saa aktiveerida HTML redaktori komponenti."
+
+#: composer/e-msg-composer.c:4282
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgstr ""
+
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -11726,90 +12105,6 @@ msgstr "Vea valimiseks numbri järgi klõpsa siia"
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: 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: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:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Faili avamine ebaõnnestus"
-
-#: 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:1551
-msgid "Untitled Message"
-msgstr "Pealkirjata sõnum"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Ava fail"
-
-#: composer/e-msg-composer.c:1988
-#: mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automaatselt genereeritud"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Allkiri:"
-
-#: 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: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: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:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3165
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Ei saa luua sõnumiredaktori akent:\n"
-"Ei saa aktiveerida HTML redaktori komponenti.\n"
-"Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
-"versioonid on paigaldatud.\n"
-
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Ei saa luua sõnumiredaktori akent:\n"
-"Ei saa aktiveerida HTML redaktori komponenti."
-
-#: 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 "${1}"
@@ -12032,6 +12327,7 @@ msgstr ""
 "Kirjutada üle?"
 
 #: e-util/e-dialog-utils.c:251
+#: widgets/misc/e-system-errors.xml.in.h:7
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -12320,75 +12616,10 @@ msgstr "<b>siis</b>"
 
 #: filter/filter-folder.c:237
 #: filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: filter/filter-label.c:121
-#: filter/libfilter-i18n.h:26
-#: mail/em-migrate.c:922
-#: mail/mail-config.c:65
-#: mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Tähtis"
-
-#  forest green
-#  forest green
-#. forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:925
-#: mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Ülesanne"
-
-#  blue
-#  blue
-#. blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:926
-#: mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Hiljem"
-
-#: filter/filter-part.c:532
-#: shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Reegli nimi:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Nimetu"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>kui</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Tegevused viiakse täide"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "kui kõik tingimused on täidetud"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "kui üks tingimustest on täidetud"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "sissetulev"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "väljaminev"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12483,6 +12714,67 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
+#: filter/filter-label.c:121
+#: filter/libfilter-i18n.h:26
+#: mail/em-migrate.c:922
+#: mail/mail-config.c:76
+#: mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Tähtis"
+
+#  forest green
+#  forest green
+#. forest green
+#: filter/filter-label.c:124
+#: mail/em-migrate.c:925
+#: mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Ülesanne"
+
+#  blue
+#  blue
+#. blue
+#: filter/filter-label.c:125
+#: mail/em-migrate.c:926
+#: mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Hiljem"
+
+#: filter/filter-part.c:532
+#: shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:746
+msgid "Rule name:"
+msgstr "Reegli nimi:"
+
+#: filter/filter-rule.c:773
+msgid "<b>If</b>"
+msgstr "<b>kui</b>"
+
+#: filter/filter-rule.c:804
+msgid "Execute actions"
+msgstr "Tegevused viiakse täide"
+
+#: filter/filter-rule.c:808
+msgid "if all criteria are met"
+msgstr "kui kõik tingimused on täidetud"
+
+#: filter/filter-rule.c:813
+msgid "if any criteria are met"
+msgstr "kui üks tingimustest on täidetud"
+
+#: filter/filter-rule.c:904
+msgid "incoming"
+msgstr "sissetulev"
+
+#: filter/filter-rule.c:904
+msgid "outgoing"
+msgstr "väljaminev"
+
 #  Automatically generated. Do not edit.
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
@@ -12616,7 +12908,7 @@ msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
 #: filter/libfilter-i18n.h:37
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:804
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -12655,7 +12947,7 @@ msgid "Play Sound"
 msgstr "Mängi heli"
 
 #: filter/libfilter-i18n.h:46
-#: mail/message-tag-followup.c:68
+#: mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Loetud"
 
@@ -12727,12 +13019,12 @@ msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
 #: filter/libfilter-i18n.h:64
+#: mail/em-format.c:747
 #: mail/em-format-html.c:1542
 #: mail/em-format-quote.c:301
-#: mail/em-format.c:747
-#: mail/em-mailer-prefs.c:72
+#: mail/em-mailer-prefs.c:89
 #: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:318
+#: mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Teema"
@@ -12800,113 +13092,68 @@ msgstr "Virtuaalsed _kaustad"
 msgid "VFolder source"
 msgstr "VKausta allikas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Kella häälestus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sisesta siia oma meiliaadress"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolutioni meiliklient"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Meiliklient Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutioni kirjakoostaja"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-# !PARANDA!
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Saa&detud kirjade kaust:"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolutioni Netscape Mail'i importija"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418
-#: mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474
-#: mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-Post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Meilikontod"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Meili häälestus"
-
 #  translators: default account indicator
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292
-#: mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305
+#: mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1049
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:908
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:954
 msgid "Add signature script"
 msgstr "Lisa allkirjaskript"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:974
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:883
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Edastatud sõnum --------"
+
+#: mail/em-composer-utils.c:1494
+msgid "an unknown sender"
+msgstr "tundmatu saatja"
+
+#  translators: attribution string used when quoting messages,
+#  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-composer-utils.c:1504
+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-folder-browser.c:140
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
+#: mail/em-folder-browser.c:893
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418
+#: mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474
+#: mail/mail-component.c:540
+#: mail/mail-component.c:583
+msgid "Mail"
+msgstr "E-Post"
+
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Kausta omadused"
@@ -12940,94 +13187,70 @@ msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
 #: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-tree.c:2336
+#: mail/mail-component.c:732
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree-model.c:196
-#: mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VKaustad"
-
-#  UNMATCHED is always last
-#. 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
-#. 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:465
-#: mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Laadimine..."
-
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:935
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:937
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:944
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:946
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:962
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:2108
-#: mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:672
-#: mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2123
+#: mail/em-folder-view.c:673
+#: mail/em-folder-view.c:687
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2150
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-tree.c:2336
+#: mail/mail-component.c:732
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2528
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2530
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2597
+#: mail/em-folder-tree.c:2599
 #: ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18
 #: ui/evolution-mail-messagedisplay.xml.h:8
@@ -13036,317 +13259,348 @@ msgstr "Kataloogi ümbernimetamine"
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2600
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2603
+#: mail/em-folder-tree.c:2605
 msgid "_Move"
 msgstr "_Liiguta"
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2609
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2612
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2613
+#: mail/em-folder-tree.c:2615
 #: ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Omadused..."
 
+#: mail/em-folder-tree-model.c:199
+#: mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:851
+msgid "VFolders"
+msgstr "VKaustad"
+
+#  UNMATCHED is always last
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205
+#: mail/em-folder-tree-model.c:207
+#, fuzzy
+msgid "UNMATCHED"
+msgstr "Puudub \\{"
+
+#  Inbox is always first
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211
+#: mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Sisendkast"
+
+#: mail/em-folder-tree-model.c:468
+#: mail/em-folder-tree-model.c:777
+msgid "Loading..."
+msgstr "Laadimine..."
+
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771
+#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
+#: mail/em-folder-view.c:772
 #: mail/em-popup.c:689
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:774
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:777
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:777
-#: mail/em-popup.c:809
+#: mail/em-folder-view.c:778
+#: mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:778
-#: mail/em-popup.c:810
+#: mail/em-folder-view.c:779
+#: mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:779
-#: mail/em-popup.c:812
+#: mail/em-folder-view.c:780
+#: mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
 msgid "Follo_w Up..."
 msgstr "Vastu_kaja..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
 msgid "Fla_g Completed"
 msgstr "Märgista kui lõpetatud"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:785
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:788
 #: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:789
 msgid "Mark as _Unread"
 msgstr "Märgi _mitteloetuks"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:791
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:792
 #: ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:793
 #: ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista kui _mitte rämps"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:797
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:800
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:801
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:809
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
 msgid "Appl_y Filters"
 msgstr "Rakenda _filtrid"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:813
 msgid "F_ilter Junk"
 msgstr "_Rämpsu filtreerimine"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:820
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _meililoendi järgi"
 
-#: mail/em-folder-view.c:821
+#: mail/em-folder-view.c:822
 msgid "VFolder on Thread"
 msgstr "VKaust teemalõnga alusel"
 
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:829
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
-#: mail/em-folder-view.c:830
+#: mail/em-folder-view.c:831
 msgid "Filter on Thread"
 msgstr "Filter teemalõnga järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613
-#: mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1614
+#: mail/em-folder-view.c:1652
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1688
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:1951
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2210
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#: mail/em-folder-view.c:2214
+#: mail/em-format.c:742
+#: mail/em-format-html.c:1436
+#: mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:84
+#: mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Saatja"
+
+#: mail/em-format.c:743
+#: mail/em-format-html.c:1436
+#: mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:85
+msgid "Reply-To"
+msgstr "Vastus-Kuhu"
+
+#: mail/em-format.c:744
+#: mail/em-format-html.c:1436
+#: mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:86
+#: mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kellele"
+
+#: mail/em-format.c:745
+#: mail/em-format-html.c:1436
+#: mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:87
+msgid "Cc"
+msgstr "Koopia"
+
+#: mail/em-format.c:746
+#: mail/em-format-html.c:1436
+#: mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:88
+msgid "Bcc"
+msgstr "Pimekoopia"
+
+#: mail/em-format.c:748
+#: mail/em-format-html.c:1586
+#: mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:90
+#: mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Kuupäev"
+
+#: mail/em-format.c:749
+#: mail/em-format-html.c:1607
+#: mail/em-mailer-prefs.c:91
+msgid "Newsgroups"
+msgstr "Uudisegrupid"
+
+#: mail/em-format.c:986
 #, c-format
-msgid "Click to open %s"
-msgstr "Avamiseks kliki %s"
+msgid "%s attachment"
+msgstr "\"%s\" tüüpi manus"
 
-#  message-search popup match count string
-#  message-search popup match count string
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:1065
+#: mail/em-format.c:1184
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
+
+#: mail/em-format.c:1174
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1320
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
+
+#: mail/em-format.c:1339
+msgid "Unsupported signature format"
+msgstr "Toetamata allkirjavorming"
+
+#: mail/em-format.c:1347
+msgid "Error verifying signature"
+msgstr "Viga allkirja tõestamisel"
+
+#: mail/em-format.c:1347
+msgid "Unknown error verifying signature"
+msgstr "Tundmatu viga allkirja tõestamisel"
+
+#: mail/em-format-html.c:462
+#: mail/em-format-html.c:464
 #, c-format
-msgid "Matches: %d"
-msgstr "Sobivaid: %d"
+msgid "Retrieving `%s'"
+msgstr "`%s' tõmbamine"
 
-#: mail/em-format-html-display.c:646
 #: mail/em-format-html.c:569
+#: mail/em-format-html-display.c:646
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html-display.c:646
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
-
-#: mail/em-format-html-display.c:647
 #: mail/em-format-html.c:570
+#: mail/em-format-html-display.c:647
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html-display.c:647
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist on tõese sõnumiga."
-
-#: mail/em-format-html-display.c:648
 #: mail/em-format-html.c:571
+#: mail/em-format-html-display.c:648
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html-display.c:648
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:649
 #: mail/em-format-html.c:572
+#: mail/em-format-html-display.c:649
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html-display.c:649
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr ""
-
-#: mail/em-format-html-display.c:655
 #: mail/em-format-html.c:578
+#: mail/em-format-html-display.c:655
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html-display.c:655
-msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:656
 #: mail/em-format-html.c:579
+#: mail/em-format-html-display.c:656
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html-display.c:656
-msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:657
 #: mail/em-format-html.c:580
+#: mail/em-format-html-display.c:657
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html-display.c:657
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr ""
-
-#: mail/em-format-html-display.c:658
 #: mail/em-format-html.c:581
+#: mail/em-format-html-display.c:658
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: mail/em-format-html-display.c:658
-msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
-msgstr "_Sertifikaadi kuvamine"
-
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
-msgstr "See sertifikaat ei ole kuvatav"
-
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
-msgstr "Tähtaja ületanud:"
-
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
-msgstr "_Sisekuva"
-
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
-msgstr "_Peida"
-
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "Lehekülg %d %d-st"
-
-#: mail/em-format-html.c:462
-#: mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' tõmbamine"
-
 #: mail/em-format-html.c:843
 msgid "Malformed external-body part."
 msgstr ""
@@ -13380,48 +13634,10 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: mail/em-format-html.c:1436
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67
-#: mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Saatja"
-
-#: mail/em-format-html.c:1436
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Vastus-Kuhu"
-
-#: mail/em-format-html.c:1436
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kellele"
-
-#: mail/em-format-html.c:1436
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Koopia"
-
-#: mail/em-format-html.c:1436
-#: mail/em-format-quote.c:191
-#: mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Pimekoopia"
-
 #. pseudo-header
 #: mail/em-format-html.c:1546
 #: mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-mailer-prefs.c:935
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
@@ -13431,6 +13647,7 @@ msgstr "Postiprogramm:"
 #  translators: strftime format for local time equivalent in Date header display, with day
 #  translators: strftime format for local time equivalent in Date header display, with day
 #  translators: strftime format for local time equivalent in Date header display, with day
+#. translators: strftime format for local time equivalent in Date header display, with day
 #: mail/em-format-html.c:1573
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
@@ -13439,71 +13656,101 @@ msgstr "<I> (%a, %R %Z)</I>"
 #  translators: strftime format for local time equivalent in Date header display, without day
 #  translators: strftime format for local time equivalent in Date header display, without day
 #  translators: strftime format for local time equivalent in Date header display, without day
+#. translators: strftime format for local time equivalent in Date header display, without day
 #: mail/em-format-html.c:1576
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1586
-#: mail/em-format-quote.c:315
-#: mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Kuupäev"
+#  message-search popup match count string
+#  message-search popup match count string
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr "Sobivaid: %d"
 
-#: mail/em-format-html.c:1607
-#: mail/em-format.c:749
-#: mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Uudisegrupid"
+#: mail/em-format-html-display.c:646
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "\"%s\" tüüpi manus"
+#: mail/em-format-html-display.c:647
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist on tõese sõnumiga."
 
-#: mail/em-format.c:1065
-#: mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
+#: mail/em-format-html-display.c:648
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:649
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
+#: mail/em-format-html-display.c:655
+msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
+msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Toetamata allkirjavorming"
+#: mail/em-format-html-display.c:656
+msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Viga allkirja tõestamisel"
+#: mail/em-format-html-display.c:657
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Tundmatu viga allkirja tõestamisel"
+#: mail/em-format-html-display.c:658
+msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:755
+msgid "_View Certificate"
+msgstr "_Sertifikaadi kuvamine"
+
+#: mail/em-format-html-display.c:770
+msgid "This certificate is not viewable"
+msgstr "See sertifikaat ei ole kuvatav"
+
+#: mail/em-format-html-display.c:1002
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1010
+msgid "Overdue:"
+msgstr "Tähtaja ületanud:"
+
+#: mail/em-format-html-display.c:1013
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1083
+msgid "_View Inline"
+msgstr "_Sisekuva"
+
+#: mail/em-format-html-display.c:1084
+msgid "_Hide"
+msgstr "_Peida"
+
+#: mail/em-format-html-print.c:125
+#, c-format
+msgid "Page %d of %d"
+msgstr "Lehekülg %d %d-st"
 
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:102
 msgid "Every time"
 msgstr "Iga kord"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:103
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:104
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:105
 msgid "Once per month"
 msgstr "Kord kuus"
 
@@ -13550,27 +13797,27 @@ msgstr "Salvesta kui..."
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "S_aada sõnum..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
@@ -13599,46 +13846,31 @@ msgstr "Palun vali server."
 msgid "No server has been selected"
 msgstr "Asukoht ei ole määratud!"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:98
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Seda teadet rohkem ei näidata"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:288
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Edastatud sõnum --------"
-
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr "tundmatu saatja"
-
-#  translators: attribution string used when quoting messages,
-#  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: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:1476
+#: mail/em-utils.c:402
 msgid "message"
 msgstr "sõnum"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:505
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:554
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:989
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
@@ -13768,374 +14000,411 @@ msgid "List of Labels and their associated colors"
 msgstr "Otsingumootorite ja neile vastavate veebikiirkorralduste nimekiri"
 
 #: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "List of accepted licenses"
+msgstr "UUEncoded (laialt levinud)"
+
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
 msgstr "Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on aadressiraamatus 3 - Alati laadi pildid võrgust maha."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Märgi Nähtud staatusega peale määratud taimauti"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Märgi Nähtud staatusega peale määratud taimauti."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "Vaikimisi sõnumiakna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Sõnumi kuvamise laad (tavaline, kõik päised, lähtekood)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "E-posti seadistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Uus parool uuesti: "
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "Prompt on empty subject"
 msgstr "tühi koht tableaul"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid "Prompt when user expunges"
 msgstr "Kasutajalt sobiva suuruse küsimine"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "S3kr3t 0pt10n"
 msgstr "S414j4n3 5uv4nd"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "S3kr3t 0pt10n."
 msgstr "S414j4n3 5uv4nd."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Vaikimisi kirjade saatmine HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Vaikimisi kirjade saatmine HTML formaadis."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloetelus"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Õigekirja kontrolli ettevalmistamine"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Subscribe dialog default height"
 msgstr "Muuda rea kõrguse vaikeväärtust"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 #, fuzzy
 msgid "Subscribe dialog default width"
 msgstr "Muuda veergude laiuse vaikeväärtust"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 #, fuzzy
 msgid "Thread the message list."
 msgstr "&Kirjade päiste nimekiri lõimena"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "&Kirjade päiste nimekiri lõimena"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:90
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamasssassin daemon and client"
 msgstr "Kasuta Spamassassini deemonit ja klienti"
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr "Kasuta Spamassassini deemonit ja klienti (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine meili näitamisel"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Kasuta ainult lokaalseid spämmiteste."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:99
 #, fuzzy
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:101
 #, fuzzy
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:102
 #, fuzzy
 msgid "View/From menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: mail/evolution-mail.schemas.in.in.h:103
 #, fuzzy
 msgid "View/From menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: mail/evolution-mail.schemas.in.in.h:104
 #, fuzzy
 msgid "View/PostTo menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: mail/evolution-mail.schemas.in.in.h:105
 #, fuzzy
 msgid "View/PostTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: mail/evolution-mail.schemas.in.in.h:106
 #, fuzzy
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: mail/evolution-mail.schemas.in.in.h:107
 #, fuzzy
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "spamd port"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutioni Elm'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Kella häälestus"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutioni Netscape Mail'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr ""
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutioni Outlook Express 4 importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutioni Pine'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sisesta siia oma meiliaadress"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolutioni meiliklient"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Meiliklient Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolutioni kirjakoostaja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
 # !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolutioni mbox'i importija"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Saa&detud kirjade kaust:"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutioni Netscape Mail'i importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Expressi 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Meilikontod"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Meili häälestus"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14143,7 +14412,7 @@ msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:226
 #: mail/importers/netscape-importer.c:1221
 #: mail/importers/pine-importer.c:117
 msgid "Importing..."
@@ -14151,7 +14420,7 @@ msgstr "Importimine..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:228
 #: mail/importers/netscape-importer.c:1223
 #: mail/importers/pine-importer.c:119
 msgid "Please wait"
@@ -14183,18 +14452,51 @@ msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: mail/importers/mail-importer.c:354
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutioni Elm'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutioni Netscape Mail'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutioni Outlook Express 4 importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolutioni Pine'i importija"
+
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolutioni mbox'i importija"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Expressi 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
@@ -14290,180 +14592,189 @@ msgstr "Pine"
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-account-gui.c:946
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "&Litsents"
+
+#: mail/mail-account-gui.c:954
 #: mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:950
+#: mail/mail-account-gui.c:958
 #: mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:954
+#: mail/mail-account-gui.c:962
 #: mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Meiliaadressile"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s meililist"
 
-#: mail/mail-autofilter.c:318
+#: mail/mail-autofilter.c:317
 #, c-format
 msgid "Replies to %s"
 msgstr "Vastused aadressile %s"
 
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:493
 #, c-format
 msgid "%d deleted"
 msgstr "%d kustutatud"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:495
 #, c-format
 msgid "%d junk"
 msgstr "%d rämps"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:518
 #, c-format
 msgid "%d drafts"
 msgstr "%d mustandid"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:520
 #, c-format
 msgid "%d sent"
 msgstr "%d saadetud"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:522
 #, c-format
 msgid "%d unsent"
 msgstr "%d saatmata"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:526
 #, c-format
 msgid "%d total"
 msgstr "%d kokku"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:528
 #, c-format
 msgid ", %d unread"
 msgstr ", %d lugemata"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Valitud:"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:685
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:686
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:871
+#: mail/mail-component.c:872
 #, fuzzy
 msgid "URI of the mail source that the view will display"
 msgstr "URI, mida kalender näitab"
 
-#: mail/mail-config-druid.c:364
+#: mail/mail-config.c:899
+msgid "Checking Service"
+msgstr "Teenuse kontrollimine"
+
+#: mail/mail-config.c:977
+#: mail/mail-config.c:981
+msgid "Connecting to server..."
+msgstr "Serveriga ühendumine..."
+
+#: mail/mail-config-druid.c:362
 #: mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr ""
 "Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
 "võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
 
-#: mail/mail-config-druid.c:372
-#: mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370
+#: mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Meili vastuvõtmine"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. Kui sa ei ole para-\n"
 "meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:382
 #: mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Meili saatmine"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
 "parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:391
+#: mail/mail-config-druid.c:389
 #: mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Teenuse kontrollimine"
-
-#: mail/mail-config.c:966
-#: mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Serveriga ühendumine..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
@@ -14612,11 +14923,11 @@ msgstr ""
 
 #: mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr ""
+msgstr "_Alati saada koopia (cc):"
 
 #: mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr ""
+msgstr "Alati saada _pimekoopia (cc):"
 
 #: mail/mail-config.glade.h:42
 #, fuzzy
@@ -14675,7 +14986,7 @@ msgstr "Kon_trolli trükkimise ajal õigekirja"
 
 #: mail/mail-config.glade.h:55
 msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgstr "Kontrolli sissetulevate kirjade seest rämpsu"
 
 #: mail/mail-config.glade.h:56
 #, fuzzy
@@ -15059,7 +15370,7 @@ msgstr "_Turvalise ühenduse kasutamine (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
-msgstr ""
+msgstr "_Kasuta sama kirjatüüpi, mis teisedki rakendused"
 
 #: mail/mail-config.glade.h:180
 msgid "color"
@@ -15113,6 +15424,7 @@ msgid "Because \"{0}\"."
 msgstr "Kuna \"{0}\"."
 
 #: mail/mail-errors.xml.in.h:10
+#: widgets/misc/e-system-errors.xml.in.h:2
 msgid "Because \"{1}\"."
 msgstr "Kuna \"{1}\"."
 
@@ -15195,7 +15507,7 @@ 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 ""
+msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #: mail/mail-errors.xml.in.h:31
 msgid "Could not save signature file."
@@ -15403,124 +15715,124 @@ msgstr "Kontrollin %s"
 msgid "Working"
 msgstr "Töötamine"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Filtrite rakendamine väljuvatele sõnumitele ebaõnnestus: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Järjekorras olnud kirjade saatmine ebaõnnestus."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "--store [failinimi]"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1549
-#: mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1753
-#: mail/mail-ops.c:1839
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15529,7 +15841,7 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15538,11 +15850,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15551,17 +15863,17 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
@@ -15626,24 +15938,24 @@ msgstr "Uuendamine..."
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 
@@ -15659,113 +15971,113 @@ msgstr "Sisesta nimi sellele allkirja jaoks."
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:114
+#: mail/mail-tools.c:116
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:278
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:280
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-tools.c:319
+#: mail/mail-tools.c:321
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vKausta ülesseadmine: %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:206
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "vkaustade uri: %s uuendamine"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:921
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:960
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1044
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:916
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:917
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:918
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:919
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:920
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:924
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:925
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:929
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:930
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1249
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1256
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1265
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1277
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1285
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1287
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3114
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -15798,48 +16110,48 @@ msgstr "Vastuvõetud"
 msgid "Size"
 msgstr "Suurus"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Helista"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Vastukaja"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 #, fuzzy
 msgid "For Your Information"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:77
 #: ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 #, fuzzy
 msgid "No Response Necessary"
 msgstr "Käsule %s ei tulnud vastust."
 
-#: mail/message-tag-followup.c:69
+#: mail/message-tag-followup.c:80
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:70
+#: mail/message-tag-followup.c:81
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:283
+#: mail/message-tag-followup.c:294
 #: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
@@ -15883,19 +16195,6 @@ msgstr "_Telli"
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolutioni kest"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolutioni test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Testi vaate komponent"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15949,6 +16248,30 @@ msgstr "kirjad"
 msgid "Brought to you by"
 msgstr "Teieni tõid"
 
+#: shell/e-shell.c:536
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
+"The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"
+msgstr ""
+
+#: shell/e-shell.c:1081
+msgid "Invalid arguments"
+msgstr "Vigased argumendid"
+
+#: shell/e-shell.c:1083
+#, fuzzy
+msgid "Cannot register on OAF"
+msgstr "ioctl `%s' ei õnnestu"
+
+#: shell/e-shell.c:1085
+msgid "Configuration Database not found"
+msgstr "Ei leia häälestusandmebaasi"
+
+#: shell/e-shell.c:1087
+msgid "Generic error"
+msgstr "Üldine viga"
+
 #: shell/e-shell-folder-title-bar.c:592
 #: shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16126,6 +16449,18 @@ msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
+#: shell/e-shell-window.c:336
+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:343
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
+
+#: shell/e-shell-window.c:349
+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."
+
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
@@ -16161,42 +16496,6 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-window.c:336
-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:343
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
-
-#: shell/e-shell-window.c:349
-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."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Vigased argumendid"
-
-#: shell/e-shell.c:1083
-#, fuzzy
-msgid "Cannot register on OAF"
-msgstr "ioctl `%s' ei õnnestu"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Ei leia häälestusandmebaasi"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Üldine viga"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kontrollkast"
@@ -16258,6 +16557,52 @@ msgstr "Aktiivsed ühendused"
 msgid "Click OK to close these connections and go offline"
 msgstr "Ühenduste sulgemiseks ja offline reziimi siirdumiseks vajuta \"Olgu\""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "_Kalender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "K_ontaktid:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Ü_lesanded:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Kausta _tüüp:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Avab kausta uues aknas"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "_Konto:"
+
+#  TODO: can this be done in a loop?
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "_Kausta nimi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Kasutaja:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution'i häälestusassistent"
@@ -16297,6 +16642,19 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolutioni kest"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolutioni test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Testi vaate komponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -16681,11 +17039,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Sertifikaat on juba olemas."
-
 #: smime/lib/e-cert.c:234
 #: smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
@@ -16886,6 +17239,11 @@ msgstr "Teema unikaalne ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Sertifikaat on juba olemas."
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faili parool"
@@ -17005,7 +17363,8 @@ msgid "Select all contacts"
 msgstr "Vali kõik kontaktid"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Saada sõnum valitud kontaktidele."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17040,8 +17399,8 @@ msgstr "Kuva käesolev kontakt"
 #: ui/evolution-event-editor.xml.h:11
 #: ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107
 #: ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19
 #: ui/evolution.xml.h:25
@@ -17542,6 +17901,18 @@ msgstr "_Inverteeri valik"
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Sulgeb akna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "Sul_ge"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Saatja lisamine _aadressiraamatusse"
@@ -17961,18 +18332,6 @@ msgstr "T_ööriistad"
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Sulgeb akna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "Sul_ge"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -18598,6 +18957,36 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:76
+#: widgets/misc/e-error.c:77
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Error"
+msgstr "viga (mitteassotsiatiivne)\n"
+
+#: widgets/misc/e-error.c:78
+#: widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:117
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Hoiatus: partitsioon %s "
+
+#: widgets/misc/e-error.c:116
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Üldine teave"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Päri stringi:"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:430
+#, fuzzy, c-format
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laiendatud"
@@ -18712,6 +19101,40 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Otsing"
 
+#: widgets/misc/e-system-errors.xml.in.h:1
+#, fuzzy
+msgid "Because \"{1}\""
+msgstr "Kuna \"${1}\"."
+
+#: widgets/misc/e-system-errors.xml.in.h:3
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "faili `%s' ei saa avada"
+
+#: widgets/misc/e-system-errors.xml.in.h:4
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Faili pole võimalik salvestada\n"
+"\""
+
+#: widgets/misc/e-system-errors.xml.in.h:5
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"Fail %1 on juba olemas.\n"
+"Kas sa soovid seda üle kirjutada?"
+
+#: widgets/misc/e-system-errors.xml.in.h:6
+#, fuzzy
+msgid "File exists \"{0}\"."
+msgstr "%s: Fail on juba olemas"
+
+#: widgets/misc/e-system-errors.xml.in.h:8
+#, fuzzy
+msgid "_Overwrite"
+msgstr "_Kirjuta üle"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
author	Priit Laes <plaes@cvs.gnome.org>	2004-05-06 02:37:44 +0800
committer	Priit Laes <plaes@src.gnome.org>	2004-05-06 02:37:44 +0800
commit	60a9d81314d2d74f385ac2e3d6060bcb4df5af25 (patch)
tree	faed700e045e6ee3dea14be511e9f397b5ea8c31 /po/et.po
parent	12fb773502ff61c55d40f78a513f6e8bb9b30380 (diff)
download	gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.tar.gz gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.tar.zst gsoc2013-evolution-60a9d81314d2d74f385ac2e3d6060bcb4df5af25.zip