Translation updated.

2004-06-17 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated. svn path=/trunk/; revision=26395
author: Priit Laes <plaes@cvs.gnome.org> 2004-06-18 01:38:40 +0800
committer: Priit Laes <plaes@src.gnome.org> 2004-06-18 01:38:40 +0800
commit: 1b87871a4066e6235619ba3118e16a7342aafba8 (patch)
tree: 2e4f4ca7929e746d5581d432a3c6a0deb1acb805 /po
parent: 49dd7403b966b12dee5e062a0a016708b12f32d9 (diff)
download: gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.tar.gz
gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.tar.zst
gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.zip
2 files changed, 1854 insertions, 2301 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 1894edea3b..1378c148b9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-17  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
 2004-06-17  Metin Amiroff  <metin@karegen.com>
 
 	* az.po: Translation updated by Mətin Əmirov.
diff --git a/po/et.po b/po/et.po
index ade432075b..3c31592a99 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution pre-2.0\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
-"PO-Revision-Date: 2004-05-22 11:02+0300\n"
+"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"PO-Revision-Date: 2004-06-17 16:28+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -56,13 +56,13 @@ msgstr " kaart"
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1155
+#: addressbook/conduit/address-conduit.c:1156
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1224
+#: addressbook/conduit/address-conduit.c:1227
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
@@ -122,12 +122,14 @@ msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+#: calendar/gui/migration.c:137
+#: mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#: calendar/gui/migration.c:184
+#: mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -141,10 +143,14 @@ msgstr "Siirdamine `%s':"
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:489
+#: calendar/gui/migration.c:446
+#: calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:195
+#: mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:246
+#: mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -155,41 +161,45 @@ msgstr "Kohalik arvuti"
 #  Create the default Person task list
 #  orange
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: calendar/gui/migration.c:454
+#: calendar/gui/migration.c:536
+#: filter/filter-label.c:123
+#: mail/em-migrate.c:1013
+#: mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Isiklik"
 
 #  Create the LDAP source group
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -199,7 +209,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -209,7 +219,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -226,17 +236,22 @@ msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
 #: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: calendar/gui/calendar-component.c:430
+#: calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
 #: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+#: calendar/gui/calendar-component.c:431
+#: calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Omadused..."
 
@@ -264,11 +279,8 @@ msgid "Position of the vertical pane in main view"
 msgstr "Vertikaalpaani asukoht põhivaates"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid ""
-"The number of characters that must be typed before evolution will attempt to "
-"autocomplete"
-msgstr ""
-"Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+msgid "The number of characters that must be typed before evolution will attempt to autocomplete"
+msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
@@ -351,9 +363,10 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1
+#: mail/mail-config.glade.h:3
+#: mail/mail-search.glade.h:1
+#: mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -413,7 +426,8 @@ msgstr "Lisa kontaktide grupp"
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alati"
@@ -423,12 +437,13 @@ msgid "Anonymously"
 msgstr "Anonüümselt"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Peamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: calendar/gui/dialogs/task-editor.c:208
+#: mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Täpsustused"
@@ -448,10 +463,8 @@ msgstr "E-posti aadress:"
 # !PARANDA! - sõnasus on kuidagi mäda
 #: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
@@ -459,11 +472,13 @@ msgstr "Leia võimalikud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mitte kunagi"
@@ -475,7 +490,7 @@ msgstr ""
 #: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Search _base:"
-msgstr "Otsingu baas:"
+msgstr "_Otsingu baas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
@@ -491,38 +506,25 @@ msgstr "Otsingu ulatus:"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 #, fuzzy
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
 msgstr ""
-"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
-"siis\n"
+"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult siis\n"
 "kui LDAP server toetab SSL või TLS protokolli."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
-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 "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
-msgstr ""
-"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
-"ainult siis kui sa oled\n"
-"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad "
-"mõlemad tulemüüri taga,\n"
+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 are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
+msgstr ""
+"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled\n"
+"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüri taga,\n"
 "siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus\n"
 "on juba turvaline."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
-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 "
-"vulnerable to security exploits. "
+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 vulnerable to security exploits. "
 msgstr ""
-"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. "
-"Seega\n"
+"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. Seega\n"
 "on sinu ühendus ebaturvaline ja sa võid olla turvaaukude\n"
 "tõttu ohus."
 
@@ -535,54 +537,32 @@ msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
 #: 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."
+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: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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+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 your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+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:39
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+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: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 "
-"server."
-msgstr ""
-"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
-"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
-"toetama anonüümset ligipääsu."
+msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
 
 #: addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+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:42
 #, fuzzy
-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 "
-"port you should specify."
+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 port you should specify."
 msgstr ""
 "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. \n"
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
@@ -600,7 +580,8 @@ msgstr "Eraldusnime (DN) kasutamine"
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46
+#: mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
@@ -629,10 +610,11 @@ msgstr "_Sisselogimismeetod"
 #: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "_Log in:"
-msgstr "Kasutajanimi"
+msgstr "Logi sellest hoolimata sisse"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+#: mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -643,7 +625,7 @@ msgstr "_Port:"
 #: addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
 msgid "_Search scope:"
-msgstr "Otsingu ulatus:"
+msgstr "Otsingu ulatus"
 
 #: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
@@ -652,7 +634,7 @@ msgstr "_Server:"
 #: addressbook/gui/component/ldap-config.glade.h:57
 #, fuzzy
 msgid "_Timeout:"
-msgstr "Taimaut:"
+msgstr "ajaületus"
 
 #: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
@@ -664,7 +646,8 @@ msgstr "kaardid"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutit"
@@ -787,8 +770,7 @@ msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -823,7 +805,7 @@ msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -881,9 +863,8 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "Office:"
-msgstr "Kontor"
+msgstr "Kontor:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
@@ -898,9 +879,8 @@ msgid "Profession:"
 msgstr "Amet:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
 msgid "Spouse:"
-msgstr "Abikaasa"
+msgstr "Abikaasa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
@@ -911,8 +891,9 @@ msgid "Title:"
 msgstr "Pealkiri:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#, fuzzy
 msgid "Video Chat:"
-msgstr ""
+msgstr "Abi jututuba"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
@@ -921,14 +902,16 @@ msgstr "Soovib saada _HTML sõnumeid"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
 msgid "Web Log:"
-msgstr "Veebilehekülg:"
+msgstr "Logi välja"
 
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: filter/filter-label.c:122
+#: mail/em-migrate.c:1012
+#: mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Töö"
@@ -946,7 +929,7 @@ msgid "_File under:"
 msgstr "_Salvesta kui:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Kus:"
 
@@ -967,8 +950,8 @@ msgstr ""
 "kustutada seda kontakti?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Aadress"
 
@@ -976,7 +959,7 @@ msgstr "Aadress"
 #: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -1956,31 +1939,28 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "GroupWise"
 msgstr "Groupwise"
 
@@ -2014,48 +1994,43 @@ msgstr "Muudetavad väljad"
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2356
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
 #  Create the selector
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#  Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Kustuta valitud kontaktid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2437
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2640
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Otsimisvahemik ei ole sobiv."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2668
 msgid "Invalid contact."
-msgstr "Vigane allkiri"
+msgstr "Vigane kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"The contact cannot be saved to the selected address book. Do you want to "
-"discard changes?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+msgid "The contact cannot be saved to the selected address book. Do you want to discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#: addressbook/gui/contact-editor/e-contact-editor.c:2731
+#: addressbook/gui/contact-editor/e-contact-editor.c:2755
 msgid "_Discard"
 msgstr "_Unusta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+msgid "You are moving the contact from one address book to another, but it cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2072,7 +2047,7 @@ msgstr "Teenus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
 #: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Asukoht"
 
@@ -2219,27 +2194,49 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#, fuzzy
+msgid "Add an email to the List"
+msgstr "Lisa kataloog nimistusse"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Kontaktide valimine aadressiraamatust"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Liikmed"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Kustutab valitud proxy erandi aadressi nimekirjast."
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "Vali"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sellesse listi kirja saatmisel"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Loetelu nimi:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Kirjuta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "kontaktide-nimekirja-redaktor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2248,20 +2245,20 @@ msgstr "kontaktide-nimekirja-redaktor"
 msgid "Book"
 msgstr "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "On uus nimekiri"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Vajalikud osalejad"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Salvesta nimekiri VKaardina"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Muudetud kontakt:"
@@ -2300,7 +2297,7 @@ msgstr ""
 "antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
@@ -2316,80 +2313,75 @@ msgid "map"
 msgstr "kaart"
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:345
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Ametikoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "work"
 msgstr "töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "isiklik"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
+#: addressbook/gui/widgets/eab-contact-display.c:375
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Märkus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
+#: addressbook/gui/widgets/eab-contact-display.c:545
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Kodulehekülg"
 
@@ -2402,8 +2394,8 @@ msgstr "Õnnestus"
 #  E_BOOK_ERROR_BUSY
 #  E_BOOK_ERROR_INVALID_ARG
 #  E_BOOK_ERROR_BUSY
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
+#  E_BOOK_ERROR_INVALID_ARG
+#  E_BOOK_ERROR_BUSY
 #: addressbook/gui/widgets/eab-gui-util.c:50
 #, fuzzy
 msgid "Backend busy"
@@ -2420,7 +2412,7 @@ msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei eksisteeri"
 
 #  E_BOOK_ERROR_NO_SELF_CONTACT
-#. E_BOOK_ERROR_NO_SELF_CONTACT
+#  E_BOOK_ERROR_NO_SELF_CONTACT
 #: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
@@ -2452,10 +2444,14 @@ msgstr "Mitte toetatud protokoll"
 #: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
+#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/print.c:2349
+#: camel/camel-service.c:728
+#: camel/camel-service.c:766
+#: camel/camel-service.c:850
+#: camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
@@ -2499,39 +2495,21 @@ msgid "Other error"
 msgstr "Muu viga"
 
 #: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja "
-"kas sul on sellele vajalikud ligipääsuõigused."
+msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
+msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
 
 #: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase "
-"URI või kasutatav LDAP serverei ole kättesaadav."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
 
 #: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid "
-"Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku "
-"kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
 
 #: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid "
-"vale URI või kasutatav serverei ole kättesaadav."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
 
 #: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
@@ -2697,14 +2675,9 @@ msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ei sisalda"
-msgstr[1] "ei sisalda"
-
 #: addressbook/gui/widgets/eab-vcard-control.c:223
 #: addressbook/gui/widgets/eab-vcard-control.c:273
+#, c-format
 msgid "Show Full VCard"
 msgstr "Kogu VKaardi kuvamine"
 
@@ -2721,17 +2694,12 @@ msgid "No contacts"
 msgstr "Kontakte pole"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Kontakte pole"
-msgstr[1] "Kontakte pole"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#, c-format
 msgid "Query"
 msgstr "Päring"
 
