Translation updated by Ivar Smolin.

2005-11-23  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated by Ivar Smolin.

svn path=/trunk/; revision=30644

2 files changed, 1637 insertions, 978 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 5f8e5dc8e0..e8805eee0f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-23  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
 2005-11-21  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
diff --git a/po/et.po b/po/et.po
index 5a8ca6f5dd..eb7fcf54e2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-15 12:49+0200\n"
-"PO-Revision-Date: 2005-11-04 00:13+0200\n"
+"POT-Creation-Date: 2005-11-22 13:39+0100\n"
+"PO-Revision-Date: 2005-11-22 22:23+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ 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:968
+#: ../calendar/gui/alarm-notify/alarm-queue.c:969
 #: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ava"
@@ -387,7 +387,7 @@ msgid "Server Version"
 msgstr "Serveri versioon"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
 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"
@@ -459,7 +459,7 @@ msgstr ""
 "koopiat?"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:57
+#: ../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 "
@@ -571,10 +571,12 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #. 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
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../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 ../mail/mail-vfolder.c:223
+#: ../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
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
 
@@ -586,10 +588,12 @@ msgstr "Kohalikus arvutis"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../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
+#: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Isiklik"
 
@@ -616,8 +620,7 @@ msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
 #: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-config.c:1149
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
@@ -633,59 +636,60 @@ msgstr "Uue aadressiraamatu loomine"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Tõrge aadressiraamatu kataloogide või seadistuste uuendamisel."
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Baas"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:511
 #: ../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:607
+#: ../addressbook/gui/component/addressbook-config.c:610
 msgid "Copy book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/addressbook-config.c:933
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../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
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
+#: ../addressbook/gui/component/addressbook-config.c:934
 #: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:938
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:940
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/addressbook-config.c:943
+#: ../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:913
+#: ../addressbook/gui/component/addressbook-config.c:944
 msgid "Searching"
 msgstr "Otsing"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:946
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1147
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
@@ -747,17 +751,28 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
+#: ../addressbook/gui/component/addressbook-view.c:763
+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
-#: ../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-tasks.xml.h:6
-msgid "Delete"
-msgstr "Kustuta"
+#: ../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
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Kustuta"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
-msgid "Properties..."
-msgstr "Omadused..."
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
+msgid "_Properties..."
+msgstr "_Omadused..."
 
 #: ../addressbook/gui/component/addressbook-view.c:1191
 msgid "Contact Source Selector"
@@ -768,12 +783,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
 #: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
 #: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
@@ -817,7 +832,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Püstpaani asukoht"
 
@@ -826,128 +841,122 @@ msgid "Whether to show the preview pane."
 msgstr "Millal kuvada eelvaatluspaani."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Display</b>"
 msgstr "<b>Kuva</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Allalaadimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>Serveri info</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Type:</b>"
 msgstr "<b>Tüüp:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 #: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Alati"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Peamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "One"
 msgstr "Üks tase alla (One)"
 
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search Filter"
+msgstr "Otsingufilter"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Otsingubaas:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search _filter:"
+msgstr "Otsingu_filter:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search filter"
+msgstr "Otsingufilter"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -955,7 +964,7 @@ msgstr ""
 "See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
 "juhul, kui LDAP server toetab SSL või TLS protokolli."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -967,7 +976,7 @@ msgstr ""
 "LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei "
 "pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -976,22 +985,22 @@ msgstr ""
 "See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolle. "
 "Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Kogu alampuu (Sub)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -999,19 +1008,19 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1021,13 +1030,13 @@ msgstr ""
 "seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
 "toetama anonüümset ligipääsu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1037,36 +1046,36 @@ msgstr ""
 "standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
 "peaksid määrama."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 #: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Add Address Book"
 msgstr "Lisa _aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Find Possible Search Bases"
 msgstr "_Leia võimalikud otsingubaasid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Login method:"
 msgstr "_Sisselogimismeetod:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
 #: ../mail/mail-config.glade.h:164
@@ -1074,33 +1083,33 @@ msgstr "_Sisselogimismeetod:"
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Timeout:"
 msgstr "_Ajapiirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Use secure connection:"
 msgstr "_Turvalist ühendust kasutatakse:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "cards"
 msgstr "kaardid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #: ../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
@@ -1109,6 +1118,30 @@ msgstr "kaardid"
 msgid "minutes"
 msgstr "minutit"
 
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/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
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
@@ -1162,7 +1195,7 @@ 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:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2372
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1232,6 +1265,7 @@ 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
 msgid "_Categories"
 msgstr "_Kategooriad"
 
@@ -2405,20 +2439,20 @@ msgid "Changed"
 msgstr "Muudetud"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2367
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2680
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2960
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2426,7 +2460,7 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3012
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
@@ -2759,6 +2793,7 @@ msgstr "Allikas"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:377
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tüüp"
 
@@ -2767,76 +2802,91 @@ msgid "Address Book"
 msgstr "Aadressiraamat"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2018
 #: ../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 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "A_va"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "Uus kontakt..."
+msgid "_New Contact..."
+msgstr "_Uus kontakt..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "Uus kontaktide loend..."
+msgid "New Contact _List..."
+msgstr "Uus kontaktide _loend..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "_Save as VCard..."
+msgstr "_Salvesta VKaardina"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Forward Contact"
-msgstr "Edasta kontakt"
+msgid "_Forward Contact"
+msgstr "_Edasta kontakt"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
-msgstr "Edasta kontaktid"
+msgid "_Forward Contacts"
+msgstr "_Edasta kontaktid"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
+#, fuzzy
+msgid "Send _Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
+#, fuzzy
+msgid "Send _Message to List"
 msgstr "Saada sõnum postiloendisse"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
+#, fuzzy
+msgid "Send _Message to Contacts"
 msgstr "Saada kontaktidele sõnum"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Trüki"
+msgid "_Print"
+msgstr "_Prindi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
+#, fuzzy
+msgid "Cop_y to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
+#, fuzzy
+msgid "Mo_ve to Address Book..."
 msgstr "Tõsta aadressiraamatusse..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Lõika"
+#: ../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
-#: ../ui/evolution-addressbook.xml.h:3 ../ui/evolution-mail-message.xml.h:12
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopeeri"
+#: ../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
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Kopeeri"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#, fuzzy
+msgid "P_aste"
 msgstr "Aseta"
 
 #. All, unmatched, separator
@@ -2879,9 +2929,10 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Kategooriad"
 
@@ -3255,7 +3306,7 @@ msgstr "Mitte toetatud protokoll"
 #: ../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:2373
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "Katkestatud"
 
@@ -3477,6 +3528,17 @@ msgstr "Mitu VKaarti"
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:1031
+#: ../addressbook/gui/widgets/eab-gui-util.c:1049
+#, fuzzy
+msgid "Contact information"
+msgstr "Päevaraamatu teave"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+#, fuzzy, c-format
+msgid "Contact information for %s"
+msgstr "Päevaraamatu teave"
+
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -3568,12 +3630,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "Print envelope"
 msgstr "Trüki ümbrik"
 
-#: ../addressbook/printing/e-contact-print.c:1014
+#: ../addressbook/printing/e-contact-print.c:1026
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: ../addressbook/printing/e-contact-print.c:1105
-#: ../addressbook/printing/e-contact-print.c:1133
+#: ../addressbook/printing/e-contact-print.c:1117
+#: ../addressbook/printing/e-contact-print.c:1145
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
@@ -3992,33 +4054,38 @@ msgid "Delete calendar '{0}'?"
 msgstr "Kustutada kalender '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Delete task list '{0}'?"
+#, fuzzy
+msgid "Delete memo list '{0}'?"
 msgstr "Kas kustutata ülesandeloend '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:27
+msgid "Delete task list '{0}'?"
+msgstr "Kas kustutata ülesandeloend '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "Ära saada"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 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:29
+#: ../calendar/calendar.error.xml.h:30
 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:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Redaktorit pole võimalik laadida."
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 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:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4026,15 +4093,20 @@ msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil ülesandele nõusolekut anda."
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Viga kalendri laadimisel"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
+#, fuzzy
+msgid "Error loading memo list"
+msgstr "Viga ülesandeloendi laadimisel"
+
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4042,7 +4114,7 @@ msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle "
 "päeviku kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4050,7 +4122,7 @@ msgstr ""
 "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
 "katkestamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4058,16 +4130,16 @@ msgstr ""
 "Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Saada"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "Teavita"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4075,7 +4147,7 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende kalendreid "
 "ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4083,106 +4155,116 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende ülesannete "
 "nimekirja ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutioni kalender lõpetas ootamatult."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutioni ülesanded lõpetasid ootamatult."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
 msgstr "Kalender pole märgitud autonoomses režiimis kasutamiseks"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
+#, fuzzy
+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"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "This memo list will be removed permanently."
+msgstr "See ülesandeloend eemaldatakse jäädavalt."
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this task?"
 msgstr "Kas soovid selle ülesande muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Kas soovid teisi osalejaid selle päevikukirje katkestamisest teavitada?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Kas soovid teisi osalejaid katkestamisest teavitada?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send this task to participants?"
 msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 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:58
+#: ../calendar/calendar.error.xml.h:62
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "Sa oled muutnud seda sündmust, kuid muudatused ei ole salvestatud."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Sa oled seda ülesannet muutnud aga muudatused on salvestamata."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Sinu kalendreid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Sinu ülesandeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Loobu muudatustest"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:69
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
 msgid "_Send"
 msgstr "_Saada"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:312
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -4193,8 +4275,10 @@ msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../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
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
@@ -4203,16 +4287,35 @@ msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki ei suudetud lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+#, fuzzy
+msgid "Could not read pilot's Memo application block"
+msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+#, fuzzy
+msgid "Could not write pilot's Memo application block"
+msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
+
+#: ../calendar/conduits/todo/todo-conduit.c:237
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1071
+#: ../calendar/conduits/todo/todo-conduit.c:1074
 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
+#, fuzzy
+msgid "Could not write pilot's ToDo application block"
+msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
+
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
@@ -4246,26 +4349,43 @@ 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"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolutioni ülesannetekomponent"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1332 ../calendar/gui/print.c:1831
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+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
+msgid "Memos"
+msgstr "Liikmed"
+
+#: ../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:1012 ../calendar/gui/tasks-control.c:466
+#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_Kalendrid"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ülesanded"
@@ -4274,13 +4394,13 @@ msgstr "_Ülesanded"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:250
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:251
 msgid "Start time"
 msgstr "Algusaeg"
 
@@ -4300,7 +4420,7 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
+#: ../calendar/gui/e-itip-control.c:1117
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Asukoht:"
@@ -4315,8 +4435,8 @@ msgstr "_Edasilükkamise aeg:"
 #: ../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
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../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-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
@@ -4329,35 +4449,31 @@ msgid "_Snooze"
 msgstr "_Lükka edasi"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-msgid "description of appointment"
-msgstr "sündmuse kirjeldus"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:969
+#: ../calendar/gui/alarm-notify/alarm-queue.c:970
 msgid "Dismiss"
 msgstr "Katkesta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:970
+#: ../calendar/gui/alarm-notify/alarm-queue.c:971
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1052
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1053
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1061
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1063
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1062
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1064
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1071
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 msgid "No location information available."
 msgstr "Asukoha kohta puuduvad andmed."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1087
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4370,12 +4486,12 @@ msgstr ""
 "Algus: %s\n"
 "Lõpp: %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1190
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1214
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1191
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1215
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1194
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4387,7 +4503,7 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1220
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1221
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4403,7 +4519,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1234
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1235
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
@@ -4592,143 +4708,197 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Nädalanumbrite näitamine kuupäevavalikus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../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."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Ajajaotised:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Kahekümneneljatunnine ajavorming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas sündmuste või ülesannete kustutamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas sündmuste või ülesannete puhastamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#, fuzzy
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#, fuzzy
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#, fuzzy
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#, fuzzy
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kas kellaaegu kuvatakse 24-tunnises või EL/PL vormingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#, fuzzy
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#, fuzzy
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas nädalate numbreid näidatakse kuupäevasirvijas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
@@ -4752,13 +4922,22 @@ msgstr "Asukoht sisaldab"
 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-tasks.xml.h:14
+msgid "Print"
+msgstr "Trüki"
+
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2113
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2116
 #: ../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:588
+#: ../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
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -4785,10 +4964,13 @@ msgid "days"
 msgstr "päeva"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../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
 msgid "On The Web"
 msgstr "Veebis"
 
@@ -4806,39 +4988,11 @@ msgstr "Ilm"
 msgid "_New Calendar"
 msgstr "_Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:2911
-#: ../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-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Kopeeri"
-
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569
-#: ../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
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Kustuta"
-
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "_Properties..."
-msgstr "_Omadused..."
-
 #: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1157
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
@@ -4892,6 +5046,7 @@ msgid "New calendar"
 msgstr "Uus kalender"
 
 #: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/dialogs/event-page.c:828
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
@@ -5026,7 +5181,8 @@ msgstr "tund(i)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../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"
@@ -5048,6 +5204,8 @@ msgid "A_dd"
 msgstr "L_isa"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmid"
 
@@ -5074,17 +5232,20 @@ msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2459
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
+#: ../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:1099
+#: ../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:3400
+#: ../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
@@ -5092,23 +5253,23 @@ msgid "_Remove"
 msgstr "_Eemalda"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
+#: ../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:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
+#: ../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:969
+#: ../widgets/misc/e-attachment-bar.c:994
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
@@ -5123,7 +5284,7 @@ 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:241
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
@@ -5158,7 +5319,7 @@ 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:1166
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../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
@@ -5179,7 +5340,7 @@ 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:891
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:919
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Lubatud"
@@ -5298,12 +5459,14 @@ 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
 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:734
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Reede"
 
@@ -5317,7 +5480,7 @@ msgstr "Minut(it)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -5331,7 +5494,7 @@ msgstr "_P"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -5345,7 +5508,7 @@ 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:729
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -5363,11 +5526,12 @@ msgstr "Mall:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Neljapäev"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
@@ -5377,7 +5541,7 @@ msgstr "Ajavorming:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -5387,7 +5551,7 @@ 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:732
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
@@ -5477,27 +5641,44 @@ msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+#, fuzzy
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+"Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Vä_rvus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Ülesannete loend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#, fuzzy
+msgid "Memos List"
+msgstr "Sõnumiloend"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../calendar/gui/dialogs/calendar-setup.c:462
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:528
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/memos-component.c:448
+#, fuzzy
+msgid "New Memo List"
+msgstr "Uus kontaktide nimekiri"
+
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Kalendri lisamine"
@@ -5608,105 +5789,105 @@ msgstr " (Tähtaeg "
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:193 ../composer/e-msg-composer.c:2800
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../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
 #, 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:429 ../composer/e-msg-composer.c:2912
+#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3050
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
 msgid "_Move"
 msgstr "_Tõsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3052
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:913 ../composer/e-msg-composer.c:2443
 #, 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:1007
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, fuzzy
 msgid "Hide Attachment _Bar"
 msgstr "Manuseriba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 #, fuzzy
 msgid "Show Attachment _Bar"
 msgstr "Manuseriba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1868
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1984
+#: ../calendar/gui/dialogs/comp-editor.c:2027
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1874
-#: ../calendar/gui/dialogs/comp-editor.c:1917
+#: ../calendar/gui/dialogs/comp-editor.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:2033
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1876
-#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:1992
+#: ../calendar/gui/dialogs/comp-editor.c:2035
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
-#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:1996
+#: ../calendar/gui/dialogs/comp-editor.c:2039
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1882
-#: ../calendar/gui/dialogs/comp-editor.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:1998
+#: ../calendar/gui/dialogs/comp-editor.c:2041
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1885
-#: ../calendar/gui/dialogs/comp-editor.c:1928
+#: ../calendar/gui/dialogs/comp-editor.c:2001
+#: ../calendar/gui/dialogs/comp-editor.c:2044
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1896
-#: ../calendar/gui/dialogs/comp-editor.c:1938
+#: ../calendar/gui/dialogs/comp-editor.c:2012
+#: ../calendar/gui/dialogs/comp-editor.c:2054
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2551
-#: ../calendar/gui/dialogs/comp-editor.c:2584
-#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../calendar/gui/dialogs/comp-editor.c:2668
+#: ../calendar/gui/dialogs/comp-editor.c:2701
+#: ../calendar/gui/dialogs/comp-editor.c:2725
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2632
+#: ../calendar/gui/dialogs/comp-editor.c:2749
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -5783,197 +5964,172 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:141
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:525
 msgid "Appoint_ment"
-msgstr "Sündmus"
+msgstr "Sünd_mus"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
-msgid "_Recurrence"
-msgstr "Ko_rdumine"
+#: ../calendar/gui/dialogs/event-editor.c:529
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Recurrence"
+msgstr "Kordumine"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Schedulin_g"
-msgstr "_Plaanimine"
+#: ../calendar/gui/dialogs/event-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:443
+msgid "Or_ganizer"
+msgstr "Ko_rraldaja"
 
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-page.c:872
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
-msgid "_Attendees"
+#: ../calendar/gui/dialogs/event-page.c:874
+msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "In_vitations"
-msgstr "_Kutsed"
-
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1036
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1201
+#: ../calendar/gui/dialogs/task-page.c:847
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1211
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1234
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1241
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1396
+#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/task-page.c:904
+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
+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
+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
+msgid "_Add "
+msgstr "_Lisa "
+
+#: ../calendar/gui/dialogs/event-page.c:2421
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2661
 #, 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:1900
+#: ../calendar/gui/dialogs/event-page.c:2669
 #, 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:1908
+#: ../calendar/gui/dialogs/event-page.c:2677
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 day before appointment"
-msgstr "1 päev enne sündmust"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 hour before appointment"
 msgstr "1 tund enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "1day before appointment"
+msgstr "1 päev enne sündmust"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>Sisu</b>"
+msgid "Atte_ndees..."
+msgstr "_Osalejad..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>Kuupäev ja kellaaeg</b>"
+msgid "C_ustomize"
+msgstr "_Kohanda"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Send Options</b>"
-msgstr "<b>Saatmise valikud</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "Kestab kogu _päeva"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "Ala_rm"
-msgstr "Ala_rmid"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-msgid "C_ustomize..."
-msgstr "_Kohanda..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "_Liigitamine"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:364
-msgid "Confidential"
-msgstr "Salajane"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Sündmuse kirjeldus"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Locat_ion:"
 msgstr "_Asukoht:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:363
-msgid "Private"
-msgstr "Isiklik"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../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
-msgid "Public"
-msgstr "Avalik"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-msgid "Show time as bus_y"
-msgstr "Näita aega kui _hõivatut"
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "Or_ganizer:"
+msgstr "Ko_rraldaja:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "K_okkuvõte:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
-msgid "This appointment has customized alarms"
-msgstr "Sellel sündmusel on kohandatud alarmid"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:645
-msgid "_End time:"
-msgstr "_Lõpp:"
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+msgid "_Set alarm\t"
+msgstr "_Määra alarm\t"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:618
-msgid "_Start time:"
-msgstr "_Algus:"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Aeg:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "kuni"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "kuupäevani"
 
 #: ../calendar/gui/dialogs/meeting-page.c:305
 msgid "<b>Dele_gatees</b>"
@@ -5991,7 +6147,7 @@ msgstr "<b>Saatja:</b>"
 #: ../calendar/gui/dialogs/meeting-page.c:315
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
+#: ../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
@@ -6000,27 +6156,11 @@ msgstr "<b>Saatja:</b>"
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../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:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
+#: ../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
 msgid "None"
 msgstr "Puudub"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
-msgid "The organizer selected no longer has an account."
-msgstr ""
-
-#: ../calendar/gui/dialogs/meeting-page.c:469
-msgid "An organizer is required."
-msgstr "Korraldaja peab olema määrtud."
-
-#: ../calendar/gui/dialogs/meeting-page.c:484
-msgid "At least one attendee is required."
-msgstr "Vähemalt üks osaleja peab olema märgitud."
-
-#: ../calendar/gui/dialogs/meeting-page.c:909
-msgid "_Add "
-msgstr "_Lisa "
-
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6082,10 +6222,6 @@ msgstr "_Muuda korraldajat"
 msgid "Co_ntacts..."
 msgstr "Ko_ntaktid..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Ko_rraldaja:"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr "Korraldaja"
@@ -6095,6 +6231,53 @@ msgstr "Korraldaja"
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
+#, fuzzy
+msgid "Memo"
+msgstr "E"
+
+#: ../calendar/gui/dialogs/memo-page.c:489
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Ülesandeid pole võimalik '%s'-s avada."
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Olek</span>"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+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
+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
+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
+msgid "Public"
+msgstr "Avalik"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Grupp:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:9
+#, fuzzy
+msgid "_Memo Content:"
+msgstr "Uus kontakt:"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendri valikud</b>"
@@ -6237,10 +6420,6 @@ msgstr "Vahemikuga"
 msgid "This appointment rec_urs"
 msgstr "See sündmus _kordub"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "kuni"
-
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "igavesti"
@@ -6249,10 +6428,6 @@ msgstr "igavesti"
 msgid "month(s)"
 msgstr "kuu(d)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "kuupäevani"
-
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nädal(at)"
@@ -6284,9 +6459,9 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #: ../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:898
+#: ../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/print.c:2370 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
@@ -6301,7 +6476,7 @@ msgstr "Kõrge"
 #: ../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:2367
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "Töös"
 
@@ -6322,7 +6497,7 @@ msgstr "Keskmine"
 #: ../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:2364
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -6352,55 +6527,56 @@ msgstr "Tä_htsus:"
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/dialogs/task-editor.c:419
+#: ../calendar/gui/tasks-component.c:1172
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: ../calendar/gui/dialogs/task-editor.c:146
-msgid "_Status"
-msgstr "_Olek"
+#: ../calendar/gui/dialogs/task-editor.c:423
+#, fuzzy
+msgid "Task Details"
+msgstr "Üksikasjad"
 
-#: ../calendar/gui/dialogs/task-editor.c:161
-#: ../calendar/gui/dialogs/task-editor.c:223
-#: ../calendar/gui/dialogs/task-editor.c:380
+#: ../calendar/gui/dialogs/task-page.c:436
 #, fuzzy
-msgid "Assig_nment"
-msgstr "Täitjad"
+msgid "_Group"
+msgstr "_Grupp:"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:820
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1613
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kate_gooriad..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "_Kirjeldus:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+#, fuzzy
+msgid "Or_ganiser:"
+msgstr "Ko_rraldaja:"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
-msgid "Task Description"
-msgstr "Ülesande kirjeldus"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Time zone:"
+msgstr "Aja_vöönd:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Grupp:"
-
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vaba/hõivatud kal_endrid</b>"
@@ -6526,17 +6702,27 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliki, et avada aadressi %s"
 
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+msgid "Memo:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:232
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Veebileht:"
+
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Nimetu"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-itip-control.c:1107
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
@@ -6553,7 +6739,7 @@ msgstr "Tähtaeg:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
+#: ../calendar/gui/e-itip-control.c:1131
 #: ../plugins/exchange-operations/exchange-account-setup.c:265
 #: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
@@ -6563,10 +6749,6 @@ msgstr "Olek:"
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Veebileht:"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
@@ -6577,7 +6759,8 @@ msgstr "Alguskuupäev"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kokkuvõte"
 
@@ -6619,15 +6802,17 @@ 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-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../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-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:1244
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:665
+#: ../widgets/misc/e-attachment-bar.c:690
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -6640,6 +6825,40 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "Määratud"
 
+#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
+msgid "Save As..."
+msgstr "Salvestamine kui..."
+
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+msgid "Select folder to save selected attachments..."
+msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
+
+#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
+#, c-format
+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
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
+#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
+#: ../mail/em-popup.c:565
+msgid "Set as _Background"
+msgstr "Säti _taustapildiks"
+
+#: ../calendar/gui/e-cal-popup.c:272
+#, fuzzy
+msgid "_Save Selected"
+msgstr "Valitu salvestamine"
+
+#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
+#, c-format
+msgid "Open in %s..."
+msgstr "Ava programmiga %s..."
+
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -6689,50 +6908,49 @@ msgid "Task Table"
 msgstr "Ülesannete tabel"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671
+#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
 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-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
+#: ../composer/e-msg-composer.c:1341
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-calendar-table.c:1168
+#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
-
 #: ../calendar/gui/e-calendar-table.c:1170
 #: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
+#: ../mail/em-folder-view.c:1046
 #: ../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-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../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 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
+#: ../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 ../ui/evolution-addressbook.xml.h:39
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:28
+#: ../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
+#: ../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"
 
@@ -6740,7 +6958,8 @@ msgstr "_Aseta"
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
@@ -6925,94 +7144,94 @@ msgstr "el"
 msgid "pm"
 msgstr "pl"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:771
 #, 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:779
+#: ../calendar/gui/e-itip-control.c:776
 #, 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:781
+#: ../calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:786
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:793
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:813
 #, 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:820
+#: ../calendar/gui/e-itip-control.c:817
 #, 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:831
+#: ../calendar/gui/e-itip-control.c:828
 #, 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:840
+#: ../calendar/gui/e-itip-control.c:837
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:861
 msgid "Starts"
 msgstr "Algab"
 
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:874
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:908
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
 msgid "iCalendar Information"
 msgstr "iKalendri teave"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:965
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../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
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7021,7 +7240,7 @@ msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1088
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7029,292 +7248,292 @@ msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
 "tegevus."
 
-#: ../calendar/gui/e-itip-control.c:1139
+#: ../calendar/gui/e-itip-control.c:1136
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
+#: ../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:1143 ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/e-itip-control.c:1140 ../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:1147
+#: ../calendar/gui/e-itip-control.c:1144
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
+#: ../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:1231
+#: ../calendar/gui/e-itip-control.c:1228
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1309
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1310
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1316
 #, 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:1321
+#: ../calendar/gui/e-itip-control.c:1318
 #, 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:1322
+#: ../calendar/gui/e-itip-control.c:1319
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1325
 #, 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:1329
+#: ../calendar/gui/e-itip-control.c:1326
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1330
 #, 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:1334
+#: ../calendar/gui/e-itip-control.c:1331
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1338
 #, 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:1342
+#: ../calendar/gui/e-itip-control.c:1339
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: ../calendar/gui/e-itip-control.c:1350
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1474
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1393
 #, 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:1398
+#: ../calendar/gui/e-itip-control.c:1395
 #, 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:1399
+#: ../calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1402
 #, 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:1406
+#: ../calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1407
 #, 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:1411
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1415
 #, 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:1419
+#: ../calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1427
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1435
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1459
 #, 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:1463
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud teave"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1464
 #, 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:1468
+#: ../calendar/gui/e-itip-control.c:1465
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1469
 #, 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:1473
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1475
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1550
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1609
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1642
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1674
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendrikirjeid"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1908
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1946
 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:1961
+#: ../calendar/gui/e-itip-control.c:1958
 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:1978
+#: ../calendar/gui/e-itip-control.c:1975
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek värskendatud\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
+#: ../calendar/gui/e-itip-control.c:1978
 #: ../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:2011
+#: ../calendar/gui/e-itip-control.c:2008
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
 msgid "The item could not be sent!\n"
 msgstr "Seda kirjet pole võimalik saata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2163
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Nõustun"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud teabe saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "Värskenda vastaja olekut"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "Saadab värskeima teabe"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/e-itip-control.c:2377 ../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"
@@ -7432,7 +7651,7 @@ 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/itip-utils.c:557
+#: ../calendar/gui/itip-utils.c:555
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegeeritud"
@@ -7472,7 +7691,7 @@ msgstr "%a, %d.%m.%Y"
 #. 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:1682
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1684
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -7532,12 +7751,36 @@ msgstr "_Vajalikud inimesed"
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-pub-utils.c:311
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Sisesta parool %s jaoks"
+#: ../calendar/gui/e-meeting-time-sel.c:618
+msgid "_Start time:"
+msgstr "_Algus:"
 
-#: ../calendar/gui/e-tasks.c:824 ../calendar/gui/gnome-cal.c:2551
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_End time:"
+msgstr "_Lõpp:"
+
+#: ../calendar/gui/e-memo-table.c:267
+#, fuzzy
+msgid "Memo Table"
+msgstr "Tabel"
+
+#: ../calendar/gui/e-memo-table.c:863
+#, fuzzy
+msgid "_Delete Selected Memos"
+msgstr "_Kustuta valitud ülesanded"
+
+#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
+#, fuzzy
+msgid "Click to add a memo"
+msgstr "Ülesande lisamiseks vajuta siia"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#, fuzzy
+msgid "Memo sort"
+msgstr "Sortimata"
+
+#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
+#: ../calendar/gui/gnome-cal.c:2556
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7546,24 +7789,39 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:872
+#: ../calendar/gui/e-memos.c:775
+#, fuzzy
+msgid "Loading memos"
+msgstr "Ülesannete laadimine"
+
+#: ../calendar/gui/e-memos.c:860
+#, 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
+msgid "Deleting selected objects..."
+msgstr "Valitud objektide kustutamine..."
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Sisesta parool %s jaoks"
+
+#: ../calendar/gui/e-tasks.c:870
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:956
+#: ../calendar/gui/e-tasks.c:957
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1201
+#: ../calendar/gui/e-tasks.c:1202
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1224
-msgid "Deleting selected objects..."
-msgstr "Valitud objektide kustutamine..."
-
-#: ../calendar/gui/e-tasks.c:1251
+#: ../calendar/gui/e-tasks.c:1252
 msgid "Expunging"
 msgstr "Puhastamine"
 
@@ -7578,38 +7836,38 @@ msgstr "Ajavööndi nupp"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:790
+#: ../calendar/gui/gnome-cal.c:791
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2231
 msgid "_Custom View"
 msgstr "_Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2229
+#: ../calendar/gui/gnome-cal.c:2232
 msgid "_Save Custom View"
 msgstr "_Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2234
+#: ../calendar/gui/gnome-cal.c:2237
 msgid "_Define Views..."
 msgstr "_Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2399
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2416
+#: ../calendar/gui/gnome-cal.c:2418
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2517
+#: ../calendar/gui/gnome-cal.c:2522
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3408
+#: ../calendar/gui/gnome-cal.c:3440
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -7669,60 +7927,149 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:351 ../calendar/gui/itip-utils.c:400
+#: ../calendar/gui/itip-utils.c:440
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:387
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:508 ../calendar/gui/itip-utils.c:630
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Journal information"
 msgstr "Päevaraamatu teave"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:652
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud teave"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:516
 msgid "Calendar information"
 msgstr "Kalendri teave"
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:565
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:573
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:577
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:648
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud teave (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:658
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:813
 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
+msgid "Copy"
+msgstr "Kopeeri"
+
+#: ../calendar/gui/memos-component.c:450 ../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-tasks.xml.h:6
+msgid "Delete"
+msgstr "Kustuta"
+
+#: ../calendar/gui/memos-component.c:451
+msgid "Properties..."
+msgstr "Omadused..."
+
+#: ../calendar/gui/memos-component.c:524
+#, 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
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d valitud"
+msgstr[1] ", %d valitud"
+
+#: ../calendar/gui/memos-component.c:573
+#, fuzzy
+msgid "Failed upgrading memos."
+msgstr "Tõrge ülesannete uuendamisel."
+
+#: ../calendar/gui/memos-component.c:869
+#, 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
+#, fuzzy
+msgid "There is no calendar available for creating memos"
+msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
+
+#: ../calendar/gui/memos-component.c:973
+#, fuzzy
+msgid "Memo Source Selector"
+msgstr "Ülesannete allika valija"
+
+#: ../calendar/gui/memos-component.c:1156
+#, fuzzy
+msgid "New memo"
+msgstr "Uus koosolek"
+
+#: ../calendar/gui/memos-component.c:1157
+#, fuzzy
+msgid "_Memo"
+msgstr "_E"
+
+#: ../calendar/gui/memos-component.c:1158
+#, fuzzy
+msgid "Create a new memo"
+msgstr "Uue testikirje loomine"
+
+#: ../calendar/gui/memos-component.c:1164
+#, fuzzy
+msgid "New memo list"
+msgstr "Uus ülesandeloend"
+
+#: ../calendar/gui/memos-component.c:1165
+#, fuzzy
+msgid "Memo l_ist"
+msgstr "Ü_lesannete nimekiri"
+
+#: ../calendar/gui/memos-component.c:1166
+#, fuzzy
+msgid "Create a new memo list"
+msgstr "Uue ülesandeloendi loomine"
+
+#: ../calendar/gui/memos-control.c:334
+#, fuzzy
+msgid "Print Memos"
+msgstr "Trüki kirje"
+
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -7957,51 +8304,51 @@ msgstr "Sündmus"
 msgid "Task"
 msgstr "Ülesanne"
 
-#: ../calendar/gui/print.c:2329
+#: ../calendar/gui/print.c:2331
 #, c-format
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2337
+#: ../calendar/gui/print.c:2339
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
-#: ../calendar/gui/print.c:2380
+#: ../calendar/gui/print.c:2382
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: ../calendar/gui/print.c:2397
+#: ../calendar/gui/print.c:2399
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2411
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2423
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2435
+#: ../calendar/gui/print.c:2437
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2448
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
-#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
+#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: ../calendar/gui/print.c:2621
+#: ../calendar/gui/print.c:2623
 msgid "Print Item"
 msgstr "Trüki kirje"
 
@@ -8016,61 +8363,54 @@ msgid_plural "%d tasks"
 msgstr[0] "%d ülesanne"
 msgstr[1] "%d ülesannet"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d valitud"
-msgstr[1] ", %d valitud"
-
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:875
 #, 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:887
+#: ../calendar/gui/tasks-component.c:888
 msgid "There is no calendar available for creating tasks"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
 msgstr "Ülesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1171
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1179
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1187
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Task l_ist"
 msgstr "Ü_lesannete nimekiri"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
@@ -9747,14 +10087,14 @@ msgstr "Postita kellele:"
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer.c:832
 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:745
+#: ../composer/e-msg-composer.c:839
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9762,47 +10102,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:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1322 ../composer/e-msg-composer.c:1356
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1394
 msgid "Could not open file"
 msgstr "Tõrge faili avamisel"
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1402
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1677
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1712
 msgid "Open File"
 msgstr "Ava fail"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2126 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2229
 msgid "Si_gnature:"
 msgstr "_Signatuur:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
+#: ../composer/e-msg-composer.c:2472 ../composer/e-msg-composer.c:3673
+#: ../composer/e-msg-composer.c:3676
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:3643
+#: ../composer/e-msg-composer.c:3791
 msgid "_Attachment Bar"
 msgstr "_Manuseriba"
 
-#: ../composer/e-msg-composer.c:4722
+#: ../composer/e-msg-composer.c:4881
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9832,7 +10172,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:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuna &quot;{1}&quot;."
 
@@ -10049,7 +10389,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:270
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10057,7 +10397,7 @@ msgstr ""
 "Selle nimega fail on juba olemas.\n"
 "Kirjutada üle?"
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:272 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -10101,7 +10441,7 @@ 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:122
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:126
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -10185,7 +10525,7 @@ msgstr "%H:%M:%S"
 #. 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:1438 ../widgets/misc/e-dateedit.c:1720
+#: ../widgets/misc/e-dateedit.c:1440 ../widgets/misc/e-dateedit.c:1722
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10194,7 +10534,7 @@ msgstr "%I:%M %p"
 #. 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:1435 ../widgets/misc/e-dateedit.c:1717
+#: ../widgets/misc/e-dateedit.c:1437 ../widgets/misc/e-dateedit.c:1719
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10336,11 +10676,11 @@ msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../mail/em-utils.c:330
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10364,7 +10704,7 @@ msgstr "Puuduv kuupäev."
 msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -10610,35 +10950,35 @@ msgstr "Protokoll"
 msgid "Mail Accounts Table"
 msgstr "Postikontode tabel"
 
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
+#: ../mail/em-composer-prefs.c:309 ../mail/em-composer-prefs.c:435
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:925
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:968
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:988
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:855 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1650
 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:1695
+#: ../mail/em-composer-utils.c:1697
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10663,7 +11003,7 @@ msgstr "Omista värvus"
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-#: ../mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
 msgid "Attachments"
 msgstr "Manused"
 
@@ -11018,7 +11358,7 @@ msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
 #: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../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.xml.h:49
@@ -11046,7 +11386,7 @@ msgstr "_Uus kataloog..."
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:123
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
@@ -11096,7 +11436,7 @@ 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:546 ../mail/em-popup.c:557
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:558 ../mail/em-popup.c:569
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
@@ -11104,7 +11444,7 @@ msgstr "Vasta _kõigile"
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:560 ../mail/em-popup.c:571
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Edasta"
@@ -11198,52 +11538,52 @@ msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2065
 #: ../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:2220
+#: ../mail/em-folder-view.c:2221
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2413
+#: ../mail/em-folder-view.c:2414
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2416
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsikaust"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2417
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2418
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2699
 #, 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:455
+#: ../mail/em-format-html-display.c:461
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:712
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11251,11 +11591,11 @@ msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:713
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11263,11 +11603,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:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:714
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11275,21 +11615,21 @@ 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:709
+#: ../mail/em-format-html-display.c:715
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:715
 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:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:721 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:721
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11297,11 +11637,11 @@ 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:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:722
 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 "
@@ -11311,22 +11651,22 @@ msgstr ""
 "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:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:723
 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:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:724 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:724
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11335,71 +11675,67 @@ 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:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:840
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1122
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1130
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1133
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1193
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1194
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1195
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1196
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1566
 msgid "Attachment Button"
 msgstr "Manuse nupp"
 
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1773
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1806
-msgid "Select folder to save selected attachments..."
-msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
-
-#: ../mail/em-format-html-display.c:1814
+#: ../mail/em-format-html-display.c:1820
 msgid "Save Selected..."
 msgstr "Valitu salvestamine..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1887
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d manus"
 msgstr[1] "%d manust"
 
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1951
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:1948
+#: ../mail/em-format-html-display.c:1954
 msgid "Save All"
 msgstr "Salvesta kõik"
 
@@ -11607,45 +11943,27 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "Salvestamine kui..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "nimetu_pilt.%s"
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Säti _taustapildiks"
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:556 ../mail/em-popup.c:567
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
-#: ../mail/em-popup.c:607
+#: ../mail/em-popup.c:619
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:620
 msgid "_Send New Message To..."
 msgstr "_Saada uus sõnum aadressil..."
 
-#: ../mail/em-popup.c:609
+#: ../mail/em-popup.c:621
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Ava programmiga %s..."
-
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
@@ -11667,28 +11985,28 @@ msgstr "Palun vali server."
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: ../mail/em-utils.c:105
+#: ../mail/em-utils.c:106
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: ../mail/em-utils.c:299
+#: ../mail/em-utils.c:338
 msgid "Filters"
 msgstr "Filtrid"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1181
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
@@ -13349,15 +13667,15 @@ msgstr "Parooli sisestamine"
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:381
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:423
 msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: ../mail/mail-signature-editor.c:415
+#: ../mail/mail-signature-editor.c:426
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
@@ -13430,6 +13748,14 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
+#, fuzzy
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr ""
+"Kaust nimega &quot;{1}&quot; on juba olemas. Palun kasuta teistsugust nime."
+
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13437,19 +13763,19 @@ msgstr ""
 "Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
 "sõnumi sisu kohta."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot ja kõiki selle proksisid?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 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:11
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13457,7 +13783,7 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../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 "
 "folder &quot;{0}&quot;?"
@@ -13465,108 +13791,113 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 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:14
+#: ../mail/mail.error.xml.h:15
 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:15
+#: ../mail/mail.error.xml.h:16
 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:16
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuna &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
+#, fuzzy
+msgid "Blank Signature"
+msgstr "Allkirjad"
+
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 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:21
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 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:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 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:27
+#: ../mail/mail.error.xml.h:29
 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:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Allikat &quot;{1}&quot; pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Allikat &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Sihtkohta &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 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 "
 "license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 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:33
+#: ../mail/mail.error.xml.h:35
 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:34
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kataloogi &quot;{0}&quot; alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signatuuriskripti &quot;{0}&quot; pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13575,63 +13906,63 @@ msgstr ""
 "tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse "
 "lülitatud."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Kustuta &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Kustuta konto?"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changed?"
 msgstr "Loobuda muudatustest?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 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:44
+#: ../mail/mail.error.xml.h:46
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:47
 msgid "Don't delete"
 msgstr "Ära kustuta"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:49
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 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:52
+#: ../mail/mail.error.xml.h:54
 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:53
+#: ../mail/mail.error.xml.h:55
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13639,7 +13970,7 @@ msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13647,11 +13978,11 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 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:57
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13659,19 +13990,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:58
+#: ../mail/mail.error.xml.h:60
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 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 "
@@ -13679,31 +14010,31 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 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:64
+#: ../mail/mail.error.xml.h:66
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 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:68
+#: ../mail/mail.error.xml.h:70
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 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."
@@ -13711,7 +14042,7 @@ msgstr ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
 "nupule \"Kellele:\"."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13719,39 +14050,49 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:75
+#, fuzzy
+msgid "Please provide an unique name to identify this signature."
+msgstr "Sisesta nimi sellele allkirja jaoks."
+
+#: ../mail/mail.error.xml.h:76
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 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:79
+#: ../mail/mail.error.xml.h:82
 msgid "Search Folders automatically updated."
 msgstr "Otsikaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
+#, fuzzy
+msgid "Signature Already Exists"
+msgstr "Sertifikaat on juba olemas."
+
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13759,7 +14100,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:82
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13769,7 +14110,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13778,7 +14119,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13787,7 +14128,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -13795,23 +14136,23 @@ msgid ""
 "and resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:101
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:102
 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:100
+#: ../mail/mail.error.xml.h:104
 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:101
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13819,81 +14160,81 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:106
 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:103
+#: ../mail/mail.error.xml.h:107
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:109
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:110
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:111
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:112
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:113
 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:110
+#: ../mail/mail.error.xml.h:114
 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:111
+#: ../mail/mail.error.xml.h:115
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:116
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:117
 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:115
+#: ../mail/mail.error.xml.h:119
 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:116
+#: ../mail/mail.error.xml.h:120
 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:117
+#: ../mail/mail.error.xml.h:121
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:122
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:125
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
@@ -15012,6 +15353,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
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Saatmise valikud"
@@ -15130,18 +15472,22 @@ msgid "Proxy Login"
 msgstr "Proksi sisselogimine"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:497
+#: ../plugins/groupwise-features/proxy-login.c:262
+#: ../plugins/groupwise-features/proxy.c:501
 #: ../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:484
+#: ../plugins/groupwise-features/proxy-login.c:497
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:679
+#: ../plugins/groupwise-features/proxy.c:690
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -15165,6 +15511,70 @@ msgstr "Jagamine"
 msgid "Track Message Status..."
 msgstr "Jälgi sõnumi olekut..."
 
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+#, fuzzy
+msgid "Hula Account Setup"
+msgstr "Groupwise konto sätted"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iKalendri vorming (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#, fuzzy
+msgid "Synchronize to iPod"
+msgstr "_Sünkroniseerimisvalikud..."
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+#, fuzzy
+msgid "iPod Synchronization"
+msgstr "_Sünkroniseerimisvalikud..."
+
+#: ../plugins/ipod-sync/sync.c:158
+#, fuzzy
+msgid "No output directory!"
+msgstr "Evolutioni kataloogi taastamine"
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
+msgid "Could not export data!"
+msgstr "Andmeid pole võimalik kirjutada: %s"
+
+#: ../plugins/ipod-sync/sync.c:203
+#, fuzzy
+msgid "Exporting data failed."
+msgstr "Andmete importimine."
+
+#: ../plugins/ipod-sync/sync.c:231
+#, fuzzy
+msgid "Could not open addressbook!"
+msgstr "Aadressiraamatut ei õnnestunud laadida"
+
+#: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
+
+#: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
+msgid "Could not open calendar/todo!"
+msgstr "Sihtkoha avamine nurjus"
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
@@ -15256,10 +15666,6 @@ msgid ""
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-msgid "Meetings and Tasks"
-msgstr "Koosolekud ja ülesanded"
-
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15281,7 +15687,7 @@ 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:457
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:459
 msgid "Today"
 msgstr "Täna"
 
@@ -15943,7 +16349,8 @@ 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-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
 
@@ -15989,7 +16396,7 @@ msgid "MIME Type"
 msgstr "MIME tüüp"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Salvesta"
 
@@ -16073,10 +16480,6 @@ msgstr "Väärtuste kapseldamine:"
 msgid "Comma separated value format (.csv)"
 msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iKalendri vorming (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Valitu salvestamine"
@@ -16102,20 +16505,11 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:170
+#: ../plugins/save-calendar/save-calendar.c:180
 msgid "Select destination file"
 msgstr "Sihtfaili valimine"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"Selle failitüübi (%s) jaoks soovitatud failinime laiendit pole kasutatud. "
-"Kas sa soovid jätkata?"
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr ""
@@ -16555,7 +16949,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17282,6 +17676,11 @@ msgstr "Valiku kopeerimine"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Lõika"
+
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Valiku lõikamine"
@@ -17290,6 +17689,10 @@ msgstr "Valiku lõikamine"
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Forward Contact"
+msgstr "Edasta kontakt"
+
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Tõsta valitud kontaktid teise kausta..."
@@ -17298,6 +17701,11 @@ msgstr "Tõsta valitud kontaktid teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Aseta"
+
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Lõikepuhvri asetamine"
@@ -17359,10 +17767,6 @@ msgstr "_Tegevused"
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr "_Salvesta VKaardina"
-
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "Vali _kõik"
@@ -17491,30 +17895,215 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Ava sündmus"
 
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "Lõ_ika"
-
-#: ../ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "Lõika valitud tekst lõikelauale"
 
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
 
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Vali kogu tekst"
 
+#: ../ui/evolution-editor.xml.h:2
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "<kausta valimiseks kliki siia>"
+
+#: ../ui/evolution-editor.xml.h:3
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "Sulge fail"
+
+#: ../ui/evolution-editor.xml.h:4
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "Sulge fail"
+
+#: ../ui/evolution-editor.xml.h:5
+#, fuzzy
+msgid "Click here to view help availabe"
+msgstr "<kuupäeva valimiseks kliki siia>"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. 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-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:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:42 ../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-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
+msgid "_File"
+msgstr "_Fail"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:38
+msgid "_Help"
+msgstr "_Abi"
+
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+msgid "_Insert"
+msgstr "_Lisa"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "_Valikud"
+
+#: ../ui/evolution-event-editor.xml.h:2
+#, fuzzy
+msgid "All day Event"
+msgstr "Kestab kogu _päeva"
+
+#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr "Salajaseks liigitamine"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr "Isiklikuks liigitamine"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr "Avalikuks liigitamine"
+
+#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "Kasutaja katkestas toimingu."
+
+#: ../ui/evolution-event-editor.xml.h:8
+#, 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
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Avalik"
+
+#: ../ui/evolution-event-editor.xml.h:10
+#, 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
+#, 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
+#, fuzzy
+msgid "Show Time _Zone"
+msgstr "Aja_vöönd:"
+
+#: ../ui/evolution-event-editor.xml.h:15
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "_Alarms"
+msgstr "_Alarmid"
+
+#: ../ui/evolution-event-editor.xml.h:25
+#, fuzzy
+msgid "_All day Event"
+msgstr "Kestab kogu _päeva"
+
+#: ../ui/evolution-event-editor.xml.h:27 ../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
+msgid "_Confidential"
+msgstr "_Salajane"
+
+#: ../ui/evolution-event-editor.xml.h:29 ../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
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../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
+#, 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"
@@ -18110,17 +18699,6 @@ msgstr "_Lugemata"
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Sulge"
-
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Akna sulgemine"
@@ -18129,17 +18707,45 @@ msgstr "Akna sulgemine"
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "Sul_ge"
+#: ../ui/evolution-memos.xml.h:3
+#, fuzzy
+msgid "Copy selected memo"
+msgstr "Kopeerib valitud ülesande"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Fail"
+#: ../ui/evolution-memos.xml.h:5
+#, fuzzy
+msgid "Cut selected memo"
+msgstr "Lõikab valitud ülesande"
+
+#: ../ui/evolution-memos.xml.h:7
+#, fuzzy
+msgid "Delete selected memos"
+msgstr "Kustutab valitud ülesanded"
+
+#: ../ui/evolution-memos.xml.h:9
+#, fuzzy
+msgid "Paste memo from the clipboard"
+msgstr "Teksti asetamine lõikepuhvrist"
+
+#: ../ui/evolution-memos.xml.h:10
+#, fuzzy
+msgid "Previews the list of memos to be printed"
+msgstr "Trükitavate kontaktide eelvaatlemine"
+
+#: ../ui/evolution-memos.xml.h:13
+#, fuzzy
+msgid "Print the list of memos"
+msgstr "Ülesannete nimekirja printimine"
+
+#: ../ui/evolution-memos.xml.h:14
+#, fuzzy
+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"
@@ -18305,11 +18911,6 @@ msgstr "_Kustuta kõik"
 msgid "_From Field"
 msgstr "_Kellelt (From) väli"
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Lisa"
-
 #: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Ava..."
@@ -18381,6 +18982,22 @@ msgstr "Lõpeta tellimus"
 msgid "_Invert Selection"
 msgstr "_Inverdi valik"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Status Details"
+msgstr "Oleku üksikasjad"
+
+#: ../ui/evolution-task-editor.xml.h:11
+msgid "Time Zone"
+msgstr "Ajavöönd"
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Status Details"
+msgstr "_Oleku üksikasjad"
+
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopeerib valitud ülesande"
@@ -18554,10 +19171,6 @@ msgstr "_Evolutionist lähemalt..."
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: ../ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "_Abi"
-
 #: ../ui/evolution.xml.h:39
 msgid "_Hide buttons"
 msgstr "_Peida nupud"
@@ -18662,6 +19275,11 @@ msgstr "_Jälgimise sildi järgi"
 msgid "_Messages"
 msgstr "_Sõnumid"
 
+#: ../views/memos/galview.xml.h:1
+#, fuzzy
+msgid "_Memos"
+msgstr "_Liikmed"
+
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "_Tähtajaga"
@@ -18870,7 +19488,7 @@ msgstr "Vähim laius"
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:453
 msgid "Now"
 msgstr "Praegu"
 
@@ -18983,19 +19601,19 @@ msgstr "Tekstiväli kuupäeva sisestamiseks"
 msgid "Text Date Entry"
 msgstr "Tekstiline kuupäeva väli"
 
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Click this button to show a calendar"
 msgstr "Kalendri näitamiseks klõpsa sellel nupul"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:355
 msgid "Date Button"
 msgstr "Kuupäeva nupp"
 
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:376
 msgid "Combo box to select time"
 msgstr "Valikukast aja valimiseks"
 
-#: ../widgets/misc/e-dateedit.c:375
+#: ../widgets/misc/e-dateedit.c:377
 msgid "Time Combo Box"
 msgstr "Aja valikukast"
 
@@ -19094,7 +19712,7 @@ msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
-msgstr "Privaatkirjete sünkroniseerimine"
+msgstr "Isiklike kirjete sünkroniseerimine"
 
 #: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
@@ -19227,7 +19845,7 @@ msgid ""
 "Confidential\n"
 msgstr ""
 "Avalik\n"
-"Privaatne\n"
+"Isiklik\n"
 "Salajane\n"
 
 #: ../widgets/misc/e-send-options.glade.h:16
@@ -19851,6 +20469,43 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "description of appointment"
+#~ msgstr "sündmuse kirjeldus"
+
+#~ msgid "Schedulin_g"
+#~ msgstr "_Plaanimine"
+
+#~ msgid "In_vitations"
+#~ msgstr "_Kutsed"
+
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>Sisu</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Kuupäev ja kellaaeg</b>"
+
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>Saatmise valikud</b>"
+
+#~ msgid "Ala_rm"
+#~ msgstr "Ala_rmid"
+
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "Sellel sündmusel on kohandatud alarmid"
+
+#~ msgid "Task Description"
+#~ msgstr "Ülesande kirjeldus"
+
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Koosolekud ja ülesanded"
+
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ msgstr ""
+#~ "Selle failitüübi (%s) jaoks soovitatud failinime laiendit pole kasutatud. "
+#~ "Kas sa soovid jätkata?"
+
 #~ msgid "Discard Changes"
 #~ msgstr "Loobu muudatustest"