Translation updated by Ivar Smolin.

2006-01-09 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated by Ivar Smolin. svn path=/trunk/; revision=31102
author: Priit Laes <plaes@cvs.gnome.org> 2006-01-09 16:51:36 +0800
committer: Priit Laes <plaes@src.gnome.org> 2006-01-09 16:51:36 +0800
commit: 7305191377795dc544dc78ef3657065e9b384aa6 (patch)
tree: a409cde0fdecf38717d39c1c25361467510825e3 /po/et.po
parent: a120898a538ae2789e5a36b8414b15ec0c20a9db (diff)
download: gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.gz
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.bz2
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.lz
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.xz
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.zst
gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.zip
1 files changed, 2948 insertions, 2520 deletions
diff --git a/po/et.po b/po/et.po
index a560a6152d..7c3c4010c1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,11 +1,11 @@
 # Evolution'i eesti keele tõlge.
 # Estonian translation of Evolution.
 #
-# Copyright (C) 2001-2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
 # Ilmar Kerm <ikerm@hot.ee>, 2001
-# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005
+# Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005, 2006
 # Kaarel Jõgi <kaarel@gg.ee>, 2002
 # Priit Laes <amd@store20.com>, 2003-2005
 #
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 13:39+0100\n"
-"PO-Revision-Date: 2005-11-24 01:32+0200\n"
+"POT-Creation-Date: 2006-01-06 13:07+0100\n"
+"PO-Revision-Date: 2006-01-07 12:05+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -31,12 +31,12 @@ msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "Uus kontakt"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
@@ -48,7 +48,6 @@ msgstr[0] "käesolev aadressiraamatu kaust sisaldab %d kaardi"
 msgstr[1] "käesolev aadressiraamatu kaust sisaldab %d kaarti"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ava"
@@ -200,7 +199,7 @@ msgstr "%d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -363,45 +362,56 @@ msgid "Could not remove addressbook."
 msgstr "Aadressiraamatut pole võimalik eemaldada."
 
 #: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "Kustutame aadressiraamatu '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "Viga aadressiraamatu laadimisel."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Viga {0} salvestamisel {1} alla: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "Tõrge LDAP serverisse autentimisel."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
+#, fuzzy
+msgid "GroupWise Address book creation:"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server ei saatnud korrektset skeemiinfot."
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "Serveri versioon"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Mõningad võimalused võivad sinu käesoleva serveriga ebakorrektselt töötada"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:18
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -411,45 +421,45 @@ msgstr ""
 "funktsionaalsust. Samas võib see LDAP server olla halvasti seadistatud. Küsi "
 "oma süsteemihaldurilt, milliseid otsingubaase sa peaksid kasutama."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
 msgstr "See aadressisaamat eemaldatakse lõplikult."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "This addressbook could not be opened."
 msgstr "Seda aadressisaamatud pole võimalik avada."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "See aadressiraamatuserver ei oma ühtegi soovituslikku otsingubaasi."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This server does not support LDAPv3 schema information."
 msgstr "See server ei toeta LDAPv3 skeemiandmeid."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatut pole võimalik avada"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
 msgstr "Otsingut pole võimalik läbi viia."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "{0} pole võimalik salvestada."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -458,58 +468,57 @@ msgstr ""
 "pole seda võimalik kustutada. Kas sa soovid ümbertõstmise asemel salvestada "
 "koopiat?"
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:61
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Sa oled seda kontakti muutnud. Kas sa soovid neid muutuseid salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sinu {0} kontakte pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "_Discard"
 msgstr "_Unusta"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
@@ -531,8 +540,8 @@ msgstr "Seadista automaatlõpetamist siit"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1186
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:393
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -570,13 +579,13 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
+#: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
+#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
+#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
@@ -586,134 +595,134 @@ msgstr "Kohalikus arvutis"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
+#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Isiklik"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:525
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "Uue kontakti loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1149
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1204
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "_Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "Uue aadressiraamatu loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
+#: ../addressbook/gui/component/addressbook-component.c:386
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Tõrge aadressiraamatu kataloogide või seadistuste uuendamisel."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Baas"
 
-#: ../addressbook/gui/component/addressbook-config.c:511
+#: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tüüp:"
 
-#: ../addressbook/gui/component/addressbook-config.c:610
+#: ../addressbook/gui/component/addressbook-config.c:634
 msgid "Copy book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../addressbook/gui/component/addressbook-config.c:933
+#: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: ../addressbook/gui/component/addressbook-config.c:934
-#: ../mail/importers/pine-importer.c:393
+#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:938
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../addressbook/gui/component/addressbook-config.c:940
+#: ../addressbook/gui/component/addressbook-config.c:990
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:943
+#: ../addressbook/gui/component/addressbook-config.c:993
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
-#: ../addressbook/gui/component/addressbook-config.c:944
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Searching"
 msgstr "Otsing"
 
-#: ../addressbook/gui/component/addressbook-config.c:946
+#: ../addressbook/gui/component/addressbook-config.c:996
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:1147
+#: ../addressbook/gui/component/addressbook-config.c:1202
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:653
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:768
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -725,7 +734,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -735,7 +744,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1166
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -745,37 +754,37 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1176
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-view.c:769
 msgid "_New Address Book"
 msgstr "_Uus aadressiraamat"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/component/addressbook-view.c:770
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-table.c:1196
+#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: ../addressbook/gui/component/addressbook-view.c:766
+#: ../addressbook/gui/component/addressbook-view.c:772
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:443
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:1197
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
@@ -891,7 +900,7 @@ msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
 msgid "Always"
 msgstr "Alati"
 
@@ -926,7 +935,7 @@ msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -1056,7 +1065,7 @@ msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:303
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
@@ -1085,6 +1094,7 @@ msgid "_Name:"
 msgstr "_Nimi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -1094,6 +1104,7 @@ msgstr "_Otsingu ulatus"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -1110,10 +1121,14 @@ msgid "cards"
 msgstr "kaardid"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1987
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1125,7 +1140,6 @@ msgstr "minutit"
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
@@ -1180,23 +1194,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:526
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2379
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1209,7 +1223,7 @@ msgid "Image"
 msgstr "Pilt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
@@ -1222,7 +1236,7 @@ msgid "Ni_ckname:"
 msgstr "_Hüüdnimi:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1236,10 +1250,10 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
+#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Töö"
 
@@ -1261,12 +1275,12 @@ msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1661
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Kategooriad"
 
@@ -1354,17 +1368,17 @@ msgstr "_Kus:"
 msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
 #: ../addressbook/gui/widgets/eab-contact-display.c:367
 #: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Aadress"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1372,1088 +1386,1088 @@ msgstr "Aadress"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
 msgstr "Redigeeritav"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "Ühendriigid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "Albaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "Alžeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani territoorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "Kaimani saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "Tšaad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "Tšiili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "Hiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "Jõulusaar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared (Keelingi saared)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, Demokraatlik vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "Küpros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "Tšehhi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "Taani"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "Dominikaani vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "Eesti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "Fääri saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "Fidži"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "Soome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "Prantsuse Polüneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "Prantsuse Lõunaalad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "Gröönimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "Heardi ja McDonaldi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "Vatikan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "Hong-Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "Ungari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "Iraan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "Iraak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr "Mani saar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "Keenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea Demokraatlik Rahvavabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "Korea Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "Kõrgõzstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "Läti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "Liibüa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "Moldova Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaanid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "Norra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "Omaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "Peruu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "Poola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "Réunioni departemang"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "São Tomé ja Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "Serbia ja Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "Seišellid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "Lõuna-Aafrika Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Lõuna Georgia ja Lõuna Sandwichi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre ja Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Teravmäed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "Süüria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "Tansaania, Ühendatud Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "Tai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "Türgi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "Türkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "Turksi ja Caicose saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "Araabia Ühendemiraadid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "Ühendkuningriik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "Ühendriikide hajasaared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "Neitsisaared, Briti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "Neitsisaared, U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:936
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr "Yahoo Kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Teenus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:461
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Home"
 msgstr "Kodu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Other"
 msgstr "Muu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "Vajalikud väljad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "Muudetud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2374
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2687
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2688
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2967
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2461,7 +2475,7 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
@@ -2628,7 +2642,7 @@ msgid "Add an email to the List"
 msgstr "Lisa sõnum loendisse"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
@@ -2660,24 +2674,24 @@ msgstr "_Vali"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Raamat"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Liikmed"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Kontaktiloendi liikmed"
 
@@ -2719,8 +2733,8 @@ msgstr ""
 "juba olemas. Kas sa soovid seda siiski lisada?"
 
 #. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
+#: ../widgets/misc/e-filter-bar.c:162
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
@@ -2737,7 +2751,7 @@ msgstr[1] "%d kontakti"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2761,143 +2775,143 @@ msgstr "Mudel"
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Name begins with"
 msgstr "Nimi algab"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Email begins with"
 msgstr "E-post algab"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:174
+#: ../addressbook/gui/widgets/e-addressbook-view.c:179
 msgid "Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 msgid "Source"
 msgstr "Allikas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:245
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:479
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tüüp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
+#: ../addressbook/gui/widgets/e-addressbook-view.c:550
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2018
+#: ../addressbook/gui/widgets/e-addressbook-view.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/dialogs/comp-editor.c:1054
-#: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "A_va"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_New Contact..."
 msgstr "_Uus kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "New Contact _List..."
 msgstr "Uus kontaktide _loend..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Salvesta VKaardina"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "_Forward Contact"
 msgstr "_Edasta kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "_Forward Contacts"
 msgstr "_Edasta kontaktid"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #, fuzzy
 msgid "Send _Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #, fuzzy
 msgid "Send _Message to List"
 msgstr "Saada sõnum postiloendisse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #, fuzzy
 msgid "Send _Message to Contacts"
 msgstr "Saada kontaktidele sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "_Print"
 msgstr "_Prindi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 #, fuzzy
 msgid "Cop_y to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 #, fuzzy
 msgid "Mo_ve to Address Book..."
 msgstr "Tõsta aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 #: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:431
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3049
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:103
+#: ../calendar/gui/dialogs/comp-editor.c:433
+#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:105
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 #, fuzzy
 msgid "P_aste"
 msgstr "Aseta"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1767
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
 msgid "Print cards"
 msgstr "Trüki kaardid"
 
@@ -3038,7 +3052,7 @@ msgstr "Raadio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:490
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3304,10 +3318,10 @@ 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:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -3373,7 +3387,7 @@ msgstr ""
 "Aadressiraamatut pole võimalik avada.  Palun kontrolli, kas rada %s on "
 "olemas ja kas sul on sellele vajalikud pääsuõigused."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3381,7 +3395,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus. Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav LDAP server ei ole kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3391,7 +3405,7 @@ msgstr ""
 "soovid kasutada Evolutioni koos LDAP'i toega, pead paigaldama omale vastava "
 "Evolutioni paki."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../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."
@@ -3399,7 +3413,7 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Põhjuseks võib olla see, et sisestasid "
 "vigase URI või kasutatav server ei ole kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:146
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3407,7 +3421,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 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"
@@ -3415,45 +3429,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "Error adding list"
 msgstr "Viga loendi lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:694
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying list"
 msgstr "Viga loendi muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:649
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:291
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3468,7 +3482,7 @@ msgstr[1] ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:320
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3477,65 +3491,65 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:369
+#: ../addressbook/gui/widgets/eab-gui-util.c:372
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakti"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:595
 msgid "list"
 msgstr "nimekiri"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Move contact to"
 msgstr "Kontakti ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:757
 msgid "Copy contact to"
 msgstr "Kontakti kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:760
 msgid "Move contacts to"
 msgstr "Kontaktide ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:762
 msgid "Copy contacts to"
 msgstr "Kontaktide kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
+#: ../addressbook/gui/widgets/eab-gui-util.c:765
 msgid "Select target addressbook."
 msgstr "Vali sihtaadressiraamat."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:988
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:991
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1031
-#: ../addressbook/gui/widgets/eab-gui-util.c:1049
+#: ../addressbook/gui/widgets/eab-gui-util.c:1032
+#: ../addressbook/gui/widgets/eab-gui-util.c:1050
 #, fuzzy
 msgid "Contact information"
 msgstr "Päevaraamatu teave"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
 #, fuzzy, c-format
 msgid "Contact information for %s"
 msgstr "Päevaraamatu teave"
@@ -3603,26 +3617,26 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:582
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Importimine ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:761
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:749
+#: ../addressbook/importers/evolution-ldif-importer.c:762
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:554
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:555
 msgid "Evolution VCard Importer"
 msgstr "Evolutioni VKaardi importija"
 
@@ -3631,12 +3645,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "Print envelope"
 msgstr "Trüki ümbrik"
 
-#: ../addressbook/printing/e-contact-print.c:1026
+#: ../addressbook/printing/e-contact-print.c:1033
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: ../addressbook/printing/e-contact-print.c:1117
-#: ../addressbook/printing/e-contact-print.c:1145
+#: ../addressbook/printing/e-contact-print.c:1124
+#: ../addressbook/printing/e-contact-print.c:1152
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
@@ -3739,7 +3753,7 @@ msgid "Options"
 msgstr "Valikud"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "Suund"
 
@@ -3789,7 +3803,7 @@ msgstr "Varjutamine"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -3841,17 +3855,17 @@ msgstr "Kontakti printimistest"
 msgid "This should test the contact print code"
 msgstr "See peaks testima kontaktiprintimise koodi"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Faili pole võimalik avada"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "Aadressiraamatute loendit pole võimalik hankida"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "tõrge raamatu avamisel"
 
@@ -3922,30 +3936,24 @@ msgid "No filename provided."
 msgstr "Failinime ei esitatud."
 
 #: ../calendar/calendar.error.xml.h:1
+#, fuzzy
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
+"Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
+"sõnumi sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
+#, fuzzy
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
+"Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
+"sõnumi sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3953,14 +3961,14 @@ msgstr ""
 "Kõik nende päevikukirjete kohta käivad andmed kustutatakse ja neid pole "
 "võimalik enam taastada."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Kõik selle päeviku kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3968,20 +3976,20 @@ msgstr ""
 "Kõik nende sündmuste kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Kõik nende ülesannete kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Kõik selle sündmuse kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3989,104 +3997,104 @@ msgstr ""
 "Kõik selle päevikukirje kohta käivad andmed kustutatakse ja neid pole "
 "võimalik enam taastada."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Kõik selle koosoleku kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Kõik selle ülesande kohta käivad andmed kustutatakse ja neid pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Kas sa tõesti soovid kustutada ülesannet '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada sündmust nimega '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada päevikukirjet '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Kas sa tõesti soovid kustutada neid {0} sündmusi?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Kas sa tõesti soovid kustutada neid {0} päevikukirjeid?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Kas sa tõesti soovid kustutada neid {0} ülesandeid?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Kas sa tõesti soovid kustutada seda päevikukirjet?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Oled sa kindel, et soovid seda sündmust ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
 msgid "Delete calendar '{0}'?"
-msgstr "Kustutada kalender '{0}'?"
+msgstr "Kas kustutada kalender '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete memo list '{0}'?"
-msgstr "Kas kustutata ülesandeloend '{0}'?"
+msgstr "Kas kustutata märkmeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete task list '{0}'?"
 msgstr "Kas kustutata ülesandeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+#: ../calendar/calendar.error.xml.h:26
+#, fuzzy
+msgid "Do not Send"
 msgstr "Ära saada"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:27
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid sündmust kustutada?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid ülesannet salvestada?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:29
 msgid "Editor could not be loaded."
 msgstr "Redaktorit pole võimalik laadida."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:30
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil oma osalemisest teada anda (RSVP)."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4094,53 +4102,55 @@ msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil ülesandele nõusolekut anda."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
 msgid "Error loading calendar"
 msgstr "Viga kalendri laadimisel"
 
-#: ../calendar/calendar.error.xml.h:35
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading memo list"
-msgstr "Viga ülesandeloendi laadimisel"
+msgstr "Viga märkmeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:35
+#, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the journal has been deleted."
 msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle "
 "päeviku kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:36
+#, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is cancelled."
 msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
 "katkestamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:37
+#, fuzzy
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the task has been deleted."
 msgstr ""
 "Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Saada"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:39
 msgid "Send Notice"
 msgstr "Teavita"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4148,7 +4158,7 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende kalendreid "
 "ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4156,6 +4166,24 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende ülesannete "
 "nimekirja ajakohasena hoida"
 
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+msgid "Some features may not work properly with your current server."
+msgstr ""
+"Mõningad võimalused võivad sinu käesoleva serveriga ebakorrektselt töötada"
+
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutioni kalender lõpetas ootamatult."
@@ -4165,8 +4193,8 @@ msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutioni ülesanded lõpetasid ootamatult."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "Kalender pole märgitud autonoomses režiimis kasutamiseks"
+msgid "The calendar is not marked for offline usage."
+msgstr "Kalender pole märgitud autonoomses režiimis kasutamiseks."
 
 #: ../calendar/calendar.error.xml.h:48
 #, fuzzy
@@ -4174,17 +4202,16 @@ msgid "The memo list is not marked for offline usage"
 msgstr "Ülesandeloend pole märgitud autonoomses režiimis kasutamiseks"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "The task list is not marked for offline usage"
-msgstr "Ülesandeloend pole märgitud autonoomses režiimis kasutamiseks"
+msgid "The task list is not marked for offline usage."
+msgstr "Ülesandeloend pole märgitud autonoomses režiimis kasutamiseks."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
 #: ../calendar/calendar.error.xml.h:51
-#, fuzzy
 msgid "This memo list will be removed permanently."
-msgstr "See ülesandeloend eemaldatakse jäädavalt."
+msgstr "See märkmeloend eemaldatakse jäädavalt."
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
@@ -4223,6 +4250,13 @@ msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 msgid "Would you like to send updated task information to participants?"
 msgstr "Kas soovid saata osalejatele värskemaid andmeid ülesande kohta?"
 
+#: ../calendar/calendar.error.xml.h:61
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
 #: ../calendar/calendar.error.xml.h:62
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved them."
@@ -4248,7 +4282,7 @@ msgid "_Discard Changes"
 msgstr "_Loobu muudatustest"
 
 #: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_Salvesta"
 
@@ -4257,7 +4291,7 @@ msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
 #: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_Saada"
 
@@ -4270,21 +4304,21 @@ msgstr "{0}."
 msgid "Enter password"
 msgstr "Sisesta parool"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1377
-#: ../calendar/conduits/calendar/calendar-conduit.c:1378
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
-#: ../calendar/conduits/todo/todo-conduit.c:988
-#: ../calendar/conduits/todo/todo-conduit.c:989
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1486
-#: ../calendar/conduits/calendar/calendar-conduit.c:1489
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki ei suudetud lugeda"
 
@@ -4300,17 +4334,17 @@ msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 msgid "Could not write pilot's Memo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1071
-#: ../calendar/conduits/todo/todo-conduit.c:1074
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1110
-#: ../calendar/conduits/todo/todo-conduit.c:1113
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 #, fuzzy
 msgid "Could not write pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
@@ -4321,7 +4355,7 @@ msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "Kalendrid"
 
@@ -4350,9 +4384,8 @@ msgid "Evolution's Calendar component"
 msgstr "Evolutioni kalendrikomponent"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
 msgid "Evolution's Memos component"
-msgstr "Evolutioni testkomponent"
+msgstr "Evolutioni märkmetekomponent"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
@@ -4364,18 +4397,17 @@ msgid "Memo_s"
 msgstr "Liikmed"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1091 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
-#, fuzzy
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
+#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
 msgid "Memos"
-msgstr "Liikmed"
+msgstr "Märkmed"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
+#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4395,21 +4427,37 @@ msgstr "_Ülesanded"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#, fuzzy
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "tundi"
+msgstr[1] "tundi"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Algusaeg"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:349
-#, c-format
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
+#, fuzzy, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
-"%s until %s"
+"%s %s"
 msgstr ""
 "<big><b>%s</b></big>\n"
 "%s kuni %s"
@@ -4421,8 +4469,10 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1117
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "Location:"
 msgstr "Asukoht:"
 
@@ -4431,17 +4481,18 @@ msgid "Snooze _time:"
 msgstr "_Edasilükkamise aeg:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "_Redigeeri"
 
@@ -4449,62 +4500,64 @@ msgstr "_Redigeeri"
 msgid "_Snooze"
 msgstr "_Lükka edasi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
-msgid "Dismiss"
-msgstr "Katkesta"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
+msgid "<b>Calendars</b>"
+msgstr "<b>Kalendrid</b>"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:971
-msgid "Dismiss All"
-msgstr "Tühista kõik"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
+msgid "_Configure Alarms"
+msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1053
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:45
+msgid "_Quit"
+msgstr "_Välju"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1062
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1064
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
 msgid "No location information available."
 msgstr "Asukoha kohta puuduvad andmed."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarm: %s\n"
-"%s\n"
-"Algus: %s\n"
-"Lõpp: %s"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
+#, fuzzy, c-format
+msgid "You have %d alarms"
+msgstr "On alarmidega."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1215
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"See meeldetuletus on konfigureeritud saatma e-posti,\n"
-"aga Evolution ei toeta kalendripõhiste meeldetuletuste\n"
+"See meeldetuletus on seadistatud saatma e-posti, aga\n"
+"Evolution ei toeta kalendripõhiste meeldetuletuste\n"
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1221
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4520,15 +4573,15 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1235
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:147
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Bonobot pole võimalik lähtestada"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:158
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarmteavituse teenuse factory't pole võimalik luua"
 
@@ -4536,6 +4589,62 @@ msgstr "Alarmteavituse teenuse factory't pole võimalik luua"
 msgid "invalid time"
 msgstr "vigane aeg"
 
+#. Can't be zero
+#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d sekundit)"
+
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#, fuzzy, c-format
+msgid "(%d %s %d %s)"
+msgstr "%a, %d. %b %Y"
+
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/dialogs/recurrence-page.c:991 ../calendar/gui/misc.c:111
+msgid "second"
+msgstr "teine"
+
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
+#, fuzzy, c-format
+msgid "(%d %s)"
+msgstr "%d. %B"
+
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#, c-format
+msgid " %u second"
+msgstr "%u sekund"
+
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#, c-format
+msgid " %u seconds"
+msgstr "%u sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#, c-format
+msgid " %u minute"
+msgstr "%u minut"
+
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#, c-format
+msgid " %u minutes"
+msgstr "%u minutit"
+
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#, c-format
+msgid "%u hour"
+msgstr "%u tund"
+
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#, c-format
+msgid "%u hours"
+msgstr "%u tundi"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Alarmprogrammid"
@@ -4590,11 +4699,13 @@ msgid "Default reminder value"
 msgstr "Meeldetuletaja vaikimisi väärtus"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+#, fuzzy
+msgid "Free/busy server URLs"
 msgstr "Vaba/hõivatud serveri URL-id"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
+#, fuzzy
+msgid "Free/busy template URL"
 msgstr "Vaba/hõivatud malli URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
@@ -4630,7 +4741,8 @@ msgid "Last alarm time"
 msgstr "Viimase alarmi aeg"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
+#, fuzzy
+msgid "List of server URLs for free/busy publishing."
 msgstr "Serveri url-ide loend vaba/hõivatud andmete avaldamiseks."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
@@ -4662,7 +4774,8 @@ msgid "Month view vertical pane position"
 msgstr "Kuuvaate püstpaani asukoht"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+#, fuzzy
+msgid "Number of units for determining a default reminder."
 msgstr "Vaikimisi meeldetuletaja ühikute arv."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
@@ -4762,17 +4875,17 @@ msgstr "Tänase tähtajaga ülesannete värvus"
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, no-c-format
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
@@ -4903,11 +5016,11 @@ msgstr "Tund, millal tööpäev algab"
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
@@ -4924,8 +5037,8 @@ msgid "Unmatched"
 msgstr "Puudub"
 
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Trüki"
@@ -4933,16 +5046,17 @@ msgstr "Trüki"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2116
+#: ../calendar/gui/gnome-cal.c:2117
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:374
 #: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4951,11 +5065,11 @@ msgstr ""
 "See tegevus eemaldab lõplikult kõik sündmused, mis on vanemad kui valitud "
 "päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "Puhasta sündmustest, mis on vanemad kui"
 
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -4969,13 +5083,13 @@ msgstr "päeva"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
+#: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:216
 msgid "On The Web"
 msgstr "Veebis"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
@@ -4989,69 +5103,69 @@ msgstr "Ilm"
 msgid "_New Calendar"
 msgstr "_Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:839
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1138
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1151
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/dialogs/event-page.c:870
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
@@ -5083,7 +5197,7 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -5180,14 +5294,6 @@ msgstr "korda, vahemikuga"
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "tundi"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "minut(it)"
@@ -5196,7 +5302,7 @@ msgstr "minut(it)"
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -5210,70 +5316,6 @@ msgstr "L_isa"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2575
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "manus"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/dialogs/event-page.c:1733
-#: ../calendar/gui/dialogs/meeting-page.c:908
-#: ../calendar/gui/dialogs/task-page.c:1182
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3545
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Eemalda"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1056
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3546 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_Omadused"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1058
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3548
-msgid "_Add attachment..."
-msgstr "_Lisa manus..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
-msgid "Attachment Bar"
-msgstr "Manuseriba"
-
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5285,33 +5327,9 @@ msgid "Suggest automatic display of attachment"
 msgstr "Manuse automaatkuvamise soovitamine"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Faili pole võimalik manusesse lisada: %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
-
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
@@ -5319,8 +5337,8 @@ msgid "Attachment Properties"
 msgstr "Manuse omadused"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1165
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5339,299 +5357,249 @@ msgstr "Faili nimi:"
 msgid "MIME type:"
 msgstr "MIME tüüp:"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Lubatud"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Are you sure you want to remove this URL?"
-msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:736
-msgid "Remove"
-msgstr "Eemalda"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:741
-msgid "Don't Remove"
-msgstr "Ära eemalda"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:856
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Keela"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:858
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Luba"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minutit"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minutit"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minutit"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minutit"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minutit"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Alarmid</b>"
+msgid "<b>Publishing</b>"
+msgstr "<b>Avalikustamine</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
+"aadressist.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>Üldine</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alarmid</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>Avalikustamine</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>Ülesandeloend</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Üldine</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Aeg</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Olek</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Töönädal</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
-"aadressist.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Kalendri ja ülesannete sätted"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Tähtaja ületanud ülesannete värvus"
+#, fuzzy
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Olek</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Tänase tähtajaga ülesannete värvus"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Päev(a)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "Kuva"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/event-editor.c:549
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:555
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "Reede"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Tund(i)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minut(it)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Publishing Table"
 msgstr "Avalikustamise tabel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "_P"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletuse näitamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "_N"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "Mall:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "Ajavorming:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "W_eek starts:"
 msgstr "Nä_dala algus:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Add URL"
 msgstr "_URL'i lisamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "Päev _algab:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Fri"
 msgstr "_R"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Hide completed tasks after"
 msgstr "_Peida lõpetatud ülesanded pärast"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Mon"
 msgstr "_E"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Overdue tasks:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Sat"
 msgstr "_L"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#, fuzzy
+msgid "_Show appointment end times in week and month view"
 msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Time divisions:"
 msgstr "_Aja jaotised:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Tue"
 msgstr "_T"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Wed"
 msgstr "_K"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr ""
-
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr ""
@@ -5658,9 +5626,8 @@ msgid "Tasks List"
 msgstr "Ülesannete loend"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#, fuzzy
 msgid "Memos List"
-msgstr "Sõnumiloend"
+msgstr "Märkmeloend"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Calendar Properties"
@@ -5675,10 +5642,9 @@ msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
-#, fuzzy
+#: ../calendar/gui/memos-component.c:449
 msgid "New Memo List"
-msgstr "Uus kontaktide nimekiri"
+msgstr "Uus märkmeloend"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
@@ -5790,105 +5756,137 @@ msgstr " (Tähtaeg "
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
+#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:198
-#: ../calendar/gui/dialogs/comp-editor.c:368 ../composer/e-msg-composer.c:2805
-#: ../composer/e-msg-composer.c:2984
+#: ../calendar/gui/dialogs/comp-editor.c:200
+#: ../calendar/gui/dialogs/comp-editor.c:370 ../composer/e-msg-composer.c:2830
+#: ../composer/e-msg-composer.c:3009
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
 msgid "_Move"
 msgstr "_Tõsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:782
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
+#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943
+#: ../calendar/gui/dialogs/comp-editor.c:958
 #, fuzzy
 msgid "Hide Attachment _Bar"
 msgstr "Manuseriba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:961
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 #, fuzzy
 msgid "Show Attachment _Bar"
 msgstr "Manuseriba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/event-page.c:1861
+#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3573
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Eemalda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "_Properties"
+msgstr "_Omadused"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3576
+msgid "_Add attachment..."
+msgstr "_Lisa manus..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1984
-#: ../calendar/gui/dialogs/comp-editor.c:2027
+#: ../calendar/gui/dialogs/comp-editor.c:2028
+#: ../calendar/gui/dialogs/comp-editor.c:2071
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1990
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2077
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1992
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2079
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1996
-#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1998
-#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2085
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2001
-#: ../calendar/gui/dialogs/comp-editor.c:2044
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:2088
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2012
-#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:2098
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
+#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
+#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
+#: ../widgets/misc/e-attachment-bar.c:341
+msgid "attachment"
+msgstr "manus"
+
 #: ../calendar/gui/dialogs/comp-editor.c:2701
-#: ../calendar/gui/dialogs/comp-editor.c:2725
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../calendar/gui/dialogs/comp-editor.c:2758
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2782
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -5965,97 +5963,97 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:525
+#: ../calendar/gui/dialogs/event-editor.c:531
 msgid "Appoint_ment"
 msgstr "Sünd_mus"
 
-#: ../calendar/gui/dialogs/event-editor.c:529
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../calendar/gui/dialogs/event-editor.c:535
+#: ../ui/evolution-event-editor.xml.h:13
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: ../calendar/gui/dialogs/event-page.c:834
-#: ../calendar/gui/dialogs/task-page.c:443
+#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/task-page.c:444
 msgid "Or_ganizer"
 msgstr "Ko_rraldaja"
 
-#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:914
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
+#: ../calendar/gui/dialogs/event-page.c:1073
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1036
+#: ../calendar/gui/dialogs/event-page.c:1076
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1201
-#: ../calendar/gui/dialogs/task-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:1242
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1211
+#: ../calendar/gui/dialogs/event-page.c:1252
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1234
+#: ../calendar/gui/dialogs/event-page.c:1275
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1241
+#: ../calendar/gui/dialogs/event-page.c:1282
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1396
-#: ../calendar/gui/dialogs/meeting-page.c:463
-#: ../calendar/gui/dialogs/task-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:1437
+#: ../calendar/gui/dialogs/meeting-page.c:464
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1402
-#: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1443
+#: ../calendar/gui/dialogs/meeting-page.c:470
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/dialogs/event-page.c:1417
-#: ../calendar/gui/dialogs/meeting-page.c:484
-#: ../calendar/gui/dialogs/task-page.c:925
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:485
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: ../calendar/gui/dialogs/event-page.c:1734
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../calendar/gui/dialogs/event-page.c:1862
+#: ../calendar/gui/dialogs/meeting-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1184
 msgid "_Add "
 msgstr "_Lisa "
 
-#: ../calendar/gui/dialogs/event-page.c:2421
+#: ../calendar/gui/dialogs/event-page.c:2567
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2661
+#: ../calendar/gui/dialogs/event-page.c:2823
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2669
+#: ../calendar/gui/dialogs/event-page.c:2831
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2677
+#: ../calendar/gui/dialogs/event-page.c:2839
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6127,16 +6125,16 @@ msgstr "_Aeg:"
 msgid "for"
 msgstr "kuni"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "kuupäevani"
 
-#: ../calendar/gui/dialogs/meeting-page.c:305
+#: ../calendar/gui/dialogs/meeting-page.c:306
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Dele_gaadid</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.c:309
+#: ../calendar/gui/dialogs/meeting-page.c:310
 msgid "<b>From:</b>"
 msgstr "<b>Saatja:</b>"
 
@@ -6145,20 +6143,20 @@ msgstr "<b>Saatja:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:315
+#: ../calendar/gui/dialogs/meeting-page.c:316
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2246
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:467
-#: ../widgets/misc/e-dateedit.c:1506 ../widgets/misc/e-dateedit.c:1675
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
+#: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
 msgid "None"
 msgstr "Puudub"
 
@@ -6197,15 +6195,16 @@ msgstr "Keel"
 msgid "Member"
 msgstr "Liige"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:502
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -6233,14 +6232,13 @@ msgid "Organizer:"
 msgstr "Korraldaja:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
-#, fuzzy
 msgid "Memo"
-msgstr "E"
+msgstr "Märge"
 
-#: ../calendar/gui/dialogs/memo-page.c:489
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/memo-page.c:490
+#, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "Ülesandeid pole võimalik '%s'-s avada."
+msgstr "Märkmeid pole võimalik '%s'-s avada."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #, fuzzy
@@ -6252,20 +6250,20 @@ msgid "Classi_fication:"
 msgstr "_Liigitamine"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "Salajane"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "Isiklik"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "Avalik"
 
@@ -6316,20 +6314,20 @@ msgid "Task List Name"
 msgstr "Ülesandeloendi nimi"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+"You are modifying a recurring journal entry. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6348,55 +6346,51 @@ msgstr "See ja tulevad juhtumid"
 msgid "All Instances"
 msgstr "Kõik juhtumid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:497
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:818
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "first"
 msgstr "esimene"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
-msgid "second"
-msgstr "teine"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "third"
 msgstr "kolmas"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "fourth"
 msgstr "neljas"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "last"
 msgstr "viimane"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1016
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "day"
 msgstr "päev"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1182
 msgid "on the"
 msgstr "iga"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1370
+#: ../calendar/gui/dialogs/recurrence-page.c:1371
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2326
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -6437,12 +6431,12 @@ msgstr "nädal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:523
 msgid "Web Page"
 msgstr "Veebileht"
 
@@ -6457,48 +6451,48 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1018
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "High"
 msgstr "Kõrge"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "Töös"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
 msgid "Low"
 msgstr "Madal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:385
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1015
 msgid "Normal"
 msgstr "Keskmine"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -6511,7 +6505,7 @@ msgid "Stat_us:"
 msgstr "_Olek:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "Määramata"
 
@@ -6529,7 +6523,7 @@ msgid "_Web Page:"
 msgstr "_Koduleht:"
 
 #: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
 msgid "_Task"
 msgstr "_Ülesanne"
 
@@ -6538,16 +6532,16 @@ msgstr "_Ülesanne"
 msgid "Task Details"
 msgstr "Üksikasjad"
 
-#: ../calendar/gui/dialogs/task-page.c:436
+#: ../calendar/gui/dialogs/task-page.c:437
 #, fuzzy
 msgid "_Group"
 msgstr "_Grupp:"
 
-#: ../calendar/gui/dialogs/task-page.c:820
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1613
+#: ../calendar/gui/dialogs/task-page.c:1614
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
@@ -6603,14 +6597,17 @@ msgid "_Manual"
 msgstr "_Käsitsi"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_Password:"
 msgstr "_Parool:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "Parooli _meeldejätmine"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
@@ -6704,17 +6701,17 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2829
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliki, et avada aadressi %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-memo-preview.c:201
 msgid "Memo:"
-msgstr ""
+msgstr "Märge:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Veebileht:"
 
@@ -6722,31 +6719,31 @@ msgstr "Veebileht:"
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1109
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Alguskuupäev:"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1133
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "Tähtsus:"
 
@@ -6765,18 +6762,18 @@ msgstr "Alguskuupäev"
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:436
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "Vaba"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:437
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:441
 #: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:608
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6786,17 +6783,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:809
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
@@ -6804,12 +6801,12 @@ msgstr "Ei"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
 #: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-itip-control.c:1291
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -6830,7 +6827,7 @@ msgstr "Määratud"
 msgid "Save As..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
@@ -6839,9 +6836,9 @@ msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
@@ -6860,123 +6857,123 @@ msgstr "Valitu salvestamine"
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:518
+#: ../calendar/gui/e-calendar-table.c:527
 msgid "Task Table"
 msgstr "Ülesannete tabel"
 
-#: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
+#: ../calendar/gui/e-calendar-table.c:884
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
-#: ../composer/e-msg-composer.c:1341
+#: ../calendar/gui/e-calendar-table.c:1034
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
+#: ../composer/e-msg-composer.c:1339
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
-#: ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1185
+#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1180 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-table.c:1191
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-table.c:1192
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-calendar-table.c:1197
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1421
+#: ../calendar/gui/e-calendar-table.c:1430
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -7011,98 +7008,101 @@ msgstr "Alguskuupäev"
 msgid "Task sort"
 msgstr "Ülesannete sortimine"
 
-#: ../calendar/gui/e-calendar-view.c:1252
+#: ../calendar/gui/e-calendar-view.c:1267
 msgid "Moving items"
 msgstr "Kirjete tõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1254
+#: ../calendar/gui/e-calendar-view.c:1269
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1524
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1525
+#: ../calendar/gui/e-calendar-view.c:1534
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1526
+#: ../calendar/gui/e-calendar-view.c:1535
 msgid "New _Meeting"
 msgstr "Uus _koosolek"
 
-#: ../calendar/gui/e-calendar-view.c:1527
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "New _Task"
 msgstr "Uus ü_lesanne"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1537
+#: ../calendar/gui/e-calendar-view.c:1546
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1548
 msgid "Select T_oday"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1545 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Avalikusta vaba/hõivatud teave"
-
-#: ../calendar/gui/e-calendar-view.c:1561
+#: ../calendar/gui/e-calendar-view.c:1565
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1562
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1563
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1564
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1565
+#: ../calendar/gui/e-calendar-view.c:1569
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1570
+#: ../calendar/gui/e-calendar-view.c:1574
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1571
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1572
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1959
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Korraldaja:"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/print.c:2339
+#, c-format
+msgid "Location: %s"
+msgstr "Asukoht: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2004
+#, fuzzy, c-format
+msgid "Time: %s %s"
+msgstr "Päeva vaade: %s. %s"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -7145,103 +7145,103 @@ msgstr "el"
 msgid "pm"
 msgstr "pl"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:773
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Iga päev"
 msgstr[1] "Iga %d päeva järel"
 
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Iga nädal"
 msgstr[1] "Iga %d nädala järel"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:780
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:788
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:808
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "iga kuu"
 msgstr[1] "iga %d kuu"
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:819
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Iga aasta"
 msgstr[1] "Iga %d aasta"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:830
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "kokku %d kord"
 msgstr[1] "kokku %d korda"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:839
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:863
 msgid "Starts"
 msgstr "Algab"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:876
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:910
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
 msgid "iCalendar Information"
 msgstr "iKalendri teave"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:967
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
+#: ../plugins/itip-formatter/itip-view.c:337
 #: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:405
 #: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1090
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7249,292 +7249,292 @@ msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
 "tegevus."
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:546
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1232
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1311
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1332
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas koosoleku soovile."
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1349
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1360
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1404
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele."
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1409
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1417
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1425
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1426
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1437
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud andmed."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud teave"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud andmeid."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1552
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1644
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1676
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendrikirjeid"
 
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1910
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1938
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1948
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1960
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1977
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek värskendatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1980
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2010
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
 msgid "The item could not be sent!\n"
 msgstr "Seda kirjet pole võimalik saata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2165
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Nõustun"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud teabe saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Värskenda vastaja olekut"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Saadab värskeima teabe"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7595,74 +7595,74 @@ msgid "Resources"
 msgstr "Ressursid"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:803
 msgid "Individual"
 msgstr "Isik"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Ressurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Ruum"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Juht"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:806
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:816
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
 msgstr "Katseline"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:555
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegeeritud"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
+#: ../calendar/gui/e-meeting-list-view.c:463
 msgid "Attendee                          "
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "Töös"
 
@@ -7677,22 +7677,17 @@ msgstr "%A, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2138
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1684
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
+#: ../widgets/misc/e-dateedit.c:1736
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -7760,17 +7755,17 @@ msgstr "_Algus:"
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: ../calendar/gui/e-memo-table.c:267
+#: ../calendar/gui/e-memo-table.c:276
 #, fuzzy
 msgid "Memo Table"
 msgstr "Tabel"
 
-#: ../calendar/gui/e-memo-table.c:863
+#: ../calendar/gui/e-memo-table.c:872
 #, fuzzy
 msgid "_Delete Selected Memos"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
 #, fuzzy
 msgid "Click to add a memo"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -7780,8 +7775,8 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "Memo sort"
 msgstr "Sortimata"
 
-#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
-#: ../calendar/gui/gnome-cal.c:2556
+#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
+#: ../calendar/gui/gnome-cal.c:2565
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7790,17 +7785,17 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:775
+#: ../calendar/gui/e-memos.c:776
 #, fuzzy
 msgid "Loading memos"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-memos.c:860
+#: ../calendar/gui/e-memos.c:861
 #, fuzzy, c-format
 msgid "Opening memos at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
+#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
@@ -7809,20 +7804,20 @@ msgstr "Valitud objektide kustutamine..."
 msgid "Enter the password for %s"
 msgstr "Sisesta parool %s jaoks"
 
-#: ../calendar/gui/e-tasks.c:870
+#: ../calendar/gui/e-tasks.c:871
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:957
+#: ../calendar/gui/e-tasks.c:958
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1202
+#: ../calendar/gui/e-tasks.c:1203
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1252
+#: ../calendar/gui/e-tasks.c:1253
 msgid "Expunging"
 msgstr "Puhastamine"
 
@@ -7837,38 +7832,38 @@ msgstr "Ajavööndi nupp"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:791
+#: ../calendar/gui/gnome-cal.c:792
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
-#: ../calendar/gui/gnome-cal.c:2231
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Custom View"
 msgstr "_Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2232
+#: ../calendar/gui/gnome-cal.c:2241
 msgid "_Save Custom View"
 msgstr "_Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2237
+#: ../calendar/gui/gnome-cal.c:2246
 msgid "_Define Views..."
 msgstr "_Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2399
+#: ../calendar/gui/gnome-cal.c:2408
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2418
+#: ../calendar/gui/gnome-cal.c:2427
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2522
+#: ../calendar/gui/gnome-cal.c:2531
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3440
+#: ../calendar/gui/gnome-cal.c:3449
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -7982,96 +7977,89 @@ msgstr "iKalendri info"
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:452
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: ../calendar/gui/memos-component.c:524
+#: ../calendar/gui/memos-component.c:525
 #, fuzzy, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d minuti"
 msgstr[1] "%d minutit"
 
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
+#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
+#: ../mail/mail-component.c:559
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valitud"
 msgstr[1] ", %d valitud"
 
-#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/memos-component.c:574
 #, fuzzy
 msgid "Failed upgrading memos."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: ../calendar/gui/memos-component.c:869
+#: ../calendar/gui/memos-component.c:870
 #, fuzzy, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Ülesannete loendit '%s' pole võimalik sündmuste ja koosolekute loomiseks "
 "avada"
 
-#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-component.c:883
 #, fuzzy
 msgid "There is no calendar available for creating memos"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/memos-component.c:973
-#, fuzzy
+#: ../calendar/gui/memos-component.c:974
 msgid "Memo Source Selector"
-msgstr "Ülesannete allika valija"
+msgstr "Märkmete allika valija"
 
-#: ../calendar/gui/memos-component.c:1156
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1157
 msgid "New memo"
-msgstr "Uus koosolek"
+msgstr "Uus märge"
 
-#: ../calendar/gui/memos-component.c:1157
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1158
 msgid "_Memo"
-msgstr "_E"
+msgstr "_Märge"
 
-#: ../calendar/gui/memos-component.c:1158
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1159
 msgid "Create a new memo"
-msgstr "Uue testikirje loomine"
+msgstr "Uue märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1164
-#, fuzzy
+#: ../calendar/gui/memos-component.c:1165
 msgid "New memo list"
-msgstr "Uus ülesandeloend"
+msgstr "Uus märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
 #, fuzzy
 msgid "Memo l_ist"
 msgstr "Ü_lesannete nimekiri"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
 #, fuzzy
 msgid "Create a new memo list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/memos-control.c:334
-#, fuzzy
+#: ../calendar/gui/memos-control.c:340
 msgid "Print Memos"
-msgstr "Trüki kirje"
+msgstr "Trüki märkmed"
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:156
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8083,7 +8071,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:160
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8096,18 +8084,18 @@ msgstr ""
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:782
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit `%s' pole võimalik siirdada"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:948
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' pole võimalik siirdada"
@@ -8310,11 +8298,6 @@ msgstr "Ülesanne"
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2339
-#, c-format
-msgid "Location: %s"
-msgstr "Asukoht: %s"
-
 #: ../calendar/gui/print.c:2382
 #, c-format
 msgid "Status: %s"
@@ -8353,69 +8336,69 @@ msgstr "Väljatrüki eelvaade"
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:440
 msgid "_New Task List"
 msgstr "Uus ü_lesandeloend"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:516
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ülesanne"
 msgstr[1] "%d ülesannet"
 
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:565
 msgid "Failed upgrading tasks."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:876
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Ülesannete loendit '%s' pole võimalik sündmuste ja koosolekute loomiseks "
 "avada"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:889
 msgid "There is no calendar available for creating tasks"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:989
 msgid "Task Source Selector"
 msgstr "Ülesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Task l_ist"
 msgstr "Ü_lesannete nimekiri"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:429
+#: ../calendar/gui/tasks-control.c:435
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8426,11 +8409,11 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
-#: ../calendar/gui/tasks-control.c:432
+#: ../calendar/gui/tasks-control.c:438
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-control.c:472
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
@@ -8439,40 +8422,41 @@ msgstr "Trüki ülesanded"
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Sündmused ja koosolekud"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 msgid "Opening calendar"
 msgstr "Kalendri avamine"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "iKalendri failid (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Evolutioni iKalendri imoportija"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
+#: ../calendar/importers/icalendar-importer.c:521
+#, fuzzy
+msgid "Reminder!"
 msgstr "Meeldetuletus!!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "vKalendri failid (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Evolutioni vKalendri importija"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "Kalendrisündmused"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutioni intelligentne kalendriimportija"
 
@@ -10006,6 +9990,46 @@ msgstr "Vaikne_ookean/Wallis"
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:994
+msgid "Attachment Bar"
+msgstr "Manuseriba"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Faili pole võimalik manusesse lisada: %s: %s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
+
 #: ../composer/e-msg-composer-hdrs.c:558
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
@@ -10088,14 +10112,19 @@ msgstr "Postita kellele:"
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer-select-file.c:239
+#, fuzzy
+msgid "Insert Attachment"
+msgstr "Manus"
+
+#: ../composer/e-msg-composer.c:830
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
 "signeerimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:839
+#: ../composer/e-msg-composer.c:837
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10103,47 +10132,47 @@ msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
+#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../composer/e-msg-composer.c:1394
+#: ../composer/e-msg-composer.c:1392
 msgid "Could not open file"
 msgstr "Tõrge faili avamisel"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1400
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-msg-composer.c:1677
+#: ../composer/e-msg-composer.c:1678
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1712
+#: ../composer/e-msg-composer.c:1713
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: ../composer/e-msg-composer.c:2229
+#: ../composer/e-msg-composer.c:2243
 msgid "Si_gnature:"
 msgstr "_Signatuur:"
 
-#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
-#: ../composer/e-msg-composer.c:3676
+#: ../composer/e-msg-composer.c:2497 ../composer/e-msg-composer.c:3701
+#: ../composer/e-msg-composer.c:3704
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:3791
+#: ../composer/e-msg-composer.c:3819
 msgid "_Attachment Bar"
 msgstr "_Manuseriba"
 
-#: ../composer/e-msg-composer.c:4881
+#: ../composer/e-msg-composer.c:4911
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10173,7 +10202,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Sa pead sõnumile valima teised sätted, põhjus: &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuna &quot;{1}&quot;."
 
@@ -10211,12 +10240,13 @@ msgid "Directories can not be attached to Messages."
 msgstr "Katalooge pole võimalik sõnumitele manustada."
 
 #: ../composer/mail-composer.error.xml.h:13
-msgid "Do you want to recover unfinished messages?"
-msgstr "Kas sa soovid lõpetamata sõnumid taastada?"
+#, fuzzy
+msgid "Do not Recover"
+msgstr "Ära taasta"
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "Ära taasta"
+msgid "Do you want to recover unfinished messages?"
+msgstr "Kas sa soovid lõpetamata sõnumid taastada?"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
@@ -10280,7 +10310,7 @@ msgstr "_Salvesta sõnum"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:514
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10329,7 +10359,8 @@ msgid "I am currently out of the office"
 msgstr "Olen praegu puhkusel"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+#, fuzzy
+msgid "No, Do not Change Status"
 msgstr "Ei, ära muuda olekut"
 
 #: ../designs/OOA/ooa.glade.h:12
@@ -10390,7 +10421,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:270
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10398,7 +10429,7 @@ msgstr ""
 "Selle nimega fail on juba olemas.\n"
 "Kirjutada üle?"
 
-#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -10419,7 +10450,7 @@ msgid "Evolution Query"
 msgstr "Evolutioni küsimus"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:442
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -10442,109 +10473,11 @@ msgstr "Kas sa soovid seda üle kirjutada?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fail &quot;{0}&quot; on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a, %d.%m.%Y"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%d.%m.%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1440 ../widgets/misc/e-dateedit.c:1722
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1437 ../widgets/misc/e-dateedit.c:1719
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "Sahtli suund."
 
@@ -10614,25 +10547,25 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Võrdlusaja valimine"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Vali faili"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Hiljem"
 
@@ -10641,24 +10574,28 @@ msgid "Test"
 msgstr "Test"
 
 #: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "_Reegli nimi:"
+#, fuzzy
+msgid "_Search name:"
+msgstr "_Otsingubaas:"
 
 #: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "Kui"
+msgid "Find items that meet the following criteria"
+msgstr ""
 
 #: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+#, fuzzy
+msgid "If all criteria are met"
 msgstr "kõik tingimused on täidetud"
 
 #: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+#, fuzzy
+msgid "If any criteria are met"
 msgstr "üks tingimustest on täidetud"
 
 #: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Tegevused täidetakse juhul, kui"
+#, fuzzy
+msgid "Find items:"
+msgstr "Kirjete tõstmine"
 
 #: ../filter/filter-rule.c:881
 msgid "All related"
@@ -10677,11 +10614,11 @@ msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:348
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10705,7 +10642,7 @@ msgstr "Puuduv kuupäev."
 msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -10777,10 +10714,6 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "sekundit"
-
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "praegune aeg"
@@ -10793,15 +10726,15 @@ msgstr "sinu poolt määratud aeg"
 msgid "years"
 msgstr "aastat"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
 msgid "Edit Rule"
 msgstr "Muuda reeglit"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
 msgid "Rule name"
 msgstr "Reegli nimi"
 
@@ -10846,11 +10779,11 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
+#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -10868,12 +10801,12 @@ msgstr "E-posti eelistused"
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:395
 #, c-format
 msgid "%s License Agreement"
 msgstr "Litsents %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:402
 #, c-format
 msgid ""
 "\n"
@@ -10882,104 +10815,121 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:768
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:1979
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:407
+msgid "Disable"
+msgstr "Keela"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "Luba"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:456
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:457
+msgid "Enabled"
+msgstr "Lubatud"
+
+#: ../mail/em-account-prefs.c:511
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:513
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-account-prefs.c:517
+#: ../mail/em-account-prefs.c:518
 msgid "Mail Accounts Table"
 msgstr "Postikontode tabel"
 
-#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:966
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: ../mail/em-composer-prefs.c:925
+#: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: ../mail/em-composer-prefs.c:968
+#: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: ../mail/em-composer-prefs.c:988
+#: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:862 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1650
+#: ../mail/em-composer-utils.c:1657
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1704
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10987,7 +10937,7 @@ msgstr ""
 "Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell "
 "${24Hour}:${Minute}, kirjutas ${Sender}:"
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "_Filtreerimisreeglid"
 
@@ -11004,7 +10954,7 @@ msgstr "Omista värvus"
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Manused"
 
@@ -11125,7 +11075,7 @@ msgstr "Rämpspost"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -11166,7 +11116,7 @@ msgstr "Suuna programmi"
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Loetud"
 
@@ -11234,10 +11184,10 @@ msgstr "algab stringiga"
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -11252,24 +11202,28 @@ msgstr "Määramata olek"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:143
 msgid "C_reate Search Folder From Search..."
 msgstr "Loo otsingu baasil _Otsikaust..."
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:145
+#, fuzzy
+msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:158
+#, fuzzy
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
 msgstr[1] "Lugemata sõnumeid:"
 
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:289
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kausta omadused"
@@ -11286,34 +11240,34 @@ msgstr "Loo"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "Otsikaustad"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
 msgid "Drafts"
 msgstr "Mustandid"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
 msgid "Outbox"
 msgstr "Väljundkast"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
 msgid "Sent"
 msgstr "Saadetud"
 
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
 msgid "Loading..."
 msgstr "Laadimine..."
 
@@ -11331,12 +11285,12 @@ msgstr "Kausta %s tõstmine"
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite tõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
@@ -11345,15 +11299,15 @@ msgstr "Sõnumite kopeerimine %s kausta"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
@@ -11361,7 +11315,7 @@ msgstr "\"%s\" kaustade läbivaatamine"
 #: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vaade"
@@ -11387,7 +11341,7 @@ msgstr "_Uus kataloog..."
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
@@ -11396,13 +11350,13 @@ msgstr "_Tühjenda prügikast"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opeeri"
 
@@ -11437,154 +11391,155 @@ msgstr "Kausta loomine"
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
-msgid "Reply to _All"
-msgstr "Vasta _kõigile"
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _All"
+msgstr "Vasta _kõigile"
+
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:108
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Otsikaust _teema järgi"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Otsikaust _saatja järgi"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Otsikaust _adressaatide järgi"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Otsikaust _postiloendi järgi"
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2117
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: ../mail/em-folder-view.c:2221
+#: ../mail/em-folder-view.c:2273
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2414
+#: ../mail/em-folder-view.c:2466
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2468
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsikaust"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2469
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2470
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:2699
+#: ../mail/em-folder-view.c:2824
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliki, et saata sõnumit aadressile %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:729
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11592,11 +11547,11 @@ msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:730
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11604,11 +11559,11 @@ 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:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:731 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:731
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11616,127 +11571,135 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 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:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:738 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:738
+#, fuzzy
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 "See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt "
 "ja see võis näha olla ka kolmandale osapoolele."
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:739
+#, fuzzy
 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 "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 "See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks "
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi "
 "krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:740
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:741 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:741
+#, fuzzy
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga.  Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:857
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1145
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1153
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1156
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1216
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1217
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1218
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1219
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1596
 msgid "Attachment Button"
 msgstr "Manuse nupp"
 
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1803
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1850
 msgid "Save Selected..."
 msgstr "Valitu salvestamine..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1917
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d manus"
 msgstr[1] "%d manust"
 
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1980
+#, fuzzy
+msgid "Toggle Attachment Bar"
+msgstr "Manuseriba"
+
+#: ../mail/em-format-html-display.c:1982
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1985
 msgid "Save All"
 msgstr "Salvesta kõik"
 
@@ -11745,99 +11708,99 @@ msgstr "Salvesta kõik"
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Signatuur kehtib kuid saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Viide kaugandmetele (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1616
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
@@ -11870,23 +11833,23 @@ msgstr "Viga allkirja tõestamisel"
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "Iga kord"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1208
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11898,47 +11861,47 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1647
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ei suuda luua uut kataloogi `%s': %s"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1673
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1858
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2062
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2076
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2105
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2711
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2730
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11965,58 +11928,59 @@ msgstr "_Saada uus sõnum aadressil..."
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: ../mail/em-utils.c:106
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:123
+#, fuzzy
+msgid "Do not show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:356
 msgid "Filters"
 msgstr "Filtrid"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:671
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:720
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1204
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "_Otsikaustad"
 
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "Otsikausta allikas"
 
@@ -12236,7 +12200,8 @@ msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+#, fuzzy
+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:51
@@ -12477,70 +12442,70 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "Elm'i andmete importimine"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Evolutioni Elm'i importija"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
 msgstr "Postkasti importimine programmist Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley postkast (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postkasti vormingus kaustade importija"
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Importimine..."
 
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Palun oota"
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:377
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12555,7 +12520,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12563,7 +12528,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12572,23 +12537,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
 msgstr "Netscape'i andmete importimine"
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr "Sätted"
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr "Kirjade filtrid"
 
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12596,116 +12561,116 @@ msgstr ""
 "Evolution leidis Netscape mail'i faile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "Pine'i andmete importimine"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Evolutioni Pine'i importija"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
 msgstr "Postkasti importimine programmist Pine."
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "Sõnumi saaja: %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postiloend"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:520
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d kustutatut"
 msgstr[1] "%d kustutatut"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:522
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d rämpssõnum"
 msgstr[1] "%d rämpssõnumit"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d mustand"
 msgstr[1] "%d mustandit"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d saadetud"
 msgstr[1] "%d saadetud"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d saatmata"
 msgstr[1] "%d saatmata"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kokku"
 msgstr[1] "%d kokku"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:555
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d lugemata"
 msgstr[1] ", %d lugemata"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:778
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:779
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:780
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:786
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:787
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:788
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:932
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
@@ -12724,7 +12689,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
+#, fuzzy
+msgid "<b>Sig_natures</b>"
 msgstr "<b>_Allkirjad</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -12739,10 +12705,6 @@ msgstr "<small>See teeb filtris usaldusväärsemaks aga ka aeglasemaks</small>"
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Konto andmed</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alarmid</span>"
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentimise tüüp</span>"
@@ -12775,11 +12737,6 @@ msgstr "<span weight=\"bold\">Kuvatavad _kirjapäised</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri valikud</span>"
 
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Üldine</span>"
-
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Sildid ja värvid</span>"
@@ -12805,6 +12762,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uutest sõnumitest teatamine</span>"
 
 #: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslikud andmed</span>"
 
@@ -12885,7 +12843,8 @@ msgid "Attachment"
 msgstr "Manus"
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
+#, fuzzy
+msgid "Automatically insert _smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
 #: ../mail/mail-config.glade.h:47
@@ -12909,7 +12868,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
 #: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
+#, fuzzy
+msgid "Check in_coming mail for junk"
 msgstr "Sissetuleva posti _rämpsukontroll"
 
 #: ../mail/mail-config.glade.h:53
@@ -13001,21 +12961,22 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Käsu käivitamine..."
-
-#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML'is"
 
+#: ../mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Full Nam_e:"
+msgstr "Täis_nimi:"
+
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML post"
@@ -13158,64 +13119,69 @@ msgid "Select HTML variable width font for printing"
 msgstr "Vali trükkimise jaoks HTML muutuva laiusega kirjatüüp"
 
 #: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "Select sound file"
+msgstr "Faili valimine"
+
+#: ../mail/mail-config.glade.h:128
 msgid "Send message receipts:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "_Serveri tüüp:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "Allkirjatabel"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "T_erminal Font:"
 msgstr "T_erminali kirjatüüp"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Tüüp:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13224,7 +13190,7 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13232,15 +13198,15 @@ msgstr ""
 "Sisesta nimi, millega sa soovid seda kontot kutsuda.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13250,30 +13216,27 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "_Internetis olevad pildid laaditakse alati"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Uutest sõnumitest ei teavitata"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "Täis_nimi:"
-
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "Pildid _laaditakse kontaktide poolt saadetud sõnumites"
@@ -13295,7 +13258,8 @@ msgid "_Path:"
 msgstr "_Rada:"
 
 #: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "Täpsustus, kui _püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
 #: ../mail/mail-config.glade.h:168
@@ -13343,7 +13307,8 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Krüptimine</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+#, fuzzy
+msgid "Case _sensitive"
 msgstr "_Tõstutundlik"
 
 #: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
@@ -13358,7 +13323,7 @@ msgstr "_Otsing:"
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Märgi jälgimiseks"
@@ -13430,26 +13395,26 @@ msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
 msgid "with all local folders"
 msgstr "koos kõigi kohalike kalatoogidega"
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:860
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:103
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:564
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13458,114 +13423,114 @@ msgstr ""
 "Tõrge lisamisel kasuta %s: %s\n"
 "Selle asemel lisan kausta `Saadetud'."
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:622
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:759
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Loobutud."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:763
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:860
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite tõstmine kausta %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "Avan hoidlat %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1854
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d sõnumi vastuvõtmine"
 msgstr[1] "%d sõnumi vastuvõtmine"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1940
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1990
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13574,7 +13539,7 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2018
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13583,11 +13548,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2089
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2101
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13596,22 +13561,22 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2111
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2377
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
@@ -13654,53 +13619,54 @@ msgstr "Ootamine..."
 msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:604
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:244
-msgid "User canceled operation."
+#: ../mail/mail-session.c:241
+#, fuzzy
+msgid "User cancelled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:119
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:149
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:297
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
@@ -13720,11 +13686,11 @@ msgstr "'%s:%s' otsikaustade uuendamine"
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' otsikaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "Otsikausta redigeerimine"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "Uus otsikaust"
 
@@ -13744,8 +13710,8 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
@@ -13773,10 +13739,16 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
 #: ../mail/mail.error.xml.h:11
+#, fuzzy
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot ja kõiki selle proksisid?"
+
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Oled sa kindel, et soovid korraga avada {0} sõnumit?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13784,7 +13756,7 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13792,178 +13764,186 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuna &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Blank Signature"
 msgstr "Allkirjad"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kopeerida &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Salvestuskataloogi pole võimalik luua, sest &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Otsikausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik tõsta &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Allikat &quot;{1}&quot; pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Allikat &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Sihtkohta &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; pole võimalik &quot;{1}&quot;-ks ümber nimetada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik ümber nimetada ega tõsta."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kataloogi &quot;{0}&quot; alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signatuuriskripti &quot;{0}&quot; pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
+#, fuzzy
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 "Kontrolli, kas parool on õigesti sisestatud.  Kuna paroolid on üldiselt "
 "tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse "
 "lülitatud."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Kustuta &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Kustuta konto?"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Discard changed?"
+#: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Discard changes?"
 msgstr "Loobuda muudatustest?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Do not delete"
+msgstr "Ära kustuta"
+
+#: ../mail/mail.error.xml.h:47
+#, fuzzy
+msgid "Do not disable"
+msgstr "Keela"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Kas sa soovid seda operatsiooni teostada ka alamkaustades?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:47
-msgid "Don't delete"
-msgstr "Ära kustuta"
-
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui sa jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13971,7 +13951,12 @@ msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
+#, fuzzy
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13979,11 +13964,11 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13991,19 +13976,19 @@ msgstr ""
 "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
 "Evolutioni uuesti käivitad."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14011,31 +13996,36 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Kõigi valitud kataloogis olevate sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ühekorraga paljude sõnumite avamisele võib kuluda kaua aega."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
+#, fuzzy
+msgid "Please enable the account or send using another account."
+msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
+
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14043,7 +14033,7 @@ msgstr ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
 "nupule \"Kellele:\"."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14051,49 +14041,49 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:79
 #, fuzzy
 msgid "Please provide an unique name to identify this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Otsikaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Signature Already Exists"
 msgstr "Sertifikaat on juba olemas."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14101,7 +14091,7 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14111,7 +14101,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14120,7 +14110,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14129,31 +14119,39 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:103
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
+"The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:105
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:108
+#, fuzzy
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi sõnumi saajat"
+
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi sõnumi saajat"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14161,152 +14159,152 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:111
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua kahte sama nimega kontot."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:125
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1004
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1005
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1006
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1007
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1008
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1012
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1013
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1017
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1018
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2055
 msgid "Message List"
 msgstr "Sõnumiloend"
 
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3400
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -14335,42 +14333,43 @@ msgid "Received"
 msgstr "Vastuvõetud"
 
 #: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Suurus"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "Helista"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "Jälgimine"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "Teadmiseks"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "Vastus pole tarvilik"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Vasta"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "Ülevaade"
 
@@ -14398,6 +14397,14 @@ msgstr "Teema sisaldab"
 msgid "Subject or Sender contains"
 msgstr "Teema või saatja sisaldab"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Kohalikud aadressiraamatud"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "Kohalike aadressiraamatute põhitalitluse tagamine."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14463,6 +14470,7 @@ msgid "Restore Settings..."
 msgstr "Taastamise sätted..."
 
 #: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
@@ -14492,10 +14500,6 @@ msgstr "Kontaktandmete _perioodiline sünkroniseerimine välksõnumivahendiga"
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "Automaatsed kontaktid"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
@@ -14572,7 +14576,7 @@ msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr "Tagab ilmakalendrite põhitalitluse."
+msgstr "Ilmakalendrite põhitalitluse tagamine."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
@@ -14607,11 +14611,11 @@ msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
+msgstr "Käivitumisel kontrollimiseks, kas Evolution on vaikimisi e-postiklient."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "Vaikimisi postiklient "
+msgstr "Vaikimisi postiklient"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
@@ -14622,6 +14626,18 @@ msgstr "Kas sa soovid Evolutioni määrata e-posti vaikimisi kliendiks?"
 msgid "Mark as default folder"
 msgstr "Märgitud vaikimisi kaustaks"
 
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
+msgid "Default Sources"
+msgstr "Vaikimisi"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr "Tagab ilmakalendrite põhitalitluse."
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Teiste kasutajate kaustade avamine"
@@ -14662,11 +14678,11 @@ msgstr ""
 "See valik loob ühenduse Exchange serveriga kasutades avatekstilise parooliga "
 "autentimist."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Kontorist väljas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14674,66 +14690,68 @@ msgstr ""
 "Allpool näidatav sõnum saadetakse automaatselt igale isikule,\n"
 "kes saadab sulle sinu puhkusel olemise ajal sõnumi."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Olen praegu tööl"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Exchange konto parooli muutmine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Parooli muutmine"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assitant"
 msgstr "Delegeerimisabiline"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Muu"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Kõikide Exchange kaustade suuruse vaatamine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange sätted"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
-msgid "_OWA Url:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:619
+#, fuzzy
+msgid "_OWA URL:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:645
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:824
+#: ../plugins/exchange-operations/exchange-account-setup.c:833
 msgid "Authentication Type"
 msgstr "Autentimise tüüp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:847
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
@@ -14779,6 +14797,11 @@ msgid "Custom"
 msgstr "Kohandatud"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Delegaadid õigused"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -14828,49 +14851,49 @@ msgstr "Viga delegaatide loendi lugemisel."
 msgid "Author (read, create)"
 msgstr "Autor (lugemine, loomine)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "K_alender:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "Ko_ntaktid:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "Delegaadid õigused"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "Delegaadid"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Toimetaja (lugemine, loomine, muutmine)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Ülevaataja (ainult lugemiseks)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "_Delegaadid võivad näha isiklikke kirjeid"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "_Sisendkast:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "_Ülesanded:"
 
@@ -14887,29 +14910,29 @@ msgstr "Kausta nimi"
 msgid "Folder Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-#, fuzzy
-msgid "Subscribe to Other User's"
-msgstr "Teiste kasutajate ülesannete tellimine"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Teise kasutaja kausta tellimine"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange kirjakaustade puu"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
 msgstr "Lõpeta kausta tellimus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:526
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Kas tõesti loobuda kausta \"%s\" tellimusest?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:538
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" tellimusest loobumine"
@@ -14998,6 +15021,17 @@ msgstr "Teiste kasutajate kontaktide tellimine"
 msgid "Subscribe to Other User's Calendar"
 msgstr "Teiste kasutajate kalendrite tellimine"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+#, fuzzy
+msgid "Exchange Operations"
+msgstr "Exchange sätted"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "Seadistusprobleemide tõttu pole võimalik parooli muuta."
@@ -15028,67 +15062,67 @@ msgid ""
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-msgid "Could not connect to server {0}."
+#, fuzzy
+msgid "Could not connect to Exchange server."
 msgstr "Serveriga {0} pole võimalik ühenduda."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to server {0}."
+msgstr "Serveriga {0} pole võimalik ühenduda."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kataloogi pääsuõiguseid delegaatidele pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "Exchange Web Storage System'i pole võimalik leida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "Serveri {0} asukohta pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "{0} pole võimalik delegaadiks määrata"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik uuendada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange konto on autonoomses režiimis."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Exchange Connector'ile ligipääsu viga."
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 
@@ -15109,7 +15143,7 @@ msgid "Folder offline"
 msgstr "Kataloog pole võgus"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1277
 msgid "Generic error"
 msgstr "Üldine viga"
 
@@ -15178,8 +15212,9 @@ msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#, fuzzy
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 "Serveris töötab Exchange 5.5. Exchange Connector, mis\n"
@@ -15239,24 +15274,27 @@ msgid "You may only configure a single Exchange account."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#, fuzzy
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"Your current usage is: {0}KB. Try to clear up some space by deleting some "
 "mails."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Proovi mõnede sõnumite kustutamise "
 "abil vaba ruumi juurde teha."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#, fuzzy
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0}KB. You will not be able to either send or recieve "
+"mails now."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Hetkel ei ole sul võimalik sõnumeid "
 "saata ega vastu võtta."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#, fuzzy
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
+"Your current usage is: {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
 msgstr ""
 "Sinu praegune kasutatav maht on {0}KB. Sul pole võimalik sõnumeid saata ega "
@@ -15287,10 +15325,6 @@ msgstr "Teiste kasutajate ülesannete tellimine"
 msgid "Check folder permissions"
 msgstr "Kausta pääsuõiguste kontrollimine"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Teise kasutaja kausta tellimine"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15325,7 +15359,8 @@ msgid "Junk Mail Settings..."
 msgstr "Rämpsposti sätted..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
+#, fuzzy
+msgid "<b>Junk List:</b>"
 msgstr "<b>Rämpsposti loend :</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15354,7 +15389,7 @@ msgid "Add Send Options to groupwise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Saatmise valikud"
@@ -15372,7 +15407,8 @@ msgid "Accept Tentatively"
 msgstr "Nõustu katseliselt"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
+#, fuzzy
+msgid "<b>Users:</b>"
 msgstr "<b>Kasutajad :</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
@@ -15393,7 +15429,8 @@ msgid "_Contacts..."
 msgstr "_Kontaktid..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+#, fuzzy
+msgid "_Customize notification message"
 msgstr "_Kohanda teavitussõnumit"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
@@ -15445,7 +15482,7 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Loe"
 
@@ -15458,6 +15495,7 @@ msgid "Proxy"
 msgstr "Proksi"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 #: ../smime/gui/smime-ui.glade.h:49
 #: ../widgets/table/e-table-config-no-group.glade.h:20
 #: ../widgets/table/e-table-config.glade.h:21
@@ -15472,23 +15510,23 @@ msgstr "<b>Konto nimi</b>"
 msgid "Proxy Login"
 msgstr "Proksi sisselogimine"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:502
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:690
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -15513,6 +15551,10 @@ msgid "Track Message Status..."
 msgstr "Jälgi sõnumi olekut..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 #, fuzzy
 msgid "Hula Account Setup"
 msgstr "Groupwise konto sätted"
@@ -15576,6 +15618,42 @@ msgstr "Sihtkoha avamine nurjus"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Tõrge kalendri '%s' laadimisel"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Sündmus leiti kalendrist '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:487
+msgid "Unable to find any calendars"
+msgstr "Ühtegi kalendrit pole võimalik leida"
+
+#: ../plugins/itip-formatter/itip-formatter.c:494
+msgid "Unable to find this meeting in any calendar"
+msgstr "Kalendrist pole võimalik ühtegi kohtumist leida"
+
+#: ../plugins/itip-formatter/itip-formatter.c:498
+msgid "Unable to find this task in any task list"
+msgstr "Ülesannete loendist pole võimalik ühtegi ülesannet leida"
+
+#: ../plugins/itip-formatter/itip-formatter.c:502
+msgid "Unable to find this journal entry in any journal"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:528
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
@@ -15636,10 +15714,13 @@ msgid "The calendar attached is not valid"
 msgstr "Manuses olev kalender on vigane"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
+#, fuzzy
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
+"Sõnum sisaldab kalendrit, kuid kalender ei sisalda sündmusi, ülesandeid ega "
+"vaba/hõivatud andmeid"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1183
 #: ../plugins/itip-formatter/itip-formatter.c:1198
@@ -15687,184 +15768,184 @@ msgid "Conflict Search Table"
 msgstr "Konfliktide otsimise tabel"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:459
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:32
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "Täna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:188
 msgid "Today %H:%M"
 msgstr "Täna %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:192
 msgid "Today %H:%M:%S"
 msgstr "Täna %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %l:%M:%S %p"
 msgstr "Täna %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:211
 msgid "Tomorrow"
 msgstr "Homme"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow %H:%M"
 msgstr "Homme kell %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow %H:%M:%S"
 msgstr "Homme kell %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %l:%M %p"
 msgstr "Homme kell %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Homme kell %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:248
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:257
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %l:%M %p"
 msgstr "%A, %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:285
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a, %e. %B %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:343
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas läbi %s teabe järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas teabe järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:350
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegeeris järgneva koosoleku sulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -15872,129 +15953,183 @@ msgstr ""
 "<b>%s</b> soovib saada värskeimat infot ülesande kohta järgneva koosoleku "
 "kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> tühistas järgneva koosoleku."
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> tühistas %s kaudu järgnevad koosolekumuutused:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> keeldus järgnevatest koosoleku muudatusest."
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> avalikustas %s kaudu järgneva ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> avalikustas järgmise ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> taotleb %s määramist järgneva ülesande täitjaks:"
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> määras %s kaudu sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> määras sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:429
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:431
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> saatis järgneva määratud ülesande vastuse tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:441
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:443
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> tühistas järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> esitas järgnevad muudatused määratud ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus järgnevast määratud ülesandest:"
 
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:704
+msgid "_Open Calendar"
+msgstr "_Ava kalender"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:709
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Accept"
+msgstr "_Nõustu"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "_Decline all"
+msgstr "_Lükka kõik tagasi"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:717
+#: ../plugins/itip-formatter/itip-view.c:733
+#: ../plugins/itip-formatter/itip-view.c:738
+msgid "_Decline"
+msgstr "_Lükka tagasi"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Tentative all"
+msgstr "_Määra kõik katseliseks"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Tentative"
+msgstr "_Määra katseliseks"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Accept all"
+msgstr "_Nõustu kõigiga"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:723
+msgid "_Send Information"
+msgstr "_Saada andmed"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:727
+msgid "_Update Attendee Status"
+msgstr "_Värskenda osaleja olekut"
+
+#: ../plugins/itip-formatter/itip-view.c:730
+msgid "_Update"
+msgstr "_Uuenda"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:891
 msgid "Start time:"
 msgstr "Algus:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:900
 msgid "End time:"
 msgstr "Lõpp:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:916
+#: ../plugins/itip-formatter/itip-view.c:966
 msgid "Comment:"
 msgstr "Kommentaar:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:980
 msgid "Send u_pdates to attendees"
 msgstr "Uuenduste saatmine osalejatele"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:989
 msgid "A_pply to all instances"
 msgstr ""
 
@@ -16227,6 +16362,19 @@ msgstr "Postiloendi, kust see sõnum pärit on, tellimine"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Postiloendi, kust see sõnum pärit on, tellimusest loobumine"
 
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Kõigi loetuksmärkimine"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#, fuzzy
+msgid "Mark me_ssages as read"
+msgstr "Kõigi sõnumite loetuksmärkimine"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr "Kasutatakse kõigi kaustas olevate sõnumite loetuks määramiseks"
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "Kalendri märkimine autonoomse režiimi jaoks"
@@ -16267,8 +16415,10 @@ msgstr "Uuest sõnumist teatamine"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Plugin määramaks millised pluginad on lubatud ja millised mitte."
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
 msgstr "Pluginahaldur"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -16297,11 +16447,6 @@ msgstr "Rada"
 msgid "Description"
 msgstr "Kirjeldus"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "Pluginahaldur"
-
 #: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Märkus: mõningad muudatused rakenduvad alles peale taaskäivitamist"
@@ -16349,8 +16494,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "Võimalus sõnumikoostajast sõnumi printimiseks"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -16359,17 +16504,110 @@ msgstr "Printimise eel_vaade"
 msgid "Prints the message"
 msgstr "Sõnumi printimine"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+#, fuzzy
+msgid "Evolution Profiler"
+msgstr "Evolutioni viga"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Calendar Publishing"
+msgstr "Kalendrid"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Locations"
+msgstr "Asukoht"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "iKalendri teave"
+
+#: ../plugins/publish-calendar/publish-calendar.c:372
+msgid "Are you sure you want to remove this URL?"
+msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Valikud</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+#, fuzzy
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Olek</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#, fuzzy
+msgid "Publishing Location"
+msgstr "<b>Avalikustamise _asukoht</b>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#, fuzzy
+msgid "Publishing _Frequency:"
+msgstr "<b>Avalikustamise sagedus</b>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#, fuzzy
+msgid "Service _type:"
+msgstr "_Serveri tüüp:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "_File:"
+msgstr "_Fail"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
+msgid "_Publish as:"
+msgstr "Avalikustamise tabel"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"Vaba/hõivatud"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Sa junk-plugin"
-msgstr ""
+msgstr "SA rämpspostiplugin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "learns junk messages using spamd."
-msgstr ""
+msgstr "spamd abil rämpsposti õppimine."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -16388,15 +16626,15 @@ msgstr "Salvesta manused..."
 msgid "Save all attachments"
 msgstr "Salvestab kõik manused"
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME tüüp"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:366
 #: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Salvesta"
@@ -16409,9 +16647,9 @@ msgstr "Salvesta"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:385 ../smime/lib/e-cert.c:678
+msgid "UID"
+msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
@@ -16446,8 +16684,9 @@ msgid "percent Done"
 msgstr "Täitmisprotsent"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+#, fuzzy
+msgid "URL"
+msgstr "_URL:"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -16528,6 +16767,10 @@ msgid "_Show only this Task List"
 msgstr "_Näita ainult seda ülesandeloendit"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr ""
 
@@ -16552,18 +16795,18 @@ msgstr ""
 "Jätkamiseks klõpsa palun \"Edasi\" nuppu. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige andmed, mida soovite importida:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Andmete importimine."
 
@@ -16641,7 +16884,7 @@ msgstr "Printeri sätted..."
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Alustamine autonoomses režiimis"
 
@@ -16723,11 +16966,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16736,11 +16979,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16748,27 +16991,27 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importimine"
 
@@ -16816,7 +17059,7 @@ msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001\n"
@@ -16824,7 +17067,7 @@ msgstr ""
 "Kaarel Jõgi <kaarel@gg.ee>, 2002\n"
 "Priit Laes <amd@store20.com>, 2003, 2004, 2005"
 
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "Grupitöövahend"
 
@@ -16840,49 +17083,51 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:370
+#, fuzzy
+msgid "Evolution is currently online.Click on this button to work offline."
 msgstr ""
 "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
 "vajuta seda nuppu."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:378
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub autonoomsesse olekusse."
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:385
+#, fuzzy
+msgid "Evolution is currently offline.Click on this button to work online."
 msgstr ""
 "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda "
 "nuppu."
 
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:775
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine %s peale"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "Olgu"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1271
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1273
 msgid "Cannot register on OAF"
 msgstr "OAF'i pole võimalik registreerida"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1275
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
@@ -16970,31 +17215,31 @@ msgstr ""
 msgid "Don't tell me again"
 msgstr "Ära küsi enam uuesti"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
 msgstr "Evolutioni käivitamine koos määratud komponendi aktiveerimisega"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:475
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:478
 msgid "Forcibly shut down all Evolution components"
 msgstr "Kõigi Evolutioni komponentide töö lõpetamisele sundimine"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:482
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:485
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:487
 msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
-#: ../shell/main.c:513
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17022,7 +17267,7 @@ msgstr "Evolution ei ole võimeline käivituma."
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
 "Meeldejäetud paroolide unustamine nullib ära kõik meeldejäetud paroolid. "
 "Paroolid küsitakse uuesti järgmisel korral, mil neid vaja läheb."
@@ -17037,7 +17282,7 @@ msgstr "Kas tõesti kustutada vanad andmed?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17049,12 +17294,13 @@ msgid ""
 msgstr ""
 
 #: ../shell/shell.error.xml.h:15
+#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 "Evolutioni eelmine versioon hoidis andmeid teises kohas.\n"
@@ -17121,7 +17367,7 @@ msgstr ""
 "Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele "
 "andmetele.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17132,54 +17378,54 @@ msgstr ""
 "\n"
 "Muuda usaldussätteid:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Sertifikaadi nimi"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Kasutusalad"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "Aegub"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:342
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
@@ -17199,7 +17445,7 @@ msgid "Enter new password"
 msgstr "Sisesta uus parool"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17208,7 +17454,7 @@ msgstr ""
 "Kellele väljastatud:\n"
 "              Teema: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17217,7 +17463,7 @@ msgstr ""
 "Väljastaja:\n"
 "     Teema: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "Sertifikaadi valimine"
 
@@ -17405,7 +17651,7 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:654
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
@@ -17498,10 +17744,6 @@ msgstr "Netscape'i sertifikaadi tüüp"
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
 #: ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ida"
@@ -17612,15 +17854,15 @@ msgstr "Teema unikaalne ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faili parool"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Sisesta PKCS12 faili jaoks parool:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Imporditud sertifikaat"
 
@@ -17707,7 +17949,7 @@ msgstr "Tõsta kausta..."
 msgid "Paste"
 msgstr "Aseta"
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "Lõikepuhvri asetamine"
 
@@ -17759,7 +18001,7 @@ msgstr "Peatab laadimise"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Tegevused"
@@ -17793,106 +18035,98 @@ msgid "Delete this Occurrence"
 msgstr "Seekordse sündmuse kustutamine"
 
 #: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this occurrence"
-msgstr "Kustuta seekordne sündmus"
-
-#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Liigu"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go back"
 msgstr "Tagasiliikumine"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go forward"
 msgstr "Edasiliikumine"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:12
 msgid "List"
 msgstr "Loend"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Kuu"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Järgmine"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:16
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Kalendri printimine"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhasta"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Purge old appointments and meetings"
 msgstr "Vanadest sündmustest ja koosolekutest puhastamine"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:23
 msgid "Select _Date"
 msgstr "Vali _kuupäev"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select a specific date"
 msgstr "Määratud kuupäeva valimine"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select today"
 msgstr "Tänase kuupäeva valimine"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr "Näitamine loendina"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Ühe päeva näitamine"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Ühe kuu näitamine"
 
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Ühe nädala näitamine"
 
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Ühe töönädala näitamine"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:33
 msgid "View the current appointment"
 msgstr "Käesoleva sündmuse kuvamine"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:34
 msgid "Week"
 msgstr "Nädal"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:35
 msgid "Work Week"
 msgstr "Töönädal"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:40
 msgid "_Open Appointment"
 msgstr "_Ava sündmus"
 
@@ -17917,6 +18151,10 @@ msgstr "Vali _kõik"
 msgid "Select all text"
 msgstr "Vali kogu tekst"
 
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Manusta"
+
 #: ../ui/evolution-editor.xml.h:2
 #, fuzzy
 msgid "Click here to attach a file"
@@ -17934,7 +18172,7 @@ msgstr "Sulge fail"
 
 #: ../ui/evolution-editor.xml.h:5
 #, fuzzy
-msgid "Click here to view help availabe"
+msgid "Click here to view help available"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
 #.
@@ -17943,33 +18181,32 @@ msgstr "<kuupäeva valimiseks kliki siia>"
 #. accel="*Ctrl*s"/>
 #.
 #: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:3
 #: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "Sulge"
 
-#: ../ui/evolution-editor.xml.h:14
-#, fuzzy
-msgid "_Attachments"
-msgstr "Manused"
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+msgid "_Attachment..."
+msgstr "_Manus..."
 
 #: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sul_ge"
 
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "_Fail"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:39
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:48
 #: ../ui/evolution-signature-editor.xml.h:25
 msgid "_Insert"
 msgstr "_Lisa"
@@ -17995,120 +18232,121 @@ msgstr "Isiklikuks liigitamine"
 msgid "Classify as public"
 msgstr "Avalikuks liigitamine"
 
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
+
+#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Insert advanced send options"
 msgstr "Kasutaja katkestas toimingu."
 
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "Make this a recurring event"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Avalik"
 
-#: ../ui/evolution-event-editor.xml.h:10
+#: ../ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Query free / busy information for the attendees"
 msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
 #, fuzzy
 msgid "R_ole Field"
 msgstr "_Vasta-kellele (To) väli"
 
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "Show Time _Zone"
 msgstr "Aja_vöönd:"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 #, fuzzy
 msgid "Show time as b_usy"
 msgstr "Näita aega kui _hõivatut"
 
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
 #, fuzzy
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
 #, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
 #, fuzzy
 msgid "Toggles whether the Role field is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
 #, fuzzy
 msgid "Toggles whether the Status field is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
 #, fuzzy
 msgid "Toggles whether the time zone is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
 #, fuzzy
 msgid "Toggles whether to display categories"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
 #, fuzzy
 msgid "Toggles whether to have All day Event"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 #, fuzzy
 msgid "Toggles whether to show time as busy"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "_Alarms"
 msgstr "_Alarmid"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "_All day Event"
 msgstr "Kestab kogu _päeva"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "_Liigitamine"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Salajane"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Isiklik"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
 #, fuzzy
 msgid "_Status Field"
 msgstr "_Olek"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
 #, fuzzy
 msgid "_Type Field"
 msgstr "_Vasta-kellele (To) väli"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Minu Evolutioni kohandamine"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Katkestab käimasoleva sõnumioperatsiooni"
@@ -18194,12 +18432,12 @@ msgstr "Kausta nime muutmine"
 msgid "Change the properties of this folder"
 msgstr "Kausta omaduste muutmine"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopeerib valitud sõnumi(d) lõikelauale"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Tõstab valitud sõnumi(d) lõikelauale"
 
@@ -18232,7 +18470,7 @@ msgstr ""
 msgid "Mar_k Messages as Read"
 msgstr "_Märgi sõnumid loetuks"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab sõnumid lõikepuhvrist"
 
@@ -18284,7 +18522,7 @@ msgstr "Viib valitud sõnumid ajutiselt peitu"
 msgid "Threaded Message list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:117
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Sõnum"
@@ -18330,80 +18568,85 @@ msgstr "Koostab vastuse valitud sõnumi postiloendisse"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Koostab vastuse valitud sõnumi koostajale"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Loo _reegel"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Otsikausta loomine nende adressaatide jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Otsikausta loomine selle postiloendi jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Otsikausta loomine selle saatja jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Otsikausta loomine selle teema jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Reegli loomine selle saatja poolt saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 "Reegli loomine nendele adressaatidele saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 "Reegli loomine sellese postiloendisse saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Reegli loomine selle teemaga sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Teksti suuruse vähendamine"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Järgmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Järgmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Järgmise lugemata sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Järgmise lugemata jutulõnga kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Eelmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Eelmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Eelmise lugemata sõnumi kuvamine"
 
+#: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "F_orward As..."
+msgstr "_Edasta kontakt..."
+
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
@@ -18493,78 +18736,74 @@ msgid "Message Source"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "Tõsta"
-
-#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "Tõstab valitud sõnumi(d) teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Jä_rgmine tähtis kiri"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "Järgmine _lõim"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Järgmine _lugemata sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ei ole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open a window for composing a mail message"
 msgstr "Avab sõnumi koostamiseks uue akna"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Avab valitud sõnumi sõnumiredaktoris"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "_Eelmine lugemata kiri"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Pos_t New Message to Folder"
 msgstr "Pos_tita uus sõnum kausta"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a Repl_y"
 msgstr "Postita _vastus"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a message to a Public folder"
 msgstr "Sõnumi postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Post a reply to a message in a Public folder"
 msgstr "Vastuse postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "_Eelmine tähtis sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Valitud sõnumi printimine"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "Ümber_suunamine"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Valitud sõnumite edastamine kellelegi"
 
@@ -18637,66 +18876,91 @@ msgid "Zoom _Out"
 msgstr "_Vähenda"
 
 #: ../ui/evolution-mail-message.xml.h:102
+#, fuzzy
+msgid "_Attached"
+msgstr "Manusta"
+
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Caret Mode"
 msgstr "_Kursorirežiim"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:104
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "_Eemalda silt"
+
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Delete Message"
 msgstr "_Kustuta sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Find in Message..."
 msgstr "_Otsi sõnumist..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:110
+#, fuzzy
+msgid "_Flag Completed"
+msgstr "Märgista kui _lõpetatud"
+
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Important"
 msgstr "_Tähtis"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:114
+#, fuzzy
+msgid "_Inline"
+msgstr "Samal joonel"
+
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Junk"
 msgstr "_Rämps"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Load Images"
 msgstr "_Laadi pildid"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "_Tavaline suurus"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "_Pole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "_Ava uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
+#, fuzzy
+msgid "_Quoted"
+msgstr "Tsitaadina"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Salvesta sõnum..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Tühista kustutus"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Lugemata"
 
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
@@ -18744,49 +19008,44 @@ msgid "View the selected memo"
 msgstr "Vaata valitud ülesannet"
 
 #: ../ui/evolution-memos.xml.h:18
-#, fuzzy
 msgid "_Open Memo"
-msgstr "_Ava sõnumid"
-
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Manusta"
+msgstr "_Ava märge"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
 #. accel="*Ctrl*s"/>
 #.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
 #: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Sulge fail"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Kustuta kõik peale allkirja"
 
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Krüpti sõnum PGPga"
 
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Sõnumi krüptimine sinu S/MIME krüptimissertifikaadi abil"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "Vor_ming"
 
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
@@ -18804,7 +19063,7 @@ msgid "PGP Sign"
 msgstr "PGP allkiri"
 
 #: ../ui/evolution-message-composer.xml.h:15
-msgid "Request read receipt"
+msgid "R_equest Read Receipt"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:16
@@ -18861,74 +19120,80 @@ msgid "Send this message"
 msgstr "Saadab selle sõnumi"
 
 #: ../ui/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Set the message priority to high"
+msgstr "Salvestab sõnumi tekstifaili"
+
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your PGP key"
 msgstr "Allkirjastab sõnumi sinu PGP võtme abil"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allkirjastab sõnumi sinu S/MIME allkirjasertifikaadi abil"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Lülitab pimekoopia välja näitamise sisse või välja"
+msgstr "Pimekoopia välja näitamise sisse- või väljalülitamine"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the CC field is displayed"
-msgstr "Lülitab koopiavälja näitamise sisse või välja"
+msgstr "Koopiavälja näitamise sisse- või väljalülitamine"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Lülitab vasta-kellele välja näitamise sisse või välja"
+msgstr "Vasta-kellele välja näitamise sisse- või väljalülitamine"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Manus..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "_Salakoopia (Bcc) väli"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Cc Field"
 msgstr "_Koopia (Cc) väli"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "_Delete all"
 msgstr "_Kustuta kõik"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_From Field"
 msgstr "_Kellelt (From) väli"
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Ava..."
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
 msgstr "_Saada-kellele väli"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+#, fuzzy
+msgid "_Prioritise Message"
+msgstr "_Eelmine sõnum"
+
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele väli"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Turvalisus"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_To Field"
 msgstr "_Vasta-kellele (To) väli"
 
@@ -19121,18 +19386,23 @@ msgid "Send / Receive"
 msgstr "Saada / võta vastu"
 
 #: ../ui/evolution.xml.h:20
+#, fuzzy
+msgid "Send / _Receive"
+msgstr "Saada / võta vastu"
+
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Järjekorras olevate sõnumite ärasaatmine ja uute vastuvõtmine"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Seab Pilot'i seadeid"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Näitab teavet Evolutioni kohta"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
@@ -19140,66 +19410,58 @@ msgstr "Saada veateade"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
 msgid "Toggle whether we are working offline."
-msgstr "Lülitab autonoomse reziimi sisse või välja"
+msgstr "Autonoomse reziimi sisse- või väljalülitamine"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar"
 msgstr "_Tööriistariba"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
 msgid "Tool_bar style"
 msgstr "Tööriistariba _stiil"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr ""
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_Evolutionist lähemalt..."
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
 msgid "_Hide buttons"
 msgstr "_Peida nupud"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Icons only"
 msgstr "Ainult _ikoonid"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:42
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Uus"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "_Kiirviide"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Quit"
-msgstr "_Välju"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Send / Receive"
-msgstr "_Saada / võta vastu"
-
 #: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr ""
@@ -19277,9 +19539,8 @@ msgid "_Messages"
 msgstr "_Sõnumid"
 
 #: ../views/memos/galview.xml.h:1
-#, fuzzy
 msgid "_Memos"
-msgstr "_Liikmed"
+msgstr "_Märkmed"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -19289,8 +19550,8 @@ msgstr "_Tähtajaga"
 msgid "With _Status"
 msgstr "_Staatusega"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -19368,16 +19629,16 @@ msgid "_Replace existing view"
 msgstr "_Asenda olemasolev vaade"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-instance.c:586
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Kohandatud vaade"
 
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
 msgid "Save Custom View"
 msgstr "Salvesta kohandatud vaade"
 
-#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-instance.c:591
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Kirjelda vaateid..."
@@ -19425,17 +19686,17 @@ msgstr "Eelmine nupp"
 msgid "Month Calendar"
 msgstr "Kuu kalender"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
+#: ../widgets/misc/e-canvas-background.c:459
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
 msgid "Fill color"
 msgstr "Täitevärvus"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:466
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:473
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
 #: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
 #: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
@@ -19443,30 +19704,30 @@ msgstr "Täitevärvus"
 msgid "GDK fill color"
 msgstr "GDK täitevärvus"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
+#: ../widgets/misc/e-canvas-background.c:480
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:487
+#: ../widgets/misc/e-canvas-background.c:488
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:494
+#: ../widgets/misc/e-canvas-background.c:495
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:501
+#: ../widgets/misc/e-canvas-background.c:502
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:508
+#: ../widgets/misc/e-canvas-background.c:509
 msgid "Y2"
 msgstr "Y2"
 
@@ -19489,11 +19750,11 @@ msgstr "Vähim laius"
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:453
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:460
 msgid "Now"
 msgstr "Praegu"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:802
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Kellaaeg peab olema sisestatud %s formaadis"
@@ -19590,34 +19851,44 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:320
 msgid "Date and Time Entry"
 msgstr "Kuupäeva ja kellaaja väli"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:339
 msgid "Text entry to input date"
 msgstr "Tekstiväli kuupäeva sisestamiseks"
 
-#: ../widgets/misc/e-dateedit.c:336
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text Date Entry"
 msgstr "Tekstiline kuupäeva väli"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:361
 msgid "Click this button to show a calendar"
 msgstr "Kalendri näitamiseks klõpsa sellel nupul"
 
-#: ../widgets/misc/e-dateedit.c:355
+#: ../widgets/misc/e-dateedit.c:362
 msgid "Date Button"
 msgstr "Kuupäeva nupp"
 
-#: ../widgets/misc/e-dateedit.c:376
+#: ../widgets/misc/e-dateedit.c:383
 msgid "Combo box to select time"
 msgstr "Valikukast aja valimiseks"
 
-#: ../widgets/misc/e-dateedit.c:377
+#: ../widgets/misc/e-dateedit.c:384
 msgid "Time Combo Box"
 msgstr "Aja valikukast"
 
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laiendatud"
@@ -19668,16 +19939,16 @@ msgstr "Indikaatorivahe"
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: ../widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:201
 msgid "_Searches"
 msgstr "_Otsingud"
 
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Otsinguredaktor"
+#: ../widgets/misc/e-filter-bar.c:203
+msgid "Searches"
+msgstr "Otsingud"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:226
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
@@ -19697,11 +19968,11 @@ msgstr "_Laiendatud otsing..."
 msgid "Choose Image"
 msgstr "Vali pilt"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:651
 msgid "World Map"
 msgstr "Maailmakaart"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:653
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19733,41 +20004,41 @@ msgstr "Veeru laius"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:372
 msgid "Search Text Entry"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:591
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Search Type"
 msgstr "Otsingu tüüp"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:893
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:900
 msgid "Subitem ID"
 msgstr "Alamkirje ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:987
 msgid "Find _Now"
 msgstr "_Otsing"
 
@@ -19793,7 +20064,7 @@ msgstr "Valimise režiim"
 msgid "Cursor Mode"
 msgstr "Kursorirežiim"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:524
 msgid "When de_leted:"
 msgstr "Kui _kustutatakse:"
 
@@ -19870,21 +20141,22 @@ msgstr ""
 "Madal"
 
 #: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "Kui _nõustutakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "Kui _lõpetatakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "Kui k_eeldutakse:"
 
+#: ../widgets/misc/e-send-options.glade.h:26
+#, fuzzy
+msgid "Wi_thin"
+msgstr "Laius"
+
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Pärast:"
@@ -19928,7 +20200,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
+#, fuzzy
+msgid "Click here to go to URL"
 msgstr "URL'i avamiseks kliki siin"
 
 #: ../widgets/misc/gal-categories.glade.h:2
@@ -19967,23 +20240,23 @@ msgstr "Fokusseeritud veerg"
 msgid "Unselected Column"
 msgstr "Valimata veerg"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1742
 msgid "Strikeout Column"
 msgstr "Läbikriipsutatud veerg"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Underline Column"
 msgstr "Allajoonitud veerg"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Bold Column"
 msgstr "Rasvane veerg"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Color Column"
 msgstr "Värviline veerg"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1777
 msgid "BG Color Column"
 msgstr ""
 
@@ -20306,8 +20579,9 @@ msgstr "Tabeli mudel"
 msgid "Cursor row"
 msgstr "Kursori rida"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
+msgid "Always search"
 msgstr ""
 
 #: ../widgets/table/e-table.c:3337
@@ -20318,10 +20592,6 @@ msgstr ""
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr ""
-
 #: ../widgets/table/e-tree.c:3311
 msgid "Retro Look"
 msgstr ""
@@ -20470,6 +20740,164 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Dismiss"
+#~ msgstr "Katkesta"
+
+#~ msgid "Dismiss All"
+#~ msgstr "Tühista kõik"
+
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarm: %s\n"
+#~ "%s\n"
+#~ "Algus: %s\n"
+#~ "Lõpp: %s"
+
+#~ msgid "Remove"
+#~ msgstr "Eemalda"
+
+#~ msgid "Don't Remove"
+#~ msgstr "Ära eemalda"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minutit"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minutit"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minutit"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minutit"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minutit"
+
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Alarmid</b>"
+
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Üldine</b>"
+
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Ülesandeloend</b>"
+
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Aeg</b>"
+
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Töönädal</b>"
+
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Kalendri ja ülesannete sätted"
+
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Tähtaja ületanud ülesannete värvus"
+
+#~ msgid "Color for tasks due today"
+#~ msgstr "Tänase tähtajaga ülesannete värvus"
+
+#~ msgid "Days"
+#~ msgstr "Päev(a)"
+
+#~ msgid "Hours"
+#~ msgstr "Tund(i)"
+
+#~ msgid "Minutes"
+#~ msgstr "Minut(it)"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Avalikusta vaba/hõivatud teave"
+
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a, %d.%m.%Y"
+
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d.%m.%Y"
+
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+
+#~ msgid "_Rule name:"
+#~ msgstr "_Reegli nimi:"
+
+#~ msgid "If"
+#~ msgstr "Kui"
+
+#~ msgid "Execute actions"
+#~ msgstr "Tegevused täidetakse juhul, kui"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Käsu käivitamine..."
+
+#~ msgid "Automatic contacts"
+#~ msgstr "Automaatsed kontaktid"
+
+#~ msgid "Exchange Connector access error."
+#~ msgstr "Exchange Connector'ile ligipääsu viga."
+
+#~ msgid "Plugin manager"
+#~ msgstr "Pluginahaldur"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid "Delete this occurrence"
+#~ msgstr "Kustuta seekordne sündmus"
+
+#~ msgid "Publish Free/Busy information for this calendar"
+#~ msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
+
+#~ msgid "Customize My Evolution"
+#~ msgstr "Minu Evolutioni kohandamine"
+
+#~ msgid "Move"
+#~ msgstr "Tõsta"
+
+#~ msgid "_Send / Receive"
+#~ msgstr "_Saada / võta vastu"
+
+#~ msgid "Search Editor"
+#~ msgstr "Otsinguredaktor"
+
 #~ msgid "description of appointment"
 #~ msgstr "sündmuse kirjeldus"
author	Priit Laes <plaes@cvs.gnome.org>	2006-01-09 16:51:36 +0800
committer	Priit Laes <plaes@src.gnome.org>	2006-01-09 16:51:36 +0800
commit	7305191377795dc544dc78ef3657065e9b384aa6 (patch)
tree	a409cde0fdecf38717d39c1c25361467510825e3 /po/et.po
parent	a120898a538ae2789e5a36b8414b15ec0c20a9db (diff)
download	gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.gz gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.bz2 gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.lz gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.xz gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.tar.zst gsoc2013-evolution-7305191377795dc544dc78ef3657065e9b384aa6.zip