@@ -2774,103 +2742,111 @@ msgstr "Edasijõudnutele..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:535
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
+#: addressbook/gui/widgets/e-addressbook-view.c:2107
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1093
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1096
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1101
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: addressbook/gui/widgets/e-addressbook-view.c:1102
+#: calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1109
 msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: calendar/gui/calendar-component.c:428
+#: calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Käesolev vaade"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1692
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Suvaline kategooria"
@@ -2904,6 +2880,8 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
 msgid "Categories"
 msgstr "Kategooriad"
 
@@ -3089,18 +3067,18 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 #, fuzzy
 msgid "Reflow Test"
 msgstr "Html test"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autoriõigus (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3351,8 +3329,7 @@ msgid "Export in asynchronous mode "
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3360,8 +3337,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3389,12 +3365,12 @@ msgstr "Faili ei saa avada"
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
 msgid "Couldn't get list of addressbooks"
-msgstr "Aadressiraamatut ei õnnestunud laadida"
+msgstr "ei õnnestu lugeda alglaadimise aega"
 
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:71
 #, fuzzy
 msgid "failed to open book"
-msgstr "Aadressiraamatu avamine ebaõnnestus"
+msgstr "Faili '%s' avamine ebaõnnestus: %s"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3412,27 +3388,28 @@ msgstr "Failinime ei esitatud."
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44
+#: calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/calendar/calendar-conduit.c:1330
 #: calendar/conduits/todo/todo-conduit.c:849
 msgid "Could not start wombat server"
 msgstr "Ei saa käivitada wombat serverit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/calendar/calendar-conduit.c:1331
 #: calendar/conduits/todo/todo-conduit.c:850
 msgid "Could not start wombat"
 msgstr "EI saa käivitada wombatit"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
@@ -3522,8 +3499,7 @@ msgstr ""
 #: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3689,9 +3665,10 @@ msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/calendar-commands.c:117
+#: calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3699,13 +3676,9 @@ msgstr "Kalender"
 
 #: calendar/gui/calendar-commands.c:352
 #, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
-"enam võimalik taastada.\n"
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
@@ -3716,40 +3689,57 @@ msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
+#: filter/filter.glade.h:15
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
-#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
+#: calendar/gui/calendar-commands.c:437
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514
+#: calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
-#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
+#: calendar/gui/calendar-commands.c:461
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473
+#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528
+#: calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541
+#: calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
+#: calendar/gui/calendar-commands.c:465
+#: calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337
+#: calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3777,9 +3767,7 @@ msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
+msgid "Selected calendar is read-only, events cannot be created. Please select a read-write calendar."
 msgstr ""
 
 #: calendar/gui/calendar-component.c:1071
@@ -3877,7 +3865,8 @@ msgstr "Kommentaar sisaldab"
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362
+#: camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -3954,20 +3943,17 @@ msgstr "Saaja"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-page.c:802
+#: calendar/gui/dialogs/alarm-page.c:815
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -3986,11 +3972,13 @@ msgstr "Põhilised asjad"
 msgid "Date/Time:"
 msgstr "Kuupäev ja kell:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Mängi heli"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/e-alarm-list.c:448
 #, fuzzy
 msgid "Pop up an alert"
 msgstr "GenericName=Meilide teadustaja"
@@ -3999,18 +3987,21 @@ msgstr "GenericName=Meilide teadustaja"
 msgid "Reminders"
 msgstr "Meeldetuletajad"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Käivita programm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:932
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -4069,9 +4060,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+msgid "The group '%s' is remote. You must specify a location to get the calendar from"
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
@@ -4086,7 +4075,8 @@ msgstr "Ülesannetegrupi lisamine"
 msgid "C_olor:"
 msgstr "_Värv:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#: mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vali värvus"
 
@@ -4110,7 +4100,8 @@ msgstr "_Tüüp:"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
 
@@ -4120,8 +4111,10 @@ msgstr "nädalat"
 #  has "activatable" set.
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567
+#: mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677
+#: mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -4135,18 +4128,24 @@ msgstr "Ära eemalda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596
+#: mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Keela"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596
+#: mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Luba"
@@ -4232,7 +4231,7 @@ msgid "Free/Busy Publishing"
 msgstr "Vaba/Hõivatud info avalikustamine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1076
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Reede"
@@ -4246,7 +4245,7 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1072
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Esmaspäev"
@@ -4256,7 +4255,7 @@ msgid "S_un"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1077
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laupäev"
@@ -4270,7 +4269,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1078
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Pühapäev"
@@ -4284,7 +4283,7 @@ msgid "T_hu"
 msgstr "_N"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1075
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Neljapäev"
@@ -4298,7 +4297,7 @@ msgid "Time format:"
 msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1073
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Teisipäev"
@@ -4308,7 +4307,7 @@ msgid "W_eek starts:"
 msgstr "_Nädala algus:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1074
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Kolmapäev"
@@ -4341,12 +4340,17 @@ msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 msgid "_Day begins:"
 msgstr "_Päev algab:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: filter/filter.glade.h:12
+#: mail/mail-config.glade.h:162
+#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:12
+#: ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:22
 msgid "_Edit"
 msgstr "_Redaktor"
@@ -4406,8 +4410,7 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
 #: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
@@ -4429,85 +4432,89 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
-"redaktorit?"
+msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
 
 #: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor.c:429
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:937
 msgid "Edit Appointment"
 msgstr "Muuda kokkusaamist"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:905
+#: calendar/gui/dialogs/comp-editor.c:942
 #, c-format
 msgid "Appointment - %s"
 msgstr "Kokkusaamine - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:922
+#: calendar/gui/dialogs/comp-editor.c:958
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
+#: calendar/gui/dialogs/comp-editor.c:1398
+#: calendar/gui/e-calendar-table.c:1172
+#: calendar/gui/e-calendar-view.c:1053
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1501
+#: calendar/gui/dialogs/comp-editor.c:1536
+#: calendar/gui/dialogs/comp-editor.c:1562
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1586
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni ei saa kasutada!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187
+#: calendar/gui/print.c:2258
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191
+#: calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193
+#: calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198
+#: calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200
+#: calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Tähtaeg "
 
@@ -4583,55 +4590,58 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:216
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:223
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:230
+#: calendar/gui/dialogs/event-editor.c:303
+#: calendar/gui/dialogs/event-editor.c:447
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:306
+#: calendar/gui/dialogs/event-editor.c:450
+#: ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Koosolek"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:490
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:493
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:649
+#: calendar/gui/dialogs/task-page.c:516
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:659
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:682
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:689
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1296
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' ei saa avada."
@@ -4699,43 +4709,61 @@ msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/e-cal-model-tasks.c:647
+#: calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928
+#: mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: widgets/misc/e-cell-date-edit.c:257
+#: widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:428
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:677
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
 #  FIXME: need to disable for undeletable folders
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: calendar/gui/dialogs/meeting-page.c:681
+#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2584
+#: mail/em-folder-view.c:919
+#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -4776,15 +4804,17 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
@@ -4795,7 +4825,7 @@ msgstr "Lisa _osavõtja"
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
 msgid "Add attendees from addressbook."
-msgstr "Lisa saatja _aadressiraamatusse"
+msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
@@ -4851,8 +4881,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4875,51 +4904,51 @@ msgstr "Kõik juhtumid"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See kokkusaamine sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:844
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:955
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:1016
 msgid "first"
 msgstr "esimene"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:1017
 msgid "second"
 msgstr "teine"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:1018
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "neljas"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:1020
 msgid "last"
 msgstr "viimane"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1071
 msgid "day"
 msgstr "päev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1394
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2364
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
@@ -4984,16 +5013,16 @@ msgstr "nädal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:77
 #, fuzzy
 msgid "Select destination"
 msgstr "Vali sihtkoht %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:98
 msgid "_Destination"
 msgstr "_Sihtkoht"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:100
 msgid "Task List"
 msgstr "Ülesannete nimekiri"
 
@@ -5006,45 +5035,58 @@ msgstr "Lõpetamise kuupäev on vale"
 msgid "% _Complete"
 msgstr "(%) _valmis"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
+#: calendar/gui/e-calendar-table.c:374
+#: mail/message-list.c:960
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:376
+#: mail/message-list.c:958
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-cal-model.c:909
 #: mail/message-list.c:959
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -5073,17 +5115,17 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "_Kodulehekülg:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:215
+#: calendar/gui/dialogs/task-editor.c:278
+#: calendar/gui/dialogs/task-editor.c:415
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:489
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:826
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ei saa avada mooduli faili \"%s\"."
@@ -5094,8 +5136,10 @@ msgstr "_Salajane"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5163,41 +5207,12 @@ msgid "Weekly"
 msgstr "Iganädalane"
 
 #: calendar/gui/e-alarm-list.c:395
-#, fuzzy, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d mustandid"
-msgstr[1] "%d mustandid"
-
 #: calendar/gui/e-alarm-list.c:400
-#, fuzzy, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "nädalat"
-msgstr[1] "nädalat"
-
 #: calendar/gui/e-alarm-list.c:405
-#, fuzzy, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "_24 tunnine"
-msgstr[1] "_24 tunnine"
-
 #: calendar/gui/e-alarm-list.c:410
-#, fuzzy, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "minutit"
-msgstr[1] "minutit"
-
 #: calendar/gui/e-alarm-list.c:415
-#, fuzzy, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "teine"
-msgstr[1] "teine"
-
 #: calendar/gui/e-alarm-list.c:462
+#, c-format
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
@@ -5241,12 +5256,14 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71
+#: mail/em-folder-view.c:2350
 #, c-format
 msgid "Click to open %s"
 msgstr "Avamiseks kliki %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:156
+#: filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Nimetu"
 
@@ -5261,7 +5278,7 @@ msgstr "Tähtaeg:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Olek:"
 
@@ -5273,17 +5290,21 @@ msgstr "Tähtsus:"
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321
+#: calendar/gui/e-cal-model.c:328
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-cal-list-view.c:258
 #: calendar/gui/e-cal-model.c:330
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-cal-list-view.c:259
 #: calendar/gui/e-cal-model.c:332
 msgid "Confidential"
 msgstr "Salajane"
@@ -5332,95 +5353,125 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-cal-model-calendar.c:163
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
+#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680
+#: calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843
+#: calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019
+#: calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:894
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Ava veebilehekülg"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021
+#: calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341
+#: calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:896
+#: mail/em-popup.c:691
+#: mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319
+#: calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424
+#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1390
+#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:960
+#: mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-table.c:1028
+#: calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323
+#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422
+#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#: calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
 
@@ -5429,125 +5480,154 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5
+#: camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270
+#: mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Lõpetatud"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Lõpetamise kuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Alguskuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "märgitud elemendid:"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "märgitud elemendid:"
+
+#: calendar/gui/e-calendar-view.c:1312
+#: calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315
+#: calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329
+#: ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334
+#: ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "_Liiguta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361
+#: calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428
+#: ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Sätted..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-cal-model.c:334
+#: calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:1175
 #: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: calendar/gui/e-meeting-list-view.c:136
+#: calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150
+#: calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705
+#: camel/camel-gpg-context.c:1756
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1173
+#: camel/providers/imap4/camel-imap4-utils.c:293
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: mail/em-utils.c:1115
+#: shell/e-component-registry.c:186
+#: shell/e-component-registry.c:190
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -5560,14 +5640,19 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+#: calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:146
+#: calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169
+#: calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:147
+#: calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
@@ -5579,7 +5664,8 @@ msgstr "Põ"
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+#: calendar/gui/e-cal-model-tasks.c:304
+#: smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ida"
 
@@ -5598,13 +5684,23 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: calendar/gui/e-cell-date-edit-text.c:117
+#: e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: calendar/gui/e-cell-date-edit-text.c:120
+#: e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -5621,27 +5717,39 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:817
+#: calendar/gui/e-week-view.c:573
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:820
+#: calendar/gui/e-week-view.c:576
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pl"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-week-view-main-item.c:320
+#: calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
@@ -5656,27 +5764,10 @@ msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
 #: calendar/gui/e-itip-control.c:596
-#, fuzzy, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "Vahemikuga"
-msgstr[1] "Vahemikuga"
-
 #: calendar/gui/e-itip-control.c:601
-#, fuzzy, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "Iga kord"
-msgstr[1] "Iga kord"
-
 #: calendar/gui/e-itip-control.c:603
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] ""
-msgstr[1] ""
-
 #: calendar/gui/e-itip-control.c:611
+#, c-format
 msgid " and "
 msgstr " ja "
 
@@ -5691,371 +5782,364 @@ msgid "The %s %s of "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:638
-#, fuzzy, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "Kord kuus"
-msgstr[1] "Kord kuus"
-
 #: calendar/gui/e-itip-control.c:642
-#, fuzzy, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "Iga kord"
-msgstr[1] "Iga kord"
-
 #: calendar/gui/e-itip-control.c:653
-#, c-format
-msgid "a total of %d time"
-msgid_plural " a total of %d times"
-msgstr[0] ""
-msgstr[1] ""
-
 #: calendar/gui/e-itip-control.c:662
+#, c-format
 msgid ", ending on "
 msgstr ", lõpeb"
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Algus:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Lõpp: </b>"
+msgid "Starts"
+msgstr "Algab"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Lõpetatud:</b>"
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr "Lõpeb"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Tähtaeg:</b>"
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
+msgstr "Tähtaeg"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862
+#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
-"tegevus."
-
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Puudub</i>"
+#: calendar/gui/e-itip-control.c:913
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179
+#: calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Vastu võetud"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965
+#: calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181
+#: calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030
+#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1141
+#: widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Nõustu"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 #, fuzzy
 msgid "Update respondent status"
 msgstr "GGV juhtimise staatus"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410
+#: mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "Märgi kiri &saadetud kirjaks"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud info."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud infot."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1805
+#: calendar/gui/e-itip-control.c:1877
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
+msgstr "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1821
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1831
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1843
 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:1849
+#: calendar/gui/e-itip-control.c:1862
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1865
 msgid "Object could not be found\n"
 msgstr "Objekti ei suudetud leida\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1868
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Sul pole õigusi kalendri muutmiseks\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1871
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1874
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1905
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1928
+#: calendar/gui/e-itip-control.c:1976
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1930
+#: calendar/gui/e-itip-control.c:1980
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -6100,11 +6184,6 @@ msgstr "alguskuup."
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Vajalikud osalejad"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Võimalikud osalejad"
@@ -6113,156 +6192,185 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:118
+#: calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107
+#: calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119
+#: calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120
+#: calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121
+#: calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132
+#: calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:133
+#: calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144
+#: calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134
+#: calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135
+#: calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:157
+#: calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200
+#: calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:160
+#: calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206
+#: calendar/gui/e-meeting-time-sel.c:400
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161
+#: calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:189
+#: calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Töös"
 
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:402
+#: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:403
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:419
 #, fuzzy
 msgid "Add attendees from addressbook"
-msgstr "Lisa saatja _aadressiraamatusse"
+msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:442
 msgid "_Options"
 msgstr "_Häälestus"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööpäeva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:469
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Näita _suures plaanis"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:484
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:532
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:549
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:558
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:567
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:576
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:593
+#: calendar/gui/e-meeting-time-sel.c:595
 msgid "Meeting _start time:"
 msgstr "Koosoleku _algus:"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "Meeting _end time:"
 msgstr "Koosoleku l_õpp:"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel.c:2077
 #: calendar/gui/e-meeting-time-sel-item.c:452
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2110
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296
+#: e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: calendar/gui/e-meeting-time-sel-item.c:460
+#: e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299
+#: widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -6271,7 +6379,8 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709
+#: calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6280,61 +6389,60 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Ülesannete laadimine"
+
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:845
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr "Tõrge faili %s avamisel!"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Ülesannete laadimine"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: calendar/gui/e-tasks.c:1075
+#: calendar/gui/e-tasks.c:1088
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884
+#: calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
+msgstr "Päringu uuendamine"
+
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Austria (de_AT)"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -6452,7 +6560,8 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:271
+#: calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema määrtud."
@@ -6461,19 +6570,23 @@ msgstr "Organiseerija peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:394
+#: calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:396
+#: calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Päevaraamatu informatsioon"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:400
+#: calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
@@ -6509,26 +6622,22 @@ msgstr "Sa pead ise olema sündmusest osavõtja."
 #: calendar/gui/migration.c:146
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #: calendar/gui/migration.c:150
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -6538,12 +6647,14 @@ msgstr "Sünnipäevad ja tähtpäevad"
 
 #  Create the Webcal source group
 #. Create the Webcal source group
-#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+#: calendar/gui/migration.c:462
+#: calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr "Veebis"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+#: calendar/gui/migration.c:708
+#: calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6719,7 +6830,8 @@ msgstr "L"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1939
+#: calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
@@ -6727,7 +6839,8 @@ msgstr "%a, %d. %b"
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
@@ -6780,8 +6893,10 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737
+#: mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
@@ -6803,21 +6918,10 @@ msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/tasks-component.c:408
-#, fuzzy, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d kokku"
-msgstr[1] "%d kokku"
-
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
-#, fuzzy, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "%d kustutatud"
-msgstr[1] "%d kustutatud"
-
+#: calendar/gui/tasks-component.c:410
+#: mail/mail-component.c:508
 #: calendar/gui/tasks-component.c:457
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failed upgrading tasks."
 msgstr "Kalender ja ülesanded"
 
@@ -6831,9 +6935,7 @@ msgid "There is no calendar available for creating tasks"
 msgstr ""
 
 #: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
+msgid "Selected task list is read-only, events cannot be created. Please select a read-write calendar."
 msgstr ""
 
 #: calendar/gui/tasks-component.c:1040
@@ -6862,13 +6964,11 @@ msgstr "Loo uus kontaktide grupp"
 
 #: calendar/gui/tasks-control.c:367
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui "
-"lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
+"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
 #: calendar/gui/tasks-control.c:370
@@ -8536,69 +8636,76 @@ msgstr "kirjete ettevalmistamine võrdlemiseks"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713
+#: camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Haldurilt saadi veateade:</p><p>%1</p>"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945
+#: camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043
+#: camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052
+#: camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole võimalik avada"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole võimalik töödelda"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Võetakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148
+#: camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174
+#: camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Tõmban %d. sõnumit %dst"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
@@ -8614,10 +8721,10 @@ msgstr ""
 #: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
-msgstr ""
-"<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
+msgstr "<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
 
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:670
+#: camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga otsingu avaldises."
@@ -8659,7 +8766,8 @@ msgstr "Sõnum on rämps"
 msgid "Filtering new message(s)"
 msgstr "Uute sõnumite filtreerimine"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:355
+#: camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8668,14 +8776,16 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:365
+#: camel/camel-folder-search.c:486
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:672
+#: camel/camel-folder-search.c:705
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
@@ -8684,7 +8794,8 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:758
+#: camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
@@ -8703,7 +8814,7 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8714,15 +8825,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8732,29 +8843,33 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:791
+#: camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639
+#: camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329
+#: mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Salajase võtme avamine ebaõnnestus: sisestati 3 valet parooli."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ei saa krüptida sõnumit: saajate aadressid on määramata."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8762,65 +8877,76 @@ msgid ""
 "%s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262
+#: camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276
+#: camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300
+#: camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525
+#: camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726
+#: camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg käivitamine ebaõnnestus."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412
+#: camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732
 #: camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663
+#: camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock.c:92
+#: camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
@@ -8850,7 +8976,8 @@ msgstr "Ei suuda luua lukustamisabilise toru: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191
+#: camel/camel-lock-client.c:214
 #, fuzzy, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
@@ -8909,12 +9036,14 @@ msgstr "Viga faili lugemisel."
 msgid "Error writing mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465
+#: camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:229
+#: camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 
@@ -8922,7 +9051,8 @@ msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: vigane struktuur"
 
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:673
+#: camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "analüüsimisviga"
 
@@ -8952,7 +9082,8 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:356
+#: camel/camel-session.c:160
 #, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
@@ -8965,7 +9096,8 @@ msgstr "Anonüümne"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112
+#: camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus."
 
@@ -9001,24 +9133,16 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
-"kasutades turvalist CRAM-MD5 parooli."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist CRAM-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
-"kasutades turvalist DIGEST-MD5 parooli."
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist DIGEST-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9054,9 +9178,7 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -9064,27 +9186,19 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -9104,8 +9218,10 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:189
+#: camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274
+#: camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
 #: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
@@ -9142,7 +9258,8 @@ msgstr ""
 msgid "Login"
 msgstr "Kasutajanimi"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34
+#: camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
@@ -9156,9 +9273,7 @@ msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
 #, fuzzy
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-plain.c:32
@@ -9211,12 +9326,14 @@ msgstr "URL '%s' vajab kataloogitee osa"
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:764
+#: camel/camel-service.c:888
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:785
+#: camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hosti lahendamine ebaõnnestus: lõimu ei saa luua: %s"
@@ -9294,7 +9411,8 @@ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 msgid "Cannot add CMS SigningTime"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:325
+#: camel/camel-smime-context.c:337
 #, fuzzy, c-format
 msgid "Encryption cert for '%s' does not exist"
 msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
@@ -9328,7 +9446,8 @@ msgstr "Ei saa luua andmebaasikataloogi!"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:441
+#: camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Ei saa lugeda METAR andmeid.\n"
@@ -9386,7 +9505,8 @@ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:589
+#: camel/camel-smime-context.c:599
 #, fuzzy
 msgid "Cannot calculate digests"
 msgstr "faili ei õnnestu sulgeda"
@@ -9396,7 +9516,8 @@ msgstr "faili ei õnnestu sulgeda"
 msgid "Cannot set message digests"
 msgstr "Sõnumi tähtsuseks määratakse:"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Sertifikaadi importimine ebaõnnestus"
 
@@ -9508,12 +9629,14 @@ msgstr ""
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:389
+#: camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439
+#: camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
@@ -9522,7 +9645,8 @@ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: camel/camel-store.c:779
+#: mail/mail-config.glade.h:95
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
@@ -9658,7 +9782,8 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "&Funktsioon sooritatakse rakendusel:"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696
+#: camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9671,11 +9796,13 @@ msgstr ""
 "Sõrmejälg:       %s\n"
 "Allkiri:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "HEA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "HALB"
 
@@ -9701,7 +9828,7 @@ msgstr ""
 #  construct our user prompt
 #  construct our user prompt
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9716,7 +9843,7 @@ msgstr ""
 "\n"
 "Kas soovida vastu võtta?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9725,14 +9852,14 @@ msgstr ""
 "Probleem sertifikaadiga: %s\n"
 "Väljastaja: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9741,14 +9868,14 @@ msgstr ""
 "Sertifikaat on aegunud: %s\n"
 "Väljastaja: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifikaadi ID:"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL'i `%s' ei saa töödelda"
@@ -9763,7 +9890,8 @@ msgstr "Viga `%s' salvestamisel: %s"
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:841
+#: camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 
@@ -9798,9 +9926,7 @@ msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
-"sõnumitele "
+msgstr "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele sõnumitele "
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
@@ -9828,7 +9954,8 @@ msgstr ""
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:71
+#: mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parool"
 
@@ -9843,94 +9970,105 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
+#: camel/providers/imap4/camel-imap4-command.c:531
+#: camel/providers/imap4/camel-imap4-command.c:538
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "SMTP serverile saadetud QUIT käsk ei õnnestunud.\n"
+
+#: camel/providers/imap4/camel-imap4-command.c:637
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Ootamatu vastus IMAP serverilt %s: %s"
 
-#: camel/providers/imap4/camel-imap4-engine.c:415
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
 
-#: camel/providers/imap4/camel-imap4-engine.c:421
+#: camel/providers/imap4/camel-imap4-engine.c:422
 #, c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
 #, fuzzy, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "Ühendus serverisse suleti ootamatult"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1145
+#: camel/providers/imap4/camel-imap4-engine.c:998
 msgid "Got BYE response"
 msgstr "Saadi BYE vastus"
 
-#: camel/providers/imap4/camel-imap4-folder.c:335
+#: camel/providers/imap4/camel-imap4-folder.c:424
 #, fuzzy, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
 
-#: camel/providers/imap4/camel-imap4-folder.c:341
+#: camel/providers/imap4/camel-imap4-folder.c:430
 #, fuzzy, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-folder.c:476
+#: camel/providers/imap4/camel-imap4-folder.c:567
 #, fuzzy, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:481
+#: camel/providers/imap4/camel-imap4-folder.c:572
 #, fuzzy, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-folder.c:616
+#: camel/providers/imap4/camel-imap4-folder.c:748
 #, fuzzy, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:621
+#: camel/providers/imap4/camel-imap4-folder.c:753
 #, fuzzy, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-folder.c:746
+#: camel/providers/imap4/camel-imap4-folder.c:878
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
 
-#: camel/providers/imap4/camel-imap4-folder.c:775
+#: camel/providers/imap4/camel-imap4-folder.c:907
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-folder.c:854
+#: camel/providers/imap4/camel-imap4-folder.c:986
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
 
-#: camel/providers/imap4/camel-imap4-folder.c:858
+#: camel/providers/imap4/camel-imap4-folder.c:990
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
 
-#: camel/providers/imap4/camel-imap4-folder.c:866
+#: camel/providers/imap4/camel-imap4-folder.c:998
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-folder.c:870
+#: camel/providers/imap4/camel-imap4-folder.c:1002
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
@@ -9967,24 +10105,23 @@ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
 #, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
-#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap4/camel-imap4-store.c:173
 #: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap4/camel-imap4-store.c:175
 #: camel/providers/imap/camel-imap-store.c:430
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Teenu&sest võrgus teatamine"
 
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap4/camel-imap4-store.c:216
+#: camel/providers/imap4/camel-imap4-store.c:233
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
@@ -9996,14 +10133,14 @@ msgstr "Teenu&sest võrgus teatamine"
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap4/camel-imap4-store.c:218
 #: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL ei ole saadaval"
 
-#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap4/camel-imap4-store.c:230
 #: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
@@ -10013,121 +10150,133 @@ msgstr "SSL ei ole saadaval"
 msgid "Connection cancelled"
 msgstr "Ühendus katkestatud"
 
-#: camel/providers/imap4/camel-imap4-store.c:261
+#: camel/providers/imap4/camel-imap4-store.c:269
 #, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
+msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap4/camel-imap4-store.c:294
 #: camel/providers/imap/camel-imap-store.c:679
 #: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap4/camel-imap4-store.c:295
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
+#: camel/providers/pop3/camel-pop3-store.c:545
+#: shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: camel/providers/imap4/camel-imap4-store.c:373
+#: camel/providers/imap4/camel-imap4-store.c:381
 #, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:418
+#: camel/providers/imap4/camel-imap4-store.c:426
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:492
+#: camel/providers/imap4/camel-imap4-store.c:500
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:723
+#: camel/providers/imap4/camel-imap4-store.c:731
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
 
-#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap4/camel-imap4-store.c:793
 #: camel/providers/imap/camel-imap-store.c:1885
 #: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
 
-#: camel/providers/imap4/camel-imap4-store.c:826
+#: camel/providers/imap4/camel-imap4-store.c:837
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
 
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap4/camel-imap4-store.c:842
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:859
+#: camel/providers/imap4/camel-imap4-store.c:870
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
 
-#: camel/providers/imap4/camel-imap4-store.c:891
+#: camel/providers/imap4/camel-imap4-store.c:903
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
 
-#: camel/providers/imap4/camel-imap4-store.c:896
+#: camel/providers/imap4/camel-imap4-store.c:908
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap4/camel-imap4-store.c:928
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:960
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:965
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1171
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-store.c:1173
 msgid "Bad command"
 msgstr "Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1235
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1105
+#: camel/providers/imap4/camel-imap4-store.c:1240
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1285
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1154
+#: camel/providers/imap4/camel-imap4-store.c:1290
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-utils.c:85
+#: camel/providers/imap4/camel-imap4-utils.c:86
 #, fuzzy, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/imap4/camel-imap4-utils.c:108
+#: camel/providers/imap4/camel-imap4-utils.c:109
 msgid "No data"
 msgstr "Andmeid pole"
 
-#: camel/providers/imap4/camel-imap4-utils.c:291
+#: camel/providers/imap4/camel-imap4-utils.c:292
 #, fuzzy, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "Konto tüüp: lahutatud IMAP konto"
@@ -10244,8 +10393,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2660
@@ -10397,8 +10545,7 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Eksperimentaalne IMAP 4(.1) klient\n"
-"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist "
-"imap'i.\n"
+"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist imap'i.\n"
 "\n"
 " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
 
@@ -10456,9 +10603,7 @@ msgstr "Kohalik postijagaja"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
+msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
 msgstr "Kohalikku e-posti võetakse standardsest \"mbox\" vorminguga puhvrist"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -10488,9 +10633,7 @@ msgstr "Standardne Unix'i \"mbox\" puhver"
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr ""
-"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
-"puhverfailides"
+msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
@@ -10990,7 +11133,7 @@ msgstr "Sisemine viga: uid on vigases vormingus: %s"
 #: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
 msgid "Posting failed: %s"
-msgstr "Operatsioon ebaõnnestus: %s"
+msgstr "Useneti postitamine ebaõnnestus.  "
 
 #: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
@@ -11016,8 +11159,7 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näita kaustasid lühendatult (comp.os.linux asemel c.o.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11033,9 +11175,7 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:118
@@ -11103,12 +11243,12 @@ msgstr "Autentimine on vajalik"
 #: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "Autentimine LDAP serverile nurjus"
+msgstr "Ei saa serveriga ühendust"
 
 #: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
 msgid "Not connected."
-msgstr "Kontakte pole"
+msgstr "Ühendus puudub."
 
 #: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
@@ -11170,7 +11310,8 @@ msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 msgid "Retrieving POP message %d"
 msgstr "POP sõnumi %d vastuvõtt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: composer/e-msg-composer.c:1225
 #: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
@@ -11188,7 +11329,8 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr "Keela kõigi POP3 laienduste toetus"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:54
+#: mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11197,18 +11339,11 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "E-posti laetakse alla POP serverist"
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus "
-"valik, mida toetavad paljud POP serverid."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus valik, mida toetavad paljud POP serverid."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:195
@@ -11231,9 +11366,7 @@ msgstr "Ei õnnestu luua ühendust WAIS serveriga."
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
 #, fuzzy, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:423
@@ -11277,9 +11410,7 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
@@ -11295,8 +11426,7 @@ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
@@ -11326,7 +11456,8 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:37
+#: mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11481,95 +11612,95 @@ msgstr ""
 "Serveri vastus:\n"
 "%2"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Sõnumit ei saa saata: saajate aadressid on määramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "HELO käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "AUTH käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM käsk ebaõnnestus: %s: sõnum jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO käsk ebaõnnestus: %s: meil jäi saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
@@ -11579,26 +11710,26 @@ msgstr "DATA käsk ebaõnnestus: %s: meil jäi saatmata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "DATA käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "RSET käsk ebaõnnestus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT käsk ebaõnnestus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "QUIT käsk ebaõnnestus"
 
@@ -11617,7 +11748,8 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298
+#: mail/em-utils.c:408
 msgid "attachment"
 msgstr "manus"
 
@@ -11663,15 +11795,12 @@ msgstr "Soovita manuse automaatset kuvamist"
 
 #: composer/e-msg-composer.c:704
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
 #: composer/e-msg-composer.c:711
 #, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
 
 #: composer/e-msg-composer.c:1283
@@ -11692,7 +11821,8 @@ msgstr "Pealkirjata sõnum"
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1998
+#: mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automaatselt genereeritud"
 
@@ -11701,55 +11831,24 @@ msgid "Signature:"
 msgstr "Allkiri:"
 
 #: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
 #: composer/e-msg-composer.c:2327
+#, c-format
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba peitmine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+#: composer/e-msg-composer.c:2330
+#: composer/e-msg-composer.c:3208
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba kuvamine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
+#: composer/e-msg-composer.c:2347
+#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3101
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Ei saa luua sõnumiredaktori akent:\n"
-"Ei saa aktiveerida HTML redaktori komponenti.\n"
-"Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
-"versioonid on paigaldatud.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Ei saa luua sõnumiredaktori akent:\n"
-"Ei saa aktiveerida HTML redaktori komponenti."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#: composer/e-msg-composer.c:4254
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr ""
 
 #: composer/e-msg-composer-hdrs.c:512
@@ -11811,9 +11910,7 @@ msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #: composer/e-msg-composer-hdrs.c:607
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 
 #  * Post-To
@@ -11847,7 +11944,9 @@ msgid "You cannot attach the file `{0}' to this message."
 msgstr "Faili manustamine sõnumile"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#. mail:no-save-path secondary
+#: composer/mail-composer-errors.xml.h:4
+#: mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
@@ -11864,9 +11963,7 @@ msgstr "Katalooge ei saa sõnumeile manustada."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
 #  mail-composer:recover-autosave title
@@ -11887,9 +11984,7 @@ msgstr ""
 
 #. mail-composer:recover-autosave secondary
 #: composer/mail-composer-errors.xml.h:16
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.h:17
@@ -11912,9 +12007,7 @@ msgstr "Ajutisse faili kirjutamine ei õnnestunud."
 #: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-"Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" "
-"üldse teha."
+msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
 
 #. mail-composer:exit-unsaved title
 #: composer/mail-composer-errors.xml.h:24
@@ -11926,18 +12019,13 @@ msgstr "Hoiatus: salvestamata sõnum"
 #. mail-composer:exit-unsaved primary
 #: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
 
 #  mail-composer:exit-unsaved secondary
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:28
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.h:29
@@ -11967,8 +12055,14 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
+#: composer/mail-composer-errors.xml.h:38
+#: mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Kuna \"{1}\"."
@@ -11985,6 +12079,33 @@ msgstr "Kõik kontod on kustutatud."
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#  mail-composer:no-build-message primary
+#. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
+#: composer/mail-composer-errors.xml.h:44
+#: composer/mail-composer-errors.xml.h:48
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Uut akent ei saa teha.\n"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+msgstr ""
+"Ei saa luua sõnumiredaktori akent:\n"
+"Ei saa aktiveerida HTML redaktori komponenti.\n"
+"Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
+"versioonid on paigaldatud.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution grupitarkvarakomplekt"
@@ -12018,8 +12139,7 @@ msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
@@ -12059,10 +12179,8 @@ msgstr "<b>E-posti saatmine:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -12091,9 +12209,7 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:249
@@ -12105,7 +12221,8 @@ msgstr ""
 "Kirjutada üle?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:251
+#: widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -12139,7 +12256,10 @@ msgstr "Katekooriate sünkroniseerimine:"
 #  time, in 12-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:185
+#: e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -12149,7 +12269,10 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  time, in 24-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
@@ -12228,25 +12351,39 @@ msgstr "%d.%m.%Y"
 #  strptime format for a time of day, in 12-hour format.
 #  strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:339
+#: e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: e-util/e-time-utils.c:348
+#: e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1414
+#: widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1411
+#: widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12256,59 +12393,19 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
-#, fuzzy, c-format
-msgid "1 second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "teine"
-msgstr[1] "teine"
-
 #: filter/filter-datespec.c:74
-#, fuzzy, c-format
-msgid "1 minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "10 minutit"
-msgstr[1] "10 minutit"
-
 #: filter/filter-datespec.c:75
-#, c-format
-msgid "1 hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
 #: filter/filter-datespec.c:76
-#, c-format
-msgid "1 day ago"
-msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
-
 #: filter/filter-datespec.c:77
-#, c-format
-msgid "1 week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
 #: filter/filter-datespec.c:78
-#, c-format
-msgid "1 month ago"
-msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
-
 #: filter/filter-datespec.c:79
-#, c-format
-msgid "1 year ago"
-msgid_plural "%d years ago"
-msgstr[0] ""
-msgstr[1] ""
-
 #: filter/filter-datespec.c:280
+#, c-format
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid "now"
 msgstr "praegu"
 
@@ -12343,7 +12440,9 @@ msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
 #. filter:no-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#. filter:bad-file secondary
+#: filter/filter-errors.xml.h:8
+#: filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
@@ -12374,7 +12473,9 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#. filter:no-name-vfolder primary
+#: filter/filter-errors.xml.h:22
+#: filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -12423,12 +12524,14 @@ msgstr "Vali faili"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: filter/filter-folder.c:238
+#: filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
+#: filter/filter.glade.h:1
+#: mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12488,7 +12591,8 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:19
+#: mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekundit"
 
@@ -12520,7 +12624,9 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: filter/filter-label.c:121
+#: mail/em-migrate.c:1011
+#: mail/mail-config.c:76
 #: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tähtis"
@@ -12528,7 +12634,9 @@ msgstr "Tähtis"
 #  forest green
 #  forest green
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: filter/filter-label.c:124
+#: mail/em-migrate.c:1014
+#: mail/mail-config.c:79
 #: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Ülesanne"
@@ -12536,12 +12644,15 @@ msgstr "Ülesanne"
 #  blue
 #  blue
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: filter/filter-label.c:125
+#: mail/em-migrate.c:1015
+#: mail/mail-config.c:80
 #: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Hiljem"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532
+#: shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -12607,7 +12718,8 @@ msgstr "Reegli nimi"
 msgid "_Score Rules"
 msgstr "_Hindereeglid"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/score-rule.c:184
+#: filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
@@ -12671,7 +12783,8 @@ msgstr "Konto nimi"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/em-composer-prefs.c:305
+#: mail/em-composer-prefs.c:424
 #: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Nimetu"
@@ -12688,50 +12801,33 @@ msgstr "Lisa allkirjaskript"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#  translators: attribution string used when quoting messages,
-#  it must contain a single single %%+05d followed by a single '%%s'
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a. %Y-%m-%d, kell %H:%M %%+05d, %%s kirjutas:"
+#. 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:1547
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr ""
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Kausta omadused"
 
-#  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Omadused"
-
-#  TODO: can this be done in a loop?
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Kausta nimi"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Sõnumeid kokku"
-
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Lugemata sõnumeid"
-
+#: mail/em-folder-properties.c:161
+#: mail/em-folder-properties.c:173
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
@@ -12740,120 +12836,143 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166
+#: mail/em-folder-tree.c:2310
+#: mail/mail-component.c:719
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 msgid "Create"
 msgstr "Loo"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:843
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:850
+#: mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:852
+#: mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:868
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:958
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:959
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:2096
+#: mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Liiguta"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:963
+#: mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Lohistamise pide"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2083
+#: mail/em-folder-tree.c:2096
+#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2083
+#: mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2123
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2310
+#: mail/mail-component.c:719
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2499
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2501
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: mail/em-folder-tree.c:2572
+#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2573
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
+#: mail/em-folder-tree.c:2577
+msgid "_Copy..."
+msgstr "_Kopeeri..."
+
+#: mail/em-folder-tree.c:2578
+msgid "_Move..."
+msgstr "_Liiguta..."
+
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2582
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Nimeta ümber"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Omadused..."
+#: mail/em-folder-tree.c:2585
+msgid "_Rename..."
+msgstr "_Nimeta ümber..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
+#  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:2588
+#: ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Omadused"
+
+#: mail/em-folder-tree-model.c:199
+#: mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:869
 msgid "VFolders"
 msgstr "VKaustad"
 
@@ -12861,26 +12980,32 @@ msgstr "VKaustad"
 #  UNMATCHED is always last
 #  UNMATCHED is always last
 #  UNMATCHED is always last
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#  UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205
+#: mail/em-folder-tree-model.c:207
 #, fuzzy
 msgid "UNMATCHED"
 msgstr "Puudub \\{"
 
 #  Inbox is always first
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+#: mail/em-folder-tree-model.c:211
+#: mail/em-folder-tree-model.c:213
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
+#: mail/em-folder-tree-model.c:469
+#: mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
+#: mail/em-folder-view.c:414
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418
+#: mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474
+#: mail/mail-component.c:516
+#: mail/mail-component.c:569
 msgid "Mail"
 msgstr "E-Post"
 
@@ -12888,7 +13013,8 @@ msgstr "E-Post"
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:895
+#: mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
@@ -12897,21 +13023,25 @@ msgstr "_Redigeeri kui uut kirja..."
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:900
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:901
+#: mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:902
+#: mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:903
+#: mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
@@ -12928,7 +13058,8 @@ msgstr "Märgista kui lõpetatud"
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
@@ -12944,11 +13075,13 @@ msgstr "Märgi _tähtsaks "
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista kui _mitte rämps"
 
@@ -12960,11 +13093,13 @@ msgstr "T_aasta"
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+#: mail/em-folder-view.c:927
+#: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
 
@@ -13018,62 +13153,84 @@ msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1710
+#: mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2080
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2345
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/em-format.c:750
+#: mail/em-format-html.c:1413
+#: mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82
+#: mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "Saatja"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-format.c:751
+#: mail/em-format-html.c:1413
+#: mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+#: mail/em-format.c:752
+#: mail/em-format-html.c:1413
+#: mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84
+#: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-format.c:753
+#: mail/em-format-html.c:1413
+#: mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-format.c:754
+#: mail/em-format-html.c:1413
+#: mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+#: mail/em-format.c:755
+#: mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Teema"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+#: mail/em-format.c:756
+#: mail/em-format-html.c:1563
+#: mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757
+#: mail/em-format-html.c:1586
+#: mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
@@ -13082,7 +13239,8 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format.c:1024
+#: mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
 
@@ -13106,20 +13264,24 @@ msgstr "Viga allkirja tõestamisel"
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#: mail/em-format-html.c:452
+#: mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html.c:559
+#: mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html.c:560
+#: mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:561
+#: mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
@@ -13128,19 +13290,23 @@ msgstr "Vigane allkiri"
 msgid "Valid signature but cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html.c:568
+#: mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html.c:569
+#: mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:570
+#: mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:571
+#: mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
@@ -13178,8 +13344,9 @@ msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
 #. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-format-html.c:1523
+#: mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
@@ -13212,24 +13379,15 @@ msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
 #: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
 
 #: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
-"on tõese sõnumiga."
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist on tõese sõnumiga."
 
 #: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr ""
 
 #: mail/em-format-html-display.c:647
@@ -13237,38 +13395,27 @@ msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
 #: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
 msgstr ""
 
 #: mail/em-format-html-display.c:654
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
+msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr ""
 
 #: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr ""
 
 #: mail/em-format-html-display.c:656
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:757
+#: smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
@@ -13324,13 +13471,11 @@ msgstr "Kord kuus"
 #: mail/em-migrate.c:1168
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
-"versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -13364,7 +13509,8 @@ msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#: mail/em-migrate.c:2413
+#: mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
@@ -13377,9 +13523,7 @@ msgstr ""
 " %s"
 
 #: mail/em-migrate.c:2594
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:700
@@ -13425,7 +13569,7 @@ msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Kaust"
 
@@ -13579,10 +13723,7 @@ msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
 #: mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:28
@@ -13603,9 +13744,7 @@ msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
 #: mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:33
@@ -13613,9 +13752,7 @@ msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:34
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:35
@@ -13631,14 +13768,8 @@ msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
-msgstr ""
-"Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi "
-"ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on "
-"aadressiraamatus 3 - Alati laadi pildid võrgust maha."
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
+msgstr "Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on aadressiraamatus 3 - Alati laadi pildid võrgust maha."
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
@@ -13712,8 +13843,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -13727,17 +13857,13 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
 #: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
+msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
@@ -13827,11 +13953,7 @@ msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
 #: mail/evolution-mail.schemas.in.in.h:82
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
@@ -13926,7 +14048,7 @@ msgstr "Vaade/Bcc menüüelement on valitud"
 #: mail/evolution-mail.schemas.in.in.h:104
 #, fuzzy
 msgid "View/ReplyTo menu item is checked"
-msgstr "Vaade/Vast menüüelement on valitud"
+msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:105
 #, fuzzy
@@ -13934,9 +14056,7 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:106
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:107
@@ -13958,8 +14078,7 @@ msgid "Composer Preferences"
 msgstr "Kella häälestus"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
@@ -14003,7 +14122,8 @@ msgstr "Evolutioni Netscape Mail'i importija"
 msgid "Mail Accounts"
 msgstr "Meilikontod"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Meili häälestus"
 
@@ -14018,14 +14138,16 @@ msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:221
 #: mail/importers/evolution-outlook-importer.c:255
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1251
+#: mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importimine..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:223
 #: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1253
+#: mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -14211,15 +14333,18 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957
+#: mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961
+#: mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965
+#: mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
@@ -14247,68 +14372,41 @@ msgstr "%s meililist"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:461
-#, c-format
-msgid "%d deleted"
-msgstr "%d kustutatud"
-
-#: mail/mail-component.c:463
-#, c-format
-msgid "%d junk"
-msgstr "%d rämps"
-
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d mustandid"
-
-#: mail/mail-component.c:488
-#, c-format
-msgid "%d sent"
-msgstr "%d saadetud"
-
-#: mail/mail-component.c:490
-#, c-format
-msgid "%d unsent"
-msgstr "%d saatmata"
-
+#: mail/mail-component.c:469
+#: mail/mail-component.c:471
 #: mail/mail-component.c:494
-#, c-format
-msgid "%d total"
-msgstr "%d kokku"
-
 #: mail/mail-component.c:496
+#: mail/mail-component.c:498
+#: mail/mail-component.c:502
+#: mail/mail-component.c:504
+#: mail/mail-component.c:671
 #, c-format
-msgid ", %d unread"
-msgstr ", %d lugemata"
-
-#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:672
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:673
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:679
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:680
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:681
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:813
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14316,72 +14414,59 @@ msgstr ""
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:973 mail/mail-config.c:977
+#: mail/mail-config.c:973
+#: mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Serveriga ühendumine..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
+#: mail/mail-config-druid.c:362
+#: mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteet"
 
 #: mail/mail-config-druid.c:364
 #, fuzzy
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 msgstr ""
-"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
-"\"Mittekohustuslikud\" väljad\n"
-"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
-"sõnumitesse."
+"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
+"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
 
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:370
+#: mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Meili vastuvõtmine"
 
 #: mail/mail-config-druid.c:372
 #, fuzzy
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. "
-"Kui sa ei ole para-\n"
-"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
-"interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. Kui sa ei ole para-\n"
+"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
 #: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
+#: mail/mail-config-druid.c:382
+#: mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Meili saatmine"
 
 #: mail/mail-config-druid.c:384
 #, fuzzy
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
-"välja saata. Kui sa ei ole\n"
-"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
-"interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
+"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
+#: mail/mail-config-druid.c:389
+#: mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontohaldus"
 
 #: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
 msgstr ""
 
 #: mail/mail-config.glade.h:2
@@ -14555,7 +14640,8 @@ msgstr ""
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47
+#: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
@@ -14652,7 +14738,7 @@ msgstr "Originaalsõnumite ei tsiteerita"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Valmis"
 
@@ -14740,9 +14826,7 @@ msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
 #: mail/mail-config.glade.h:104
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
@@ -14761,9 +14845,7 @@ msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 #: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
+msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
 
 #: mail/mail-config.glade.h:113
 #, fuzzy
@@ -14883,10 +14965,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:147
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr ""
 
 #: mail/mail-config.glade.h:149
@@ -14998,12 +15077,8 @@ msgstr "Vigane autentimine"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
-"autentimist üleüldse."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see autentimist üleüldse."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15014,12 +15089,8 @@ msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
 #, fuzzy
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
-"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -15030,14 +15101,15 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: mail/mail-errors.xml.h:15
+#: mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27
+#: mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Saada"
 
@@ -15050,18 +15122,17 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 #  mail:ask-send-no-subject secondary
 #. mail:ask-send-no-subject secondary
 #: mail/mail-errors.xml.h:19
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 msgstr ""
 
 #  mail:ask-send-only-bcc-contact primary
 #  mail:ask-send-only-bcc primary
 #. mail:ask-send-only-bcc-contact primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#. mail:ask-send-only-bcc primary
+#: mail/mail-errors.xml.h:22
+#: mail/mail-errors.xml.h:29
 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?"
+msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
 #  mail:ask-send-only-bcc-contact secondary
 #. mail:ask-send-only-bcc-contact secondary
@@ -15069,33 +15140,23 @@ msgstr ""
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 
 #  mail:ask-send-only-bcc secondary
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+msgid "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
-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."
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
 #. mail:ask-default-drafts primary
@@ -15105,9 +15166,7 @@ msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
 msgstr ""
 
 #  default charset used in mail view
@@ -15119,13 +15178,13 @@ msgstr "Kasuta _vaikekodeeringut"
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
 #. mail:ask-expunge secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#. mail:ask-empty-trash secondary
+#: mail/mail-errors.xml.h:45
+#: mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
@@ -15137,9 +15196,7 @@ msgstr "_Puhasta"
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
 #: mail/mail-errors.xml.h:51
@@ -15153,9 +15210,7 @@ msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 
 #. mail:camel-exception primary
@@ -15166,10 +15221,8 @@ msgstr ""
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 msgstr ""
 
 #. mail:async-error primary
@@ -15193,10 +15246,21 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
+#: mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
 msgid "{0}"
 msgstr "{0}"
 
@@ -15216,7 +15280,10 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
 #. mail:no-create-path primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
+#: mail/mail-errors.xml.h:94
+#: mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa salvestada."
@@ -15252,10 +15319,10 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
 #. mail:no-delete-spethal-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-rename-spethal-folder secondary
+#: mail/mail-errors.xml.h:116
+#: mail/mail-errors.xml.h:120
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr ""
 
 #. mail:no-rename-spethal-folder primary
@@ -15275,18 +15342,20 @@ msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#. mail:no-rename-folder primary
+#: mail/mail-errors.xml.h:128
+#: mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
 
 #. mail:no-rename-folder-exists secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#. mail:vfolder-notunique secondary
+#: mail/mail-errors.xml.h:130
+#: mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
 
@@ -15296,22 +15365,30 @@ msgid "Because \"{2}\"."
 msgstr "Kuna \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#. mail:no-move-folder-to-nostore primary
+#: mail/mail-errors.xml.h:136
+#: mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
 
 #. mail:no-move-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#. mail:no-copy-folder-nostore secondary
+#: mail/mail-errors.xml.h:138
+#: mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" ei saa avada."
 
 #. mail:no-move-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#. mail:no-copy-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142
+#: mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" ei saa avada."
 
 #. mail:no-copy-folder-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#. mail:no-copy-folder-to-nostore primary
+#: mail/mail-errors.xml.h:144
+#: mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
 
@@ -15326,7 +15403,9 @@ msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" ei saa avada"
 
 #. mail:account-incomplete primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#. mail:account-notunique primary
+#: mail/mail-errors.xml.h:156
+#: mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi ei saa salvestada."
 
@@ -15407,9 +15486,7 @@ msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
@@ -15457,15 +15534,15 @@ msgstr ""
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 msgstr ""
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
 msgstr "Eira"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:217
+#: widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -15574,7 +15651,8 @@ msgstr "Konto %s salvestamine"
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
@@ -15593,19 +15671,7 @@ msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
 #: mail/mail-ops.c:1763
-#, fuzzy, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Sõnumi %s vastuvõtt"
-msgstr[1] "Sõnumi %s vastuvõtt"
-
 #: mail/mail-ops.c:1849
-#, fuzzy, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Sõnumite liigutamine"
-msgstr[1] "Sõnumite liigutamine"
-
 #: mail/mail-ops.c:1899
 #, c-format
 msgid ""
@@ -15628,7 +15694,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15637,17 +15703,17 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
@@ -15707,28 +15773,29 @@ msgstr "Tühista _kõik"
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 
@@ -15783,15 +15850,15 @@ msgstr "'%s:%s' vkaustade uuendamine"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:939
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:978
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1062
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
@@ -15855,7 +15922,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -15904,7 +15971,8 @@ msgstr "Vastukaja"
 msgid "For Your Information"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
@@ -15917,11 +15985,13 @@ msgstr "Käsule %s ei tulnud vastust."
 msgid "Read"
 msgstr "Loetud"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -15929,7 +15999,8 @@ msgstr "Vasta kõigile"
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Vastukaja sildi järgi"
@@ -15998,33 +16069,30 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-msgid ""
-"If set to true, Evolution will start up in offline mode instead of online "
-"mode."
+msgid "If set to true, Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"If set to true, the warning dialog in development versions of Evolution is "
-"not displayed."
+msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+#, fuzzy
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "Tööriistariba on nähtaval"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+#, fuzzy
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "Kas kõik mängud peaksid olema lahendusega."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
@@ -16034,7 +16102,8 @@ msgstr ""
 msgid "mail"
 msgstr "kirjad"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
+#: shell/e-shell.c:588
+#: shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%.0f kb/s"
@@ -16059,7 +16128,8 @@ msgstr "Ei leia häälestusandmebaasi"
 msgid "Generic error"
 msgstr "Üldine viga"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592
+#: shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -16069,18 +16139,17 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: shell/e-shell-importer.c:149
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
 
 #: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158
+#: shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
@@ -16092,7 +16161,8 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:229
+#: shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16105,7 +16175,8 @@ msgstr ""
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#: shell/e-shell-importer.c:451
+#: shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
@@ -16119,7 +16190,8 @@ msgstr "Importimine"
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:477
+#: shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
@@ -16159,7 +16231,8 @@ msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752
+#: shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16172,7 +16245,8 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882
+#: shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
@@ -16204,9 +16278,7 @@ msgstr "Importimise alustamine"
 
 #: shell/e-shell-startup-wizard.c:795
 msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
+"If you quit the Evolution Setup Assistant now, all of the information that you have entered will be forgotten. You will need to run this assistant again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
@@ -16234,9 +16306,7 @@ msgstr "'.' ja '..' on reserveeritud kaustanimed."
 #: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
-"seda nuppu."
+msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
 
 #: shell/e-shell-window.c:344
 #, fuzzy
@@ -16246,9 +16316,7 @@ msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 #: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
-"seda nuppu."
+msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
 
 #: shell/e-shell-window.c:637
 #, fuzzy, c-format
@@ -16272,27 +16340,25 @@ msgstr "Veateatamisprogramm ei ole paigaldatud."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
-msgstr "Groupwise"
+msgstr "Grupitöö võimalused"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575
+#: ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588
+#: ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkast"
-
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Uus"
@@ -16309,94 +16375,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Loo uus testielement"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Aktiivsed ühendused</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktiivsed ühendused"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Ühenduste sulgemiseks ja offline reziimi siirdumiseks vajuta \"Olgu\""
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Kalender:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "K_ontaktid:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Post:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "Ü_lesanded:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Kausta _tüüp:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Ava teise kasutaja kaust"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Konto:"
-
-#  TODO: can this be done in a loop?
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Kausta nimi:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Kasutaja:"
-
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Evolution'i häälestusassistent"
-
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Impordin faile"
-
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Ajavöönd"
-
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Tere tulemast!"
-
-#: shell/glade/evolution-startup-wizard.glade.h:6
-#, fuzzy
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Tere tulemast Evolution'i. Järgnevate vormide abil on\n"
-"sul võimalik häälestada Evolution'i e-posti kontosid\n"
-"ja importida faile teistest rakendustest. \n"
-"\n"
-"Jätkamiseks palun vajuta nuppu \"Järgmine\". "
-
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolutioni kest"
@@ -16449,7 +16427,8 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195
+#: smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Impordi"
 
@@ -16534,87 +16513,25 @@ msgid ""
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
-msgid "Insufficient disk space for upgrade."
-msgstr ""
-
-#. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-
-#. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-
-#. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-
-#: shell/shell-errors.xml.h:15
-#, fuzzy
-msgid "Continue"
-msgstr "Jätka"
-
-#. shell:noshell title
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
-#, fuzzy
-msgid "Cannot start Evolution"
-msgstr "Rakendust <i>kcheckpass</i> pole võimalik käivitada."
-
-#. shell:noshell primary
-#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
-#, fuzzy
-msgid "Evolution can not start."
-msgstr "EI saa käivitada wombatit"
-
-#. shell:noshell secondary
-#: shell/shell-errors.xml.h:21
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-
-#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:29
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-
-#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:130
+#: smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:245
+#: smime/gui/certificate-manager.c:437
 #: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#: smime/gui/certificate-manager.c:254
+#: smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:263
+#: smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -16726,12 +16643,11 @@ msgid "Backup All"
 msgstr "Kogu päev"
 
 #: smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: smime/gui/smime-ui.glade.h:14
+#: smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -16755,8 +16671,9 @@ msgid "Contact Certificates"
 msgstr "Kontakti sertifikaadid"
 
 #: smime/gui/smime-ui.glade.h:20
+#, fuzzy
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "%08lX: Me EI usalda seda võtit\n"
 
 #: smime/gui/smime-ui.glade.h:21
 #, fuzzy
@@ -16770,7 +16687,7 @@ msgstr "Redigeermine"
 #: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "E-posti sertifikaadi atesteerimisorgan"
+msgstr "Kasutatakse meiliseadistusi juhtimiskeskusest"
 
 #: smime/gui/smime-ui.glade.h:24
 #, fuzzy
@@ -16806,17 +16723,20 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: smime/gui/smime-ui.glade.h:34
+#: smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: smime/gui/smime-ui.glade.h:35
+#: smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:37
+#, fuzzy
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "See ei ole signeerija sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
@@ -16839,8 +16759,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
@@ -16852,23 +16771,23 @@ msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
 #: smime/gui/smime-ui.glade.h:46
+#, fuzzy
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr " %d = EI usalda\n"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: smime/lib/e-cert.c:238
+#: smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#. x509 certificate usage types
+#  x509 certificate usage types
 #: smime/lib/e-cert.c:424
-#, fuzzy
 msgid "Sign"
-msgstr "Allkirjastamine"
+msgstr "Allkirjasta"
 
 #: smime/lib/e-cert.c:425
-#, fuzzy
 msgid "Encrypt"
-msgstr "Krüptitud"
+msgstr "Krüpteeri"
 
 #: smime/lib/e-cert.c:530
 msgid "Version"
@@ -16978,11 +16897,13 @@ msgstr "Teema avaliku võtme info"
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit ei saa töödelda"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -17028,7 +16949,8 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: smime/lib/e-cert.c:940
+#: smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -17041,7 +16963,8 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: smime/lib/e-cert.c:1091
+#: smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -17062,7 +16985,7 @@ msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
+#: smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
@@ -17125,7 +17048,8 @@ msgstr "Süsteemi %s sulgemine (%s)\n"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopeeri kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
@@ -17133,7 +17057,8 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -17149,7 +17074,8 @@ msgstr "Liiguta kontakt(id) teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -17157,8 +17083,10 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -17208,17 +17136,24 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
+#: ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
@@ -17226,7 +17161,8 @@ msgstr "_Edasta kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -17283,7 +17219,8 @@ msgstr "Loend"
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Järgmine"
 
@@ -17291,7 +17228,8 @@ msgstr "Järgmine"
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -17303,7 +17241,8 @@ msgstr "Kalendri trükkimine"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publitseeri selle kalendri vaba/hõivatud info"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhastamine"
 
@@ -17343,7 +17282,8 @@ msgstr "Näitab ühte nädalat"
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:249
 #: widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Täna"
@@ -17364,16 +17304,19 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Sündmus avamine"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Sulge"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3
+#: ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Sulge"
@@ -17382,12 +17325,15 @@ msgstr "Sulge"
 msgid "Close this item"
 msgstr "Sulgeb elemendi"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Kustuta see element"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
+#: ui/evolution-comp-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -17395,23 +17341,27 @@ msgstr "Peatööriistariba"
 msgid "Preview the printed item"
 msgstr "Trükitava elemendi eelvaatlemine"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Trüki see element"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
@@ -17425,11 +17375,13 @@ msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 msgid "Save this item to disk"
 msgstr "Salvestab elemendi kettale"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fail"
@@ -17438,7 +17390,8 @@ msgstr "_Fail"
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2
+#: ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
@@ -17450,7 +17403,8 @@ msgstr "Lõika valitud tekst lõikelauale"
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5
+#: ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -17506,11 +17460,13 @@ msgstr "Koo_soleku ärajätmine"
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "_Edasta iKalendrina"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4
+#: ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Edastab elemendi e-posti kaudu"
 
@@ -17595,11 +17551,13 @@ msgstr "_Filtrid..."
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) kopeerimine lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) lõikamine lõikelauale"
 
@@ -17620,8 +17578,7 @@ msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17632,7 +17589,8 @@ msgstr "Märgi Kõik loetuks"
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Sõnumi(te) asetamine lõikepuhvrist"
 
@@ -17680,7 +17638,8 @@ msgstr "Esitab sõnumeid jutulõngadena"
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteeri valik"
 
@@ -17688,12 +17647,14 @@ msgstr "_Inverteeri valik"
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Sul_ge"
@@ -18097,7 +18058,8 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129
+#: ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18113,7 +18075,8 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -18129,7 +18092,8 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
@@ -18397,9 +18361,8 @@ msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
 #: ui/evolution.xml.h:1
-#, fuzzy
 msgid "About Evolution..."
-msgstr "Ximian Evolutionist"
+msgstr "Evolutionist..."
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -18408,7 +18371,7 @@ msgstr "Muuda Evolutioni seadeid "
 #: ui/evolution.xml.h:3
 #, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "Muuda kausta omadusi"
+msgstr "Muuda peatööriistariba nähtavust"
 
 #: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
@@ -18419,9 +18382,8 @@ msgid "E_xit"
 msgstr "_Välju"
 
 #: ui/evolution.xml.h:8
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Ximian Evolution'i _KKK "
+msgstr "Evolutioni _KKK "
 
 #: ui/evolution.xml.h:9
 msgid "Exit the program"
@@ -18477,18 +18439,16 @@ msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
 #: ui/evolution.xml.h:23
-#, fuzzy
 msgid "T_oolbar"
-msgstr "Peatööriistariba"
+msgstr "_Tööriistariba"
 
 #: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr "Lülitab autonoomse reziimi sisse või välja"
 
 #: ui/evolution.xml.h:26
-#, fuzzy
 msgid "_About Evolution..."
-msgstr "Ximian Evolutionist"
+msgstr "Evolutionist..."
 
 #: ui/evolution.xml.h:30
 msgid "_Help"
@@ -18598,8 +18558,7 @@ msgstr "Vali ajavöönd"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
@@ -18638,7 +18597,8 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241
+#: widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Praegu"
 
@@ -18699,13 +18659,16 @@ msgstr "lääne-euroopa"
 msgid "Western European, New"
 msgstr "Lääne-euroopa, uust"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "traditsiooniline"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
@@ -18722,7 +18685,8 @@ msgstr "visuaalne"
 msgid "Unknown character set: %s"
 msgstr "Tundmatu märgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: widgets/misc/e-charset-picker.c:216
+#: widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -18738,12 +18702,14 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:80
 #: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:82
 #: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
@@ -18758,12 +18724,10 @@ msgstr "Evolutioni päring"
 
 #  setup a dummy error
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -18782,9 +18746,7 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: widgets/misc/e-expander.c:198
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
@@ -18833,15 +18795,18 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92
+#: widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93
+#: widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Täpsemalt..."
 
@@ -18857,7 +18822,8 @@ msgstr "_Otsing"
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547
+#: widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
@@ -18907,420 +18873,3 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "Ei saa luua ühendust LDAP serveriga"
-
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Autentimine LDAP serverile nurjus"
-
-#, fuzzy
-#~ msgid "Error retrieving schema information"
-#~ msgstr "Viga GSM faili info hankimisel: "
-
-#, fuzzy
-#~ msgid "  S_how Supported Bases "
-#~ msgstr "Toetatud otsingubaasid"
-
-#~ msgid "1:00"
-#~ msgstr "1:00"
-
-#~ msgid "5:00"
-#~ msgstr "5:00"
-
-#~ msgid "Connecting"
-#~ msgstr "Ühendamine"
-
-#~ msgid "Distinguished _name:"
-#~ msgstr "_Eraldusnimi:"
-
-#~ msgid "Email address:"
-#~ msgstr "E-posti aadress: "
-
-#~ msgid "Evolution will use this DN to authenticate you with the server"
-#~ msgstr "Evolution esitab selle eraldusnime serverile audentsuse kontrollil"
-
-# !PARANDA! - LDAP serveri kehtivuspiirkond
-#~ msgid "One"
-#~ msgstr "Üks"
-
-#~ msgid "S_earch scope: "
-#~ msgstr "Otsingu _kehtivuspiirkond: "
-
-#~ msgid "Searching"
-#~ msgstr "Otsin"
-
-# !PARANDA! - LDAP serveri kehtivuspiirkond
-#~ msgid "Sub"
-#~ msgstr "Alam"
-
-#~ msgid "This option controls how long a search will be run."
-#~ msgstr "See valik kontrollib kui kaua lubatakse otsingul töötada."
-
-#~ msgid "U_se SSL/TLS:"
-#~ msgstr "_Kasuta SSL/TLS:"
-
-#~ msgid "_Display name:"
-#~ msgstr "_Näidatav nimi:"
-
-#~ msgid "_Port number:"
-#~ msgstr "_Pordi number:"
-
-#~ msgid "_Search base:"
-#~ msgstr "_Otsingu baas:"
-
-#~ msgid "_Server name:"
-#~ msgstr "_Serveri nimi:"
-
-#~ msgid "_Timeout (minutes):"
-#~ msgstr "_Taimaut (minutites):"
-
-#, fuzzy
-#~ msgid "connecting-tab"
-#~ msgstr "Uus s_akk"
-
-#~ msgid "general-tab"
-#~ msgstr "üldine-sakk"
-
-#~ msgid "searching-tab"
-#~ msgstr "otsingu-sakk"
-
-#  URL
-#~ msgid "Webcam:"
-#~ msgstr "Veebikaamera:"
-
-#~ msgid "item7"
-#~ msgstr "element7"
-
-#~ msgid "item8"
-#~ msgstr "element8"
-
-#~ msgid "Category editor not available."
-#~ msgstr "Kategooriaredaktor pole saadaval."
-
-#~ msgid "Do you want to save changes?"
-#~ msgstr "Kas soovid muudatused salvestada?"
-
-#~ msgid "Error saving %s: %s"
-#~ msgstr "Viga %s salvestamisel: %s"
-
-#~ msgid "Can not load URI"
-#~ msgstr "URI't ei saa laadida"
-
-#~ msgid "Calendar Properties"
-#~ msgstr "Kalendri atribuudid"
-
-#~ msgid "Remote"
-#~ msgstr "Võrgus"
-
-#~ msgid "Task List Properties"
-#~ msgstr "Ülesandeloetelu omadused"
-
-#~ msgid "_Refresh Interval:"
-#~ msgstr "_Uuendamise intervall:"
-
-#~ msgid "_Source URL:"
-#~ msgstr "_Lähte-URL:"
-
-#~ msgid ""
-#~ "The event being deleted is a meeting, would you like to send a "
-#~ "cancellation notice?"
-#~ msgstr ""
-#~ "Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele "
-#~ "teate koosoleku ärajätmise kohta?"
-
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Kas sa tõesti soovid katkestada ja kustutada antud koosoleku?"
-
-#~ msgid ""
-#~ "The task being deleted is assigned, would you like to send a cancellation "
-#~ "notice?"
-#~ msgstr ""
-#~ "Ülesanne, mida te kustutate, on antud täitmiseks. Kas soovite saata "
-#~ "tühistamise teate?"
-
-#~ msgid "Are you sure you want to cancel and delete this task?"
-#~ msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
-
-#~ msgid ""
-#~ "The journal entry being deleted is published, would you like to send a "
-#~ "cancellation notice?"
-#~ msgstr ""
-#~ "Päevaraamatu sissekanne, mida te kustutate on avalik. Kas soovite saata "
-#~ "ärajätmise teate?"
-
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Kas sa tõesti soovid katkestada ja kustutada antud päeviku sissekande?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
-
-#~ msgid "Are you sure you want to delete this untitled appointment?"
-#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
-
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Kas sa tõesti soovid kustutada ülesannet '%s'?"
-
-#~ msgid "Are you sure you want to delete this untitled task?"
-#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut ülesannet?"
-
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
-
-#~ msgid "Are you sure want to delete this untitled journal entry?"
-#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut päeviku sissekannet?"
-
-#~ msgid "_Invite Others..."
-#~ msgstr "_Kutsu teisi..."
-
-#~ msgid ""
-#~ "This event has been changed, but has not been saved.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Sündmust on muudetud kuid seda ei ole salvestatud.\n"
-#~ "\n"
-#~ "Kas sa soovid muudatused salvestada?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Loobu muudatustest"
-
-#~ msgid "Save Event"
-#~ msgstr "Salvesta sündmus"
-
-#~ msgid "The meeting information has been created. Send it?"
-#~ msgstr "Koosoleku info on valmis. Kas soovid selle laiali saata?"
-
-#~ msgid "The meeting information has changed. Send an updated version?"
-#~ msgstr "Koosoleku infot on muudetud. Kas soovid saata uuendatud versiooni? "
-
-#~ msgid "The task information has changed. Send an updated version?"
-#~ msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
-
-#, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Gruppide nimekirja serverist ei saadud."
-
-#~ msgid "Posting not allowed by news server"
-#~ msgstr "Uudisteserver ei luba postitusi"
-
-#~ msgid "Failed to send newsgroups header: %s: message not posted"
-#~ msgstr ""
-#~ "Uudistegruppide päise saatmine ebaõnnestus: %s: sõnimit ei postitatud"
-
-#~ msgid "Error posting to newsgroup: %s: message not posted"
-#~ msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
-
-#~ msgid "Error reading response to posted message: message not posted"
-#~ msgstr "Viga postitatud sõnumi vastuse lugemisel: sõnumit ei postitatud"
-
-#, fuzzy
-#~ msgid "Error posting message: %s: message not posted"
-#~ msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
-
-#~ msgid "Stream error"
-#~ msgstr "Andmevoo viga"
-
-#~ msgid "Connection error: %s"
-#~ msgstr "Ühenduse viga: %s"
-
-#, fuzzy
-#~ msgid "Could not get group: %s"
-#~ msgstr "Infot pole võimalik saada!"
-
-#, fuzzy
-#~ msgid "Could not get messages: unspecified error"
-#~ msgstr "Sõnumi võtmine nurjus: %s"
-
-#, fuzzy
-#~ msgid "Unknown server response: %s"
-#~ msgstr "Serveri viimane vastus"
-
-#~ msgid "${1}"
-#~ msgstr "${1}"
-
-#~ msgid "Because \"${1}\"."
-#~ msgstr "Kuna \"${1}\"."
-
-#  Automatically generated. Do not edit.
-#~ msgid "Adjust Score"
-#~ msgstr "Kohanda hinnet"
-
-#~ msgid "Assign Color"
-#~ msgstr "Määra värvus"
-
-#~ msgid "Assign Score"
-#~ msgstr "Omista hinne"
-
-#~ msgid "Attachments"
-#~ msgstr "Manused"
-
-#~ msgid "Beep"
-#~ msgstr "Piiks"
-
-#~ msgid "contains"
-#~ msgstr "sisaldab"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopeeri kausta"
-
-#~ msgid "Date received"
-#~ msgstr "Vastuvõtmise kuupäev"
-
-#~ msgid "Date sent"
-#~ msgstr "Saatmise kuupäev"
-
-#~ msgid "Deleted"
-#~ msgstr "Kustutatud"
-
-#~ msgid "does not end with"
-#~ msgstr "ei lõppe"
-
-#~ msgid "does not exist"
-#~ msgstr "ei eksisteeri"
-
-#~ msgid "does not return"
-#~ msgstr "ei tagasta"
-
-#~ msgid "does not sound like"
-#~ msgstr "ei kõla nagu"
-
-#~ msgid "does not start with"
-#~ msgstr "ei alga"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ei ole olemas"
-
-#~ msgid "Draft"
-#~ msgstr "Mustand"
-
-#~ msgid "ends with"
-#~ msgstr "lõpeb"
-
-#~ msgid "Exist"
-#~ msgstr "On olemas"
-
-#~ msgid "exists"
-#~ msgstr "on olemas"
-
-#~ msgid "Expression"
-#~ msgstr "Avaldis"
-
-#~ msgid "Follow Up"
-#~ msgstr "Vastukaja"
-
-#~ msgid "is"
-#~ msgstr "on"
-
-#~ msgid "is after"
-#~ msgstr "on peale"
-
-#~ msgid "is before"
-#~ msgstr "on enne"
-
-#~ msgid "is Flagged"
-#~ msgstr "on märgistatud"
-
-#~ msgid "is greater than"
-#~ msgstr "on suurem kui"
-
-#~ msgid "is less than"
-#~ msgstr "on väiksem kui"
-
-#~ msgid "is not"
-#~ msgstr "ei ole"
-
-#~ msgid "is not Flagged"
-#~ msgstr "ei ole märgistatud"
-
-#~ msgid "Junk Test"
-#~ msgstr "Rämpsukontroll"
-
-#~ msgid "Mailing list"
-#~ msgstr "Meililist"
-
-#~ msgid "Message Body"
-#~ msgstr "Kirja tekst"
-
-#~ msgid "Message Header"
-#~ msgstr "Kirja päis"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Sõnum on rämps"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Sõnum ei ole rämps"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Tõsta kausta"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Käivitatav programm"
-
-#~ msgid "Play Sound"
-#~ msgstr "Mängi heli"
-
-#~ msgid "Recipients"
-#~ msgstr "Adressaadid"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regulaaravaldis vastab"
-
-#~ msgid "Replied to"
-#~ msgstr "Vastatud kellele"
-
-#~ msgid "returns"
-#~ msgstr "tagastab"
-
-#~ msgid "returns greater than"
-#~ msgstr "tagastab rohkem kui"
-
-#~ msgid "returns less than"
-#~ msgstr "tagastab vähem kui"
-
-#~ msgid "Run Program"
-#~ msgstr "Käivita programm"
-
-#~ msgid "Sender"
-#~ msgstr "Saatja"
-
-#~ msgid "Set Status"
-#~ msgstr "Määra oma staatus"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Suurus (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "kõlab kui"
-
-#~ msgid "Source Account"
-#~ msgstr "Lähtekonto"
-
-#~ msgid "Specific header"
-#~ msgstr "Päise eripära"
-
-#~ msgid "starts with"
-#~ msgstr "algab"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Peata töötlemine"
-
-#, fuzzy
-#~ msgid "Unset Status"
-#~ msgstr "Kahtlase oleku a&utomaatne eemaldamine"
-
-#~ msgid "Brought to you by"
-#~ msgstr "Teieni tõid"
-
-#~ msgid "_Filename:"
-#~ msgstr "_Faili nimi:"
-
-#~ msgid "View Certificate"
-#~ msgstr "Sertifikaadi kuvamine"
-
-#~ msgid "About Ximian Evolution..."
-#~ msgstr "Ximian Evolutionist..."
-
-#~ msgid "_About Ximian Evolution..."
-#~ msgstr "Ximian _Evolutionist..."
author	Priit Laes <plaes@cvs.gnome.org>	2004-06-18 01:38:40 +0800
committer	Priit Laes <plaes@src.gnome.org>	2004-06-18 01:38:40 +0800
commit	1b87871a4066e6235619ba3118e16a7342aafba8 (patch)
tree	2e4f4ca7929e746d5581d432a3c6a0deb1acb805 /po
parent	49dd7403b966b12dee5e062a0a016708b12f32d9 (diff)
download	gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.tar.gz gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.tar.zst gsoc2013-evolution-1b87871a4066e6235619ba3118e16a7342aafba8.zip