Translation updated.

2004-05-22 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated. svn path=/trunk/; revision=26045
author: Priit Laes <plaes@cvs.gnome.org> 2004-05-22 16:13:31 +0800
committer: Priit Laes <plaes@src.gnome.org> 2004-05-22 16:13:31 +0800
commit: 91d3a80df6d9fd738ad7db4b5daf2342e55ec126 (patch)
tree: 4f8ef154cf968bc59f5e714e8a483d40daebf6f1
parent: a46aa4c5f75040be6df3f64e074ddcf5f2988b3b (diff)
download: gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.tar.gz
gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.tar.zst
gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.zip
2 files changed, 1853 insertions, 1827 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 7fbd884e94..f4f5c16324 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-22  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
 2004-05-22  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
diff --git a/po/et.po b/po/et.po
index c18e3ce74b..b7d7ce285d 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-05-19 14:00-0400\n"
-"PO-Revision-Date: 2004-05-10 08:41+0300\n"
+"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"PO-Revision-Date: 2004-05-22 11:02+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:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
@@ -117,7 +117,7 @@ msgstr "_Kontaktide grupp"
 msgid "Create a new contacts group"
 msgstr "Uue kontaktide grupi loomine"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
@@ -151,12 +151,14 @@ msgid "Server did not respond with valid schema information"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: 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:1105
+#: calendar/gui/migration.c:184
+#: mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -170,10 +172,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:438
-#: 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:508
+#: 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
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -184,41 +190,45 @@ msgstr "Kohalik arvuti"
 #  Create the default Person task list
 #  orange
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: calendar/gui/migration.c:454
+#: calendar/gui/migration.c:536
+#: filter/filter-label.c:123
+#: mail/em-migrate.c: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:454
+#: addressbook/gui/component/addressbook-migrate.c:524
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:652
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:772
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1148
 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:1090
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -228,7 +238,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1171
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -238,13 +248,17 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1181
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid "Some fields are no longer representable in the contact editor. Please wait while Evolution copies those fields to the 'Notes' field..."
+msgstr ""
+
 #: addressbook/gui/component/addressbook-view.c:674
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -256,17 +270,22 @@ msgstr "Uus aadressiraamat"
 
 #: addressbook/gui/component/addressbook-view.c:762
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: calendar/gui/calendar-component.c:430
+#: calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-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:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431
+#: calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Omadused..."
 
@@ -282,6 +301,7 @@ msgstr "Omadused..."
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
+#. Create the contacts group
 #: addressbook/gui/component/addressbook-view.c:1002
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
@@ -298,19 +318,17 @@ 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"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
 msgid "*Control*F2"
-msgstr ""
+msgstr "Vahemälu-kontroll:"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
@@ -325,9 +343,8 @@ msgstr "Automaatne lõpetamine"
 #  name = e_book_get_name (book);
 #  Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
 msgid "C_ontacts"
-msgstr "Kontaktid"
+msgstr "K_ontaktid"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
@@ -368,7 +385,7 @@ msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
@@ -390,8 +407,10 @@ msgstr "Toetatud otsingubaasid"
 #: 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:2
-#: mail/mail-search.glade.h:1 mail/message-tags.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
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
@@ -460,8 +479,9 @@ msgstr "Lisa kontaktide grupp"
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alati"
 
@@ -479,7 +499,8 @@ msgid "Connecting"
 msgstr "Ühendamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: calendar/gui/dialogs/task-editor.c:200
+#: mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Täpsustused"
@@ -510,10 +531,8 @@ msgstr "Evolution esitab selle eraldusnime serverile audentsuse kontrollil"
 
 # !PARANDA! - sõnasus on kuidagi mäda
 #: addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+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:30
 msgid "Find Possible Search Bases"
@@ -522,12 +541,14 @@ msgstr "Leia võimalikud otsingubaasid"
 #: addressbook/gui/component/ldap-config.glade.h:31
 #: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -562,42 +583,32 @@ msgstr "Otsin"
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
+"Selecting this option means that Evolution will only connect to your LDAP server if\n"
 "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:42
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
 "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"
+"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:46
 #, fuzzy
 msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
+"Selecting this option means that your server does not support either SSL or TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable to security\n"
 "exploits. "
 msgstr ""
-"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."
 
@@ -616,56 +627,40 @@ msgstr "Toetatud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"The search base is the distinguished name (DN)  of the entry where your searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the directory tree."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"The search scope defines how deep you would like the search to extend down the \n"
+"directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath your base.\n"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:58
-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:59
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be \n"
 "too large will slow down your address book."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:61
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
-"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
-"toetama anonüümset ligipääsu."
+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:62
 msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
+"This is the name for this server that will appear in your Evolution folder list.\n"
 "It is for display purposes only. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
+"This is the port on the LDAP server that Evolution will try to connect to. A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -693,8 +688,9 @@ msgstr "Eraldusnime (DN) kasutamine"
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:72
+#: mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
@@ -720,7 +716,8 @@ msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
 #: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -767,8 +764,9 @@ msgstr "üldine-sakk"
 
 #: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+#: filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutit"
 
@@ -893,7 +891,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
 #: addressbook/gui/widgets/eab-contact-display.c:342
 #: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
@@ -929,7 +927,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -937,7 +935,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:519
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -958,75 +956,72 @@ msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Kodu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#, fuzzy
 msgid "Home Page:"
-msgstr "<b>Alguskülg</b>"
+msgstr "Kodulehekülg:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Ametinimetus:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:930
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Mailing Address"
 msgstr "Kodune aadress"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Manager:"
 msgstr "Juht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Ni_ckname:"
 msgstr "_Hüüdnimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Notes:"
 msgstr "Märkused:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "PO Box:"
-msgstr "_Sidejaoskonna postkast:"
+msgstr "Sidejaoskonna postkast:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "Personal Information"
 msgstr "Isiklik info"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Profession:"
 msgstr "Amet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "State/Province:"
 msgstr "Maakond/Provints:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Title:"
+msgstr "Pealkiri:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
@@ -1039,10 +1034,12 @@ msgstr "Veebikaamera:"
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: 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öö"
 
@@ -1070,7 +1067,7 @@ msgstr "element7"
 msgid "item8"
 msgstr "element8"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1078,7 +1075,7 @@ msgstr ""
 "Kas sa tõesti soovid\n"
 "kustutada need kontaktid?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1093,7 +1090,7 @@ msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #: 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:174
@@ -2074,85 +2071,95 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:345
 #: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/widgets/eab-contact-display.c:347
 #: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
 #: addressbook/gui/widgets/eab-contact-display.c:346
 #: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/widgets/eab-contact-display.c:344
 #: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:2294
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2302
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#  Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2379
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Kustuta valitud kontaktid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2383
 msgid "No image"
-msgstr "Niger"
+msgstr "Puuduv pilt"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2560
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+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.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
+msgstr "Otsimisvahemik ei ole sobiv."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+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:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Ei leidnud vidinat väljale: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2704
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Unusta"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2185,7 +2192,7 @@ msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Täisnimi:"
 
@@ -2345,9 +2352,8 @@ msgid "Book"
 msgstr "Raamat"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#, fuzzy
 msgid "Is New List"
-msgstr "Uus kontaktide nimekiri"
+msgstr "On uus nimekiri"
 
 #. Construct the app
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
@@ -2497,8 +2503,8 @@ msgstr "Õnnestus"
 
 #  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:52
 #, fuzzy
 msgid "Backend busy"
@@ -2514,7 +2520,7 @@ msgstr "Hoidla offlain"
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei eksisteeri"
 
-#. E_BOOK_ERROR_NO_SELF_CONTACT
+#  E_BOOK_ERROR_NO_SELF_CONTACT
 #: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "No Self Contact defined"
@@ -2546,17 +2552,21 @@ msgstr "Mitte toetatud protokoll"
 #: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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"
 msgstr "Katkestatud"
 
 #  E_BOOK_ERROR_COULD_NOT_CANCEL
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#  E_BOOK_ERROR_COULD_NOT_CANCEL
 #: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Could not cancel"
@@ -2577,8 +2587,8 @@ msgstr "Autentimine on vajalik"
 msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#  E_BOOK_ERROR_CORBA_EXCEPTION
+#  E_BOOK_ERROR_NO_SUCH_SOURCE
 #: addressbook/gui/widgets/eab-gui-util.c:68
 #, fuzzy
 msgid "No such source"
@@ -2590,38 +2600,20 @@ msgid "Other error"
 msgstr "Muu viga"
 
 #: addressbook/gui/widgets/eab-gui-util.c:103
-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:110
-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:115
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid "
-"Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku "
-"kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution you must compile the program from the CVS sources after retrieving OpenLDAP from the link below."
+msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
 
 #: addressbook/gui/widgets/eab-gui-util.c:124
-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:141
 msgid "Unable to open addressbook"
@@ -2659,10 +2651,6 @@ msgstr "See päring ei lõpetanud edukalt."
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Unusta"
-
 #: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
@@ -2804,14 +2792,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"
 
@@ -2828,17 +2811,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:229
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#, c-format
 msgid "Query"
 msgstr "Päring"
 
@@ -2882,7 +2860,7 @@ msgstr "Edasijõudnutele..."
 #: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:250
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
@@ -2893,11 +2871,10 @@ msgstr "Aadressiraamat"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Save as VCard..."
-msgstr "Salvesta VKaardina"
+msgstr "Salvesta vKaardina..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -2936,10 +2913,14 @@ msgstr "Edasta kontakt"
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 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:1073
+#: 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"
 
@@ -2956,19 +2937,23 @@ msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: calendar/gui/calendar-component.c:428
+#: calendar/gui/tasks-component.c:363
+#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
@@ -3093,7 +3078,7 @@ msgstr "Raadio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:257
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -3190,9 +3175,8 @@ msgstr ""
 "Selles vaates kirjed puuduvad."
 
 #: addressbook/gui/widgets/e-minicard-view.c:453
-#, fuzzy
 msgid "Adapter"
-msgstr "Adrar"
+msgstr "Adapter"
 
 #: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
@@ -3206,18 +3190,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 ""
 
@@ -3241,12 +3225,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Prindi kontaktid"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Prindi kontakt"
 
@@ -3451,9 +3435,8 @@ msgid "OUTPUTFILE"
 msgstr "VÄLJUNDFAIL"
 
 #: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
 msgid "List local addressbook folders"
-msgstr "koos kõigi kohalike kalatoogidega"
+msgstr "Kohalike aadressiraamatute kaustade kuvamine"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
@@ -3469,8 +3452,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
@@ -3478,8 +3460,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
@@ -3524,7 +3505,8 @@ msgstr "Failinime ei esitatud."
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:37
+#: calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3634,8 +3616,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"
@@ -3731,23 +3712,20 @@ msgid "Position of the horizontal pane"
 msgstr "Horisontaalpaani asukoht"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-#, fuzzy
 msgid "Position of the horizontal pane in the month view"
-msgstr "Vertikaalpaani asukoht põhivaates"
+msgstr "Horisontaalpaani asukoht kuuvaates"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
 msgstr "Vertikaalpaani asukoht"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-#, fuzzy
 msgid "Position of the vertical pane in the month view"
-msgstr "Vertikaalpaani asukoht põhivaates"
+msgstr "Vertikaalpaani asukoht kuuvaates"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-#, fuzzy
 msgid "Position of the vertical pane in the task view"
-msgstr "Vertikaalpaani asukoht põhivaates"
+msgstr "Vertikaalpaani asukoht ülesandevaates"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
@@ -3804,7 +3782,8 @@ 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/calendar-commands.c:117
+#: calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:88
 #: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
@@ -3814,13 +3793,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?"
 
@@ -3831,40 +3806,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:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:19
+#: 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"
 
@@ -3880,7 +3872,7 @@ msgstr "Uus kalender"
 #: calendar/gui/calendar-component.c:623
 #, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "Kalendri laadimine..."
+msgstr "abiprogramm `%s' ebaõnnestus"
 
 #: calendar/gui/calendar-component.c:917
 #, c-format
@@ -3892,9 +3884,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
@@ -3992,7 +3982,8 @@ msgstr "Kommentaar sisaldab"
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:366
+#: camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -4069,7 +4060,8 @@ msgstr "Saaja"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4078,7 +4070,8 @@ msgid "extra times every"
 msgstr "korda, vahemikuga"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
+#: filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
@@ -4101,30 +4094,36 @@ 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 ""
+msgstr "GenericName=Meilide teadustaja"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 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:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -4184,9 +4183,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.c:278
 #, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+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
@@ -4205,7 +4202,8 @@ msgstr "_Värv:"
 msgid "Calendar Properties"
 msgstr "Kalendri atribuudid"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vali värvus"
 
@@ -4245,7 +4243,8 @@ msgstr "_Tüüp:"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#: filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
 
@@ -4255,8 +4254,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"
 
@@ -4270,18 +4271,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"
@@ -4358,7 +4365,7 @@ msgid "Display"
 msgstr "Kuva"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Lubamine"
 
@@ -4368,7 +4375,7 @@ msgstr "Vaba/Hõivatud info avalikustamine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:557
 msgid "Friday"
 msgstr "Reede"
 
@@ -4382,7 +4389,7 @@ msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -4392,7 +4399,7 @@ msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -4406,7 +4413,7 @@ 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/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -4420,7 +4427,7 @@ msgstr "_N"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:556
 msgid "Thursday"
 msgstr "Neljapäev"
 
@@ -4434,7 +4441,7 @@ msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -4444,7 +4451,7 @@ msgstr "_Nädala algus:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
@@ -4476,12 +4483,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:160 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"
@@ -4527,36 +4539,24 @@ msgid "before every appointment"
 msgstr "enne iga kokkusaamise algust"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele teate "
-"koosoleku ärajätmise kohta?"
+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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud koosoleku?"
 
 #: calendar/gui/dialogs/cancel-comp.c:66
-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 "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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
 
 #: calendar/gui/dialogs/cancel-comp.c:75
-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 "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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4577,8 +4577,7 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:75
 #, 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:77
 #, c-format
@@ -4600,9 +4599,7 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:99
 #, 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:101
 #, c-format
@@ -4642,7 +4639,8 @@ 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:1035
+#: calendar/gui/e-calendar-table.c:1175
+#: calendar/gui/e-calendar-view.c:1035
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvesta kui..."
@@ -4662,23 +4660,28 @@ msgstr "Praegust versiooni ei saa kasutada!"
 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 "
 
@@ -4722,27 +4725,10 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Kas sa tõesti soovid kustutada seda nimetut päeviku sissekannet?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
-msgstr[1] "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
-
 #: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Kas sa tõesti soovid kustutada ülesannet '%s'?"
-msgstr[1] "Kas sa tõesti soovid kustutada ülesannet '%s'?"
-
 #: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
-msgstr[1] "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
-
 #: calendar/gui/dialogs/delete-error.c:52
+#, c-format
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust ei saa tänu corba veale kustutada"
 
@@ -4802,7 +4788,8 @@ 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:201
+#: calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
@@ -4822,7 +4809,8 @@ 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:442
+#: ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Koosolek"
 
@@ -4834,7 +4822,8 @@ msgstr "Sündmus ilma alguskuupäevata"
 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:617
+#: calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
@@ -4918,15 +4907,26 @@ 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:3
-#: 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:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: 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:1559
+#: mail/mail-account-gui.c:1955
+#: 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"
 
@@ -4949,17 +4949,23 @@ 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:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 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/e-calendar-table.c:1042
+#: calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1310
+#: calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2562
+#: 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"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osavõtja"
@@ -4995,15 +5001,17 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-meeting-list-view.c:264
 #: 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-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -5071,8 +5079,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
@@ -5225,7 +5232,7 @@ msgstr "Salvesta sündmus"
 #: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
 msgid "Select destination"
-msgstr "Vali tegevus"
+msgstr "Vali sihtkoht %s"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5262,43 +5269,53 @@ msgstr "(%) _valmis"
 
 #: 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-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:958
+#: 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:956
+#: 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
-#: mail/message-list.c:957
+#: 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"
 
@@ -5348,8 +5365,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:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:976
+#: 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:"
 
@@ -5417,41 +5436,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"
 
@@ -5495,12 +5485,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:2346
 #, 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"
 
@@ -5515,7 +5507,7 @@ msgstr "Tähtaeg:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:944
 msgid "Status:"
 msgstr "Olek:"
 
@@ -5527,17 +5519,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"
@@ -5586,26 +5582,33 @@ 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-calendar-table.c:427
+#: calendar/gui/e-cal-model-calendar.c:166
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:683
+#: calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846
+#: calendar/gui/e-calendar-view.c:747
 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:1290 calendar/gui/e-calendar-view.c:1370
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1022
+#: calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
@@ -5613,43 +5616,66 @@ msgstr "A_va"
 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:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896
+#: mail/em-popup.c:690
+#: mail/em-popup.c:806
 #: 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:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 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:1025
+#: calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1269
+#: calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374
+#: 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:1297 calendar/gui/e-calendar-view.c:1340
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1297
+#: calendar/gui/e-calendar-view.c:1340
+#: 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:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 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:1030
+#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1298
+#: calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958
+#: mail/em-folder-tree.c:2555
+#: 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:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 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:1031
+#: calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1273
+#: calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372
+#: 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"
 
@@ -5669,7 +5695,8 @@ msgstr "_Märgi lõpetatuks"
 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:1043
+#: calendar/gui/e-calendar-table.c:1061
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
@@ -5683,8 +5710,10 @@ 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:4
+#: camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259
+#: mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5705,7 +5734,8 @@ 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-cal-list-view.etspec.h:4
+#: mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Kokkuvõte"
 
@@ -5713,23 +5743,28 @@ msgstr "Kokkuvõte"
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1264
+#: calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279
+#: ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
@@ -5737,7 +5772,8 @@ msgstr "Vali _tänane kuupäev"
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284
+#: ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
@@ -5757,11 +5793,13 @@ msgstr "_Ajasta koosolek..."
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1311
+#: calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1312
+#: calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
@@ -5773,7 +5811,8 @@ msgstr "Mine tänasele _päevale"
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378
+#: ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Sätted..."
 
@@ -5786,12 +5825,17 @@ msgid "Start Date"
 msgstr "Alguskuupäev"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: calendar/gui/e-cal-model.c:334
+#: calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159
+#: 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
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/imap4/camel-imap4-engine.c:1534
 #: camel/providers/imap4/camel-imap4-engine.c:1561
@@ -5800,8 +5844,10 @@ msgstr "Alguskuupäev"
 #: camel/providers/imap4/camel-imap4-store.c:1039
 #: camel/providers/imap4/camel-imap4-utils.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c: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"
@@ -5814,14 +5860,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:168 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:169
+#: 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:169 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:170
+#: calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
@@ -5833,7 +5884,8 @@ msgstr "Põ"
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304
+#: smime/lib/e-cert.c:629
 msgid "E"
 msgstr "Ida"
 
@@ -5852,13 +5904,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"
@@ -5875,27 +5937,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:592
 #: 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:595
 #: 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"
@@ -5905,407 +5979,391 @@ msgstr "%d. %b"
 msgid "%02i minute divisions"
 msgstr "Segmendilised alamjaotised"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:586
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: calendar/gui/e-itip-control.c:603
-#, fuzzy, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "Vahemikuga"
-msgstr[1] "Vahemikuga"
-
-#: calendar/gui/e-itip-control.c:608
-#, 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:610
+#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:612
 #, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/e-itip-control.c:618
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:619
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:632
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
-#, 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:649
-#, 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:660
+#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:663
 #, 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:669
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:687
 msgid "<b>Starts:</b> "
 msgstr "<b>Algus:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:697
 msgid "<b>Ends:</b> "
 msgstr "<b>Lõpp: </b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:717
 msgid "<b>Completed:</b> "
 msgstr "<b>Lõpetatud:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:727
 msgid "<b>Due:</b> "
 msgstr "<b>Tähtaeg:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:765
+#: calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:782
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880
+#: calendar/gui/e-itip-control.c:897
 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:910
-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:904
+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:925
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-meeting-list-view.c:181
+#: 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:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
-#: 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:957
+#: calendar/gui/e-meeting-list-view.c:182
+#: 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:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1098
+#: widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
 msgstr "Nõustu"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1084
 #, fuzzy
 msgid "Update respondent status"
 msgstr "GGV juhtimise staatus"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:1110
+#: 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:1192
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1192
 #, 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:1200
+#: calendar/gui/e-itip-control.c:1194
 #, 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:1201
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1199
 #, 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:1206
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1211
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1212
 #, 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:1219
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "Märgi kiri &saadetud kirjaks"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1260
 #, 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:1268
+#: calendar/gui/e-itip-control.c:1262
 #, 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:1269
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1267
 #, 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:1274
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1279
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1280
 #, 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:1287
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1316
 #, 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:1323
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1321
 #, 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:1328
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1326
 #, 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:1333
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1529
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1763
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1865
 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:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1809
+#: calendar/gui/e-itip-control.c:1847
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1819
 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:1837
+#: calendar/gui/e-itip-control.c:1831
 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:1856
+#: calendar/gui/e-itip-control.c:1850
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1853
 msgid "Object could not be found\n"
 msgstr "Objekti ei suudetud leida\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1856
 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:1865
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1862
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1893
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1916
+#: calendar/gui/e-itip-control.c:1964
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1968
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -6351,7 +6409,7 @@ msgid "Chair Persons"
 msgstr "Juhid"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:480
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
@@ -6363,66 +6421,83 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:140 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:141
+#: 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:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142
+#: 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:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143
+#: 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:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144
+#: 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:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155
+#: 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:155 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:156
+#: 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:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157
+#: 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:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158
+#: 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:179 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:180
+#: 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:182 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:183
+#: calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206
+#: calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184
+#: 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:400
+#: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
@@ -6491,16 +6566,28 @@ msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: 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"
 
@@ -6509,7 +6596,8 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:584
+#: calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6518,7 +6606,8 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
+#: calendar/gui/e-tasks.c:612
+#: calendar/gui/gnome-cal.c:2057
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
@@ -6555,8 +6644,10 @@ msgstr "Puhastamine"
 
 #: calendar/gui/e-tasks.c:960
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648
+#: calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -6587,12 +6678,14 @@ msgid "Purging"
 msgstr "Puhastamine"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
 msgid "*Control*F3"
-msgstr ""
+msgstr "Vahemälu-kontroll:"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
 msgid "*Control*F4"
-msgstr ""
+msgstr "Vahemälu-kontroll:"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
@@ -6698,7 +6791,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."
@@ -6707,19 +6801,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"
 
@@ -6755,26 +6853,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..."
 
@@ -6784,12 +6878,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:840
+#: calendar/gui/migration.c:708
+#: calendar/gui/migration.c:840
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6803,7 +6899,10 @@ msgstr "Kalendrit '%s' ei saa avada."
 #: calendar/gui/migration.c:869
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "Ei saa avada mooduli faili \"%s\"."
+msgstr ""
+"Ei saa käivitada käsku '%s'\n"
+"\n"
+"Info: %s"
 
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -6962,7 +7061,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"
 
@@ -6970,7 +7070,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"
@@ -7023,8 +7124,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"
 
@@ -7046,23 +7149,12 @@ msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/tasks-component.c:398
-#, fuzzy, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d kokku"
-msgstr[1] "%d kokku"
-
-#: calendar/gui/tasks-component.c:400 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:400
+#: mail/mail-component.c:500
 #: calendar/gui/tasks-component.c:447
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failed upgrading tasks."
-msgstr "Ülesannete laadimine"
+msgstr "Kalender ja ülesanded"
 
 #: calendar/gui/tasks-component.c:526
 #, c-format
@@ -7074,9 +7166,7 @@ msgid "There is no calendar available for creating tasks"
 msgstr ""
 
 #: calendar/gui/tasks-component.c:576
-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:804
@@ -7105,13 +7195,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
@@ -8779,13 +8867,15 @@ 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:667
+#: 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:711
+#: camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
@@ -8796,16 +8886,19 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 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:934
+#: camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1032
+#: camel/camel-filter-driver.c:1405
 #, 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:1041
+#: camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -8827,12 +8920,14 @@ msgstr "Võetakse vastu teadet %d (%d%%)"
 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:1137
+#: camel/camel-filter-driver.c:1149
 #, 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:1163
+#: camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
@@ -8857,10 +8952,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."
@@ -8870,12 +8965,12 @@ msgstr "Viga otsingu avaldises."
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toetamata operatsioon: lisa sõnum: %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toetamata operatsioon: otsing UID järgi: %s"
@@ -8888,15 +8983,22 @@ msgstr "Sõnumite liigutamine"
 msgid "Copying messages"
 msgstr "Sõnumite kopeerimine"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr ""
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Rämpsukontroll"
+
+#: camel/camel-folder.c:1682
+#, fuzzy
+msgid "Learning non-junk"
+msgstr "Sõnum on rämps"
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 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"
@@ -8905,14 +9007,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"
@@ -8921,7 +9025,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 ""
 
@@ -8969,9 +9074,12 @@ 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 mail/mail-ops.c:706
+#: 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
+#: mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
@@ -9003,21 +9111,27 @@ msgstr "gpg käivitamine ebaõnnestus: %s"
 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:1259
+#: 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:1273
+#: camel/camel-gpg-context.c:1702
 #: camel/camel-gpg-context.c:1753
 #, 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: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
 msgid "Failed to execute gpg."
 msgstr "gpg käivitamine ebaõnnestus."
 
@@ -9025,8 +9139,10 @@ msgstr "gpg käivitamine ebaõnnestus."
 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:1397
+#: camel/camel-gpg-context.c:1406
+#: 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"
@@ -9047,7 +9163,8 @@ msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 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:1661
+#: camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
@@ -9056,7 +9173,8 @@ msgstr "Krüpteeritud sisu"
 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!"
@@ -9086,7 +9204,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"
@@ -9145,12 +9264,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"
 
@@ -9158,7 +9279,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"
 
@@ -9188,7 +9310,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."
@@ -9201,7 +9324,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."
 
@@ -9237,24 +9361,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"
@@ -9290,9 +9406,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
@@ -9300,27 +9414,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
@@ -9340,10 +9446,12 @@ 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:1212
+#: camel/providers/imap/camel-imap-store.c:1243
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9378,7 +9486,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."
 
@@ -9392,9 +9501,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
@@ -9447,12 +9554,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"
@@ -9499,12 +9608,12 @@ msgstr "Ei leia \"%s\" programmifaili"
 #: camel/camel-smime-context.c:267
 #, fuzzy
 msgid "Cannot create CMS message"
-msgstr "Loo uus eemalolekusõnum"
+msgstr "CMS sõnumit ei saa luua"
 
 #: camel/camel-smime-context.c:272
 #, fuzzy
 msgid "Cannot create CMS signedData"
-msgstr "CMS andmeid ei saa manustada"
+msgstr "CMS sõnumit ei saa luua"
 
 #: camel/camel-smime-context.c:278
 #, fuzzy
@@ -9518,7 +9627,7 @@ msgstr "CMS andmeid ei saa manustada"
 #: camel/camel-smime-context.c:291
 #, fuzzy
 msgid "Cannot create CMS SignerInfo"
-msgstr "CMS andmeid ei saa manustada"
+msgstr "CMS sõnumit ei saa luua"
 
 #: camel/camel-smime-context.c:297
 #, fuzzy
@@ -9528,9 +9637,10 @@ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 #: camel/camel-smime-context.c:303
 #, fuzzy
 msgid "Cannot add CMS SigningTime"
-msgstr "CMS andmeid ei saa manustada"
+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."
@@ -9552,7 +9662,7 @@ msgstr "Vali sertifikaat [%1] krüptimise jaoks"
 #: camel/camel-smime-context.c:360
 #, fuzzy
 msgid "Cannot add CMS SignerInfo"
-msgstr "CMS andmeid ei saa manustada"
+msgstr "CMS RecipientInfo-t ei saa lisada"
 
 #: camel/camel-smime-context.c:430
 #, fuzzy
@@ -9564,7 +9674,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"
@@ -9622,7 +9733,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"
@@ -9632,7 +9744,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"
 
@@ -9744,12 +9857,14 @@ msgstr ""
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:387
+#: camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:437
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
@@ -9758,8 +9873,10 @@ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:813
+#: filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
@@ -9894,7 +10011,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:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9907,11 +10025,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:831
 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:831
 msgid "BAD"
 msgstr "HALB"
 
@@ -9999,7 +10119,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"
 
@@ -10034,9 +10155,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
@@ -10064,7 +10183,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:105
+#: camel/providers/pop3/camel-pop3-provider.c:71
+#: mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parool"
 
@@ -10203,8 +10323,7 @@ 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
@@ -10221,8 +10340,8 @@ msgstr "Teenu&sest võrgus teatamine"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:572
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10233,15 +10352,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL ei ole saadaval"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:846
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10251,14 +10370,12 @@ msgstr "Ühendus katkestatud"
 
 #: camel/providers/imap4/camel-imap4-store.c:261
 #, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
+msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
 #: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:711
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
@@ -10267,14 +10384,14 @@ msgstr "Ei saa luua ühendust LDAP serveriga"
 #: 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:1109
+#: camel/providers/pop3/camel-pop3-store.c:545
+#: shell/e-shell.c:1108
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
 #: camel/providers/imap4/camel-imap4-store.c:373
 #, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+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
@@ -10293,11 +10410,10 @@ 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/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1888
+#: camel/providers/imap/camel-imap-store.c:2266
 #, 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
@@ -10371,12 +10487,12 @@ msgstr "Konto tüüp: lahutatud IMAP konto"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3199
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3202
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -10442,13 +10558,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Sõnumite ei saa vastu võtta: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10458,14 +10567,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/imap/camel-imap-folder.c:2622
 #: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
@@ -10475,7 +10584,22 @@ msgstr "See sõnum ei ole hetkel kättesaadav"
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -10535,44 +10659,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS laiend ei ole toetatud."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:712
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:849
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "DCOP'iga pole võimalik registreerida.\n"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1273
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1283
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1306
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "Palun sisesta parool %1 jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1320
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1349
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10583,18 +10707,18 @@ msgstr ""
 "Serveri vastus:\n"
 "%2"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1870
+#: camel/providers/imap/camel-imap-store.c:2060
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1946
+#: camel/providers/imap/camel-imap-store.c:2327
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:2001
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10602,7 +10726,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2277
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu ülemkaust: %s"
@@ -10624,8 +10748,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"
 
@@ -10683,9 +10806,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
@@ -10715,9 +10836,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
@@ -10796,8 +10915,25 @@ msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Vigane sõnumi sisu"
 
@@ -10889,24 +11025,15 @@ msgstr "Postitamine katkestati!!!"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ei saa kätte sõnumit %s kaustast %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 #, fuzzy
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Sõnumi kokkupanek ebaõnnestus: Rikutud kirjakast?"
 
 #: camel/providers/local/camel-mbox-store.c:176
@@ -11254,8 +11381,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
@@ -11271,9 +11397,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:158
@@ -11405,7 +11529,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"
@@ -11423,7 +11548,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:104
+#: camel/providers/pop3/camel-pop3-provider.c:54
+#: mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11432,18 +11558,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
@@ -11466,9 +11585,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
@@ -11507,14 +11624,12 @@ msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 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
@@ -11530,8 +11645,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
@@ -11561,7 +11675,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:119
+#: camel/providers/smtp/camel-smtp-provider.c:37
+#: mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11852,7 +11967,8 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:295
+#: mail/em-utils.c:408
 msgid "attachment"
 msgstr "manus"
 
@@ -11898,15 +12014,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
@@ -11927,7 +12040,8 @@ msgstr "Pealkirjata sõnum"
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998
+#: mail/mail-account-gui.c:1479
 msgid "Autogenerated"
 msgstr "Automaatselt genereeritud"
 
@@ -11936,21 +12050,18 @@ 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:3234
 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:2347
+#: composer/e-msg-composer.c:3113
 #: composer/e-msg-composer.c:3114
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
@@ -11982,15 +12093,12 @@ msgstr ""
 "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>"
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 msgstr ""
 
 #: composer/e-msg-composer-hdrs.c:512
-#, fuzzy
 msgid "Posting destination"
-msgstr "Vigane sihtkoht"
+msgstr "Postituse sihtkoht"
 
 #: composer/e-msg-composer-hdrs.c:513
 #, fuzzy
@@ -12047,9 +12155,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
@@ -12057,24 +12163,22 @@ msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 #  * Post-To
 #  * Post-To
 #  * Post-To
-#.
-#. * Post-To
-#.
+#  * Post-To
+#  * Post-To
 #: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
 msgstr "Postita gruppi "
 
 #: composer/e-msg-composer-hdrs.c:619
-#, fuzzy
 msgid "Click here to select folders to post to"
-msgstr "Vea valimiseks numbri järgi klõpsa siia"
+msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
 #: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#. mail-composer:no-attach primary
+#  mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `${0}' to this message."
@@ -12097,18 +12201,16 @@ 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
+#  mail-composer:recover-autosave title
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
 msgid "Unfinished messages found"
 msgstr "Topeltkirju ei leitud."
 
-#. mail-composer:recover-autosave primary
+#  mail-composer:recover-autosave primary
 #: composer/mail-composer-errors.xml.h:14
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
@@ -12118,94 +12220,84 @@ 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
-#, fuzzy
 msgid "Don't Recover"
-msgstr "Ä_ra taasta"
+msgstr "Ära taasta"
 
 #: composer/mail-composer-errors.xml.h:18
-#, fuzzy
 msgid "Recover"
-msgstr "_Taasta"
+msgstr "Taasta"
 
-#. mail-composer:no-autosave primary
+#  mail-composer:no-autosave primary
 #: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ajutisse faili kirjutamine ei õnnestunud."
 
-#. mail-composer:no-autosave secondary
+#  mail-composer:no-autosave secondary
 #: 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
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
-#. mail-composer:exit-unsaved primary
+#  mail-composer:exit-unsaved primary
+#  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
-#, fuzzy
 msgid "Discard Changes"
-msgstr "unustatakse muudatused"
+msgstr "Loobu muudatustest"
 
 #: composer/mail-composer-errors.xml.h:30
-#, fuzzy
 msgid "Save Message"
-msgstr "Sõnumi salvestamine..."
+msgstr "Salvesta sõnum"
 
+#  mail-composer:no-build-message primary
 #. mail-composer:no-build-message primary
 #: composer/mail-composer-errors.xml.h:32
-#, fuzzy
 msgid "Could not create message."
-msgstr "Sõnumi saatmine ebaõnnestus"
+msgstr "Sõnumit ei saa luua."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
 msgid "Because \"${0}\", you may need to select different mail options."
 msgstr "Kuna \"${0}\", pead sa valima teised kirjade sätted."
 
+#  mail-composer:no-sig-file primary
 #. mail-composer:no-sig-file primary
 #: composer/mail-composer-errors.xml.h:36
-#, fuzzy
 msgid "Could not read signature file \"{0}\"."
-msgstr "Signatuurifaili: %s ei õnnestu salvestada"
+msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
 
 #. mail-composer:no-sig-file secondary
 #: composer/mail-composer-errors.xml.h:38
 msgid "Because \"${1}\"."
 msgstr "Kuna \"${1}\"."
 
+#  mail-composer:all-accounts-deleted primary
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
-#, fuzzy
 msgid "All accounts have been removed."
-msgstr "Kas võib KÕIK tõlked failist '%s' eemaldada?"
+msgstr "Kõik kontod on kustutatud."
 
+#  mail-composer:all-accounts-deleted secondary
 #. mail-composer:all-accounts-deleted secondary
 #: composer/mail-composer-errors.xml.h:42
 msgid "You need to configure an account before you can compose mail."
@@ -12244,8 +12336,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"
@@ -12285,10 +12376,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
@@ -12317,9 +12406,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
@@ -12331,7 +12418,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?"
 
@@ -12340,9 +12428,8 @@ msgid "Remember this password"
 msgstr "Jäta see parool meelde"
 
 #: e-util/e-passwords.c:360
-#, fuzzy
 msgid "Remember this password for the remainder of this session"
-msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
+msgstr "Jäta see parool meelde kuni selle sessiooni lõpuni"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -12366,7 +12453,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"
 
@@ -12376,7 +12466,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"
 
@@ -12455,25 +12548,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"
 
@@ -12483,59 +12590,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"
 
@@ -12570,7 +12637,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"
 
@@ -12594,14 +12663,16 @@ msgstr "Kausta valimine on kohustuslik."
 msgid "Bad regular expression \"{0}\"."
 msgstr "Vigane regulaaravaldis \"{0}\"."
 
+#  filter:bad-regexp secondary
 #. filter:bad-regexp secondary
 #: filter/filter-errors.xml.h:20
-#, fuzzy
 msgid "Could not compile regular expression \"{1}\"."
-msgstr "ei vasta regulaaravaldisele"
+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."
 
@@ -12650,12 +12721,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:1335
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
 #: filter/filter.glade.h:1
+#: mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12715,7 +12788,8 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19
+#: mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekundit"
 
@@ -12747,28 +12821,36 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121
+#: filter/libfilter-i18n.h:26
+#: mail/em-migrate.c:1011
+#: mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tähtis"
 
 #  forest green
 #  forest green
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: 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"
 
 #  blue
 #  blue
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: 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"
 
@@ -12793,24 +12875,22 @@ msgid "Execute actions"
 msgstr "Tegevused viiakse täide"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "All related"
-msgstr "Delegeeritud"
+msgstr "Kõik seonduvad"
 
 #: filter/filter-rule.c:877
-#, fuzzy
 msgid "Replies"
-msgstr "Adressaadid"
+msgstr "Vastused"
 
 #: filter/filter-rule.c:877
 #, fuzzy
 msgid "Replies and parents"
-msgstr "Vastatud kellele"
+msgstr "_Tekst ja ikoon"
 
 #: filter/filter-rule.c:879
 #, fuzzy
 msgid "Include threads"
-msgstr "Lisa:"
+msgstr "_Loetud teemalõngad:"
 
 #: filter/filter-rule.c:974
 msgid "incoming"
@@ -12950,7 +13030,8 @@ msgstr "ei ole märgistatud"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
+#: filter/libfilter-i18n.h:37
+#: mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -12988,7 +13069,8 @@ msgstr "Käivitatav programm"
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
+#: filter/libfilter-i18n.h:46
+#: mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Loetud"
 
@@ -13020,7 +13102,9 @@ msgstr "tagastab vähem kui"
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:54
+#: filter/score-rule.c:184
+#: filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
@@ -13057,9 +13141,13 @@ msgstr "algab"
 msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
-#: filter/libfilter-i18n.h:64 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
+#: filter/libfilter-i18n.h:64
+#: 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:1079
 msgid "Subject"
 msgstr "Teema"
@@ -13123,7 +13211,6 @@ msgid "Virtual _Folders"
 msgstr "Virtuaalsed _kaustad"
 
 #: filter/vfolder-rule.c:493
-#, fuzzy
 msgid "_Add"
 msgstr "_Lisa"
 
@@ -13145,7 +13232,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"
@@ -13214,16 +13302,16 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166
+#: mail/em-folder-tree.c:2282
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
 #: mail/em-folder-selector.c:299
-#, fuzzy
 msgid "Create"
-msgstr "Kataloogi loomine"
+msgstr "Loo"
 
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
@@ -13240,12 +13328,14 @@ msgstr "Kausta %s liigutamine"
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:848
+#: mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:850
+#: mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
@@ -13255,105 +13345,125 @@ msgstr "Sõnumite kopeerimine %s kausta"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:956
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:957
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:959
+#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2556
+#: mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Liiguta"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:961
+#: mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
-msgstr "Tühista ülesanne"
+msgstr "Lohistamise pide"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2056
+#: mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
-#, fuzzy
+#: mail/em-folder-tree.c:2056
+#: mail/em-folder-view.c:812
 msgid "C_opy"
-msgstr "Kopeeri"
+msgstr "K_opeeri"
 
 #: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2282
+#: mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2477
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2479
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2545 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:35
+#: mail/em-folder-tree.c:2550
+#: 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:35
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2551
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2560
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2563
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2566
+#: 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/em-folder-tree-model.c:199
+#: mail/em-folder-tree-model.c:201
 #: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "VKaustad"
 
 #  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
+#  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:778
+#: mail/em-folder-tree-model.c:469
+#: mail/em-folder-tree-model.c:778
 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:551
+#: 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
 msgid "Mail"
 msgstr "E-Post"
 
@@ -13361,7 +13471,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:689
+#: mail/em-folder-view.c:895
+#: mail/em-popup.c:689
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
@@ -13370,21 +13481,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:810
+#: mail/em-folder-view.c:901
+#: mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902
+#: mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903
+#: mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
@@ -13401,7 +13516,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"
 
@@ -13417,11 +13533,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"
 
@@ -13433,7 +13551,8 @@ 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..."
 
@@ -13487,8 +13606,9 @@ msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1710
+#: mail/em-folder-view.c:1750
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "UTF-8"
 
@@ -13505,38 +13625,55 @@ msgstr "Kopeeri _lingi asukoht"
 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: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:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757
+#: mail/em-format-html.c:1584
+#: mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
@@ -13545,7 +13682,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"
 
@@ -13569,20 +13707,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"
 
@@ -13591,19 +13733,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"
 
@@ -13641,7 +13787,8 @@ msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
 #. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-format-html.c:1523
+#: mail/em-format-quote.c:309
 #: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Postiprogramm:"
@@ -13675,24 +13822,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
@@ -13700,35 +13838,23 @@ 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
@@ -13784,65 +13910,62 @@ msgstr "Kord nädalas"
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: mail/em-migrate.c:1072
+#: 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..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Kausta `%s' ei saa luua: %s"
+msgstr "Ei suuda luua uut kataloogi"
 
-#: mail/em-migrate.c:1532
-#, fuzzy, c-format
+#: mail/em-migrate.c:1628
+#, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
+msgstr "Kausta `%s' ei saa kopeerida `%s': %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: 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"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/em-migrate.c:2498
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: mail/em-migrate.c:2594
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:699
@@ -13888,7 +14011,8 @@ 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
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
@@ -13924,7 +14048,8 @@ msgstr "Aadressi lisamine"
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
-#. Drop filename for messages from a mailbox
+#  Drop filename for messages from a mailbox
+#  Drop filename for messages from a mailbox
 #: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
@@ -14040,10 +14165,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
@@ -14064,9 +14186,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
@@ -14074,9 +14194,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
@@ -14092,14 +14210,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"
@@ -14173,8 +14285,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
@@ -14188,17 +14299,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"
@@ -14264,12 +14371,12 @@ msgstr "Õigekirja kontrolli ettevalmistamine"
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Subscribe dialog default height"
-msgstr "Muuda rea kõrguse vaikeväärtust"
+msgstr "Tellimisdialoogi kõrguse vaikeväärtus"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Subscribe dialog default width"
-msgstr "Muuda veergude laiuse vaikeväärtust"
+msgstr "Tellimisdialoogi laiuse vaikeväärtus"
 
 #: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
@@ -14288,11 +14395,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
@@ -14320,7 +14423,7 @@ msgstr ""
 #: mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
 msgid "UID string of the default account."
-msgstr "See konto on minu _vaikimisi konto"
+msgstr "Määra see konto minu _vaikimisi kontoks"
 
 #: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
@@ -14355,29 +14458,24 @@ msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:97
-#, fuzzy
 msgid "View/Bcc menu item is checked."
-msgstr "Vaade/Bcc menüüelement on valitud"
+msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
 #: mail/evolution-mail.schemas.in.in.h:98
-#, fuzzy
 msgid "View/Cc menu item is checked"
-msgstr "Vaade/Bcc menüüelement on valitud"
+msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
 #: mail/evolution-mail.schemas.in.in.h:99
-#, fuzzy
 msgid "View/Cc menu item is checked."
-msgstr "Vaade/Bcc menüüelement on valitud"
+msgstr "Vaade/Koopia menüüelement on valitud."
 
 #: mail/evolution-mail.schemas.in.in.h:100
-#, fuzzy
 msgid "View/From menu item is checked"
-msgstr "Vaade/Bcc menüüelement on valitud"
+msgstr "Vaade/Kellelt menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:101
-#, fuzzy
 msgid "View/From menu item is checked."
-msgstr "Vaade/Bcc menüüelement on valitud"
+msgstr "Vaade/Kellelt menüüelement on valitud."
 
 #: mail/evolution-mail.schemas.in.in.h:102
 #, fuzzy
@@ -14392,7 +14490,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/Bcc menüüelement on valitud"
+msgstr "Vaade/Vast menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:105
 #, fuzzy
@@ -14400,9 +14498,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
@@ -14414,8 +14510,9 @@ msgid "spamd port"
 msgstr "spamd port"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
 msgid "*Control*F1"
-msgstr ""
+msgstr "Vahemälu-kontroll:"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
@@ -14423,8 +14520,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
@@ -14468,14 +14564,14 @@ 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:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Meili häälestus"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
 msgid "_Mail"
-msgstr "_Post:"
+msgstr "_Post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14484,14 +14580,16 @@ msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:226
-#: 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:222
 #: mail/importers/evolution-outlook-importer.c:228
-#: 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"
 
@@ -14675,15 +14773,18 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954
+#: mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958
+#: mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962
+#: mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
@@ -14746,33 +14847,33 @@ msgstr "%d kokku"
 msgid ", %d unread"
 msgstr ", %d lugemata"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14780,301 +14881,294 @@ 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:89
+#: 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.glade.h:116
+#: 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:128
+#: 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:35
+#: 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:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL toetus ei ole selles evolutioni ehituses saadaval</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_Allkirjad</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Konto informatsioon</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmid</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentimise tüüp</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Uute sõnumite kontrollimine</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sõnumite koostamine</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguratsioon</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad kirjapäised</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri häälestus</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Märgid ja värvid</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Piltide laadimine</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Sõnumikuva</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uute sõnumite kontrollimine</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslik informatsioon</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Häälestus</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslik informatsioon</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Kaitstud MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Kaitse</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri konfiguratsioon</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "_Uue allkirja lisamine..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati saada koopia (cc):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati saada _pimekoopia (cc):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47
+#: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Kontrolli uusi sõnumeid automaatselt"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "_Sissetulevate kirjade kontrollimine"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Otsi sissetuleva posti seest rämpsu"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Kon_trolli trükkimise ajal õigekirja"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Kontrolli sissetulevate kirjade seest rämpsu"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Hilinenud ülesannete värvus"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Värvid"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Kinnituse küsimine enne kataloogis asendamist"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15090,274 +15184,269 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Vaikekodeering:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Originaalsõnumite ei tsiteerita"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74
+#: shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Meilikontod"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "_Meiliaadress:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikastid"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "_Krüpteerimissertifikaat:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Käsu käivitamine..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML'is"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML post"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Päised"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Käivita _failiga..."
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
 #, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Aeg testidele"
+
+#: mail/mail-config.glade.h:94
+#, fuzzy
 msgid "Inline"
 msgstr "Edasta tekst&ina..."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Meili konfiguratsioon"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Kirjakasti asukoht"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: mail/mail-config.glade.h:101
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+#: mail/mail-config.glade.h:104
+msgid "Note: you will not be prompted for a password until you connect for the first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 
-#: mail/mail-config.glade.h:109
+#: 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:110
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir otsingutee:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Originaalkirja tsiteerimine"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Autentimise (taas)saatmine kasutajale"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Vastuvõtmise häälestus"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Parooli _meeldejätmine"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Tavaline kirjatüüp:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali printimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Vali printimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Vali..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Serveri _tüüp:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "T_erminali kirjatüüp"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Tüüp:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
-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."
+#: 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."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "_Deemoni kasutamine"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15367,89 +15456,85 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Alati lae pildid Internetist"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Lubamine"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Väljuvate sõnumite _krüpteerimine (vaikimisi)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Piltide laadimine, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Ainult lokaalsed testid"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Määra see konto minu _vaikimisi kontoks"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Kunagi ära lae ühtegi pilti Internetist"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Täpsustus, kui püütakse saata sõnumit ilma teemata"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Animeeritud piltide kuvamine"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Turvalise ühenduse kasutamine (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Kasuta sama kirjatüüpi, mis teisedki rakendused"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "värv"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "kirjeldus"
 
@@ -15460,101 +15545,82 @@ 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
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 
-#. mail:camel-service-auth-failed secondary
+#  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
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
+#  mail:ask-send-html secondary
 #. 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"
 
-#. mail:ask-send-no-subject primary
+#  mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
+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/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
-#, fuzzy
+#  mail:ask-send-only-bcc-contact primary
+#  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 ""
-"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
-"pimekoopia adressaadid"
+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
 #: mail/mail-errors.xml.h:24
 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
@@ -15564,9 +15630,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
@@ -15574,16 +15638,16 @@ msgstr ""
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#. mail:ask-expunge primary
+#  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 ""
 
@@ -15591,12 +15655,10 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#. mail:ask-empty-trash primary
+#  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
@@ -15610,9 +15672,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
@@ -15623,10 +15683,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
@@ -15650,10 +15708,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}"
 
@@ -15678,7 +15747,10 @@ msgid "{1}"
 msgstr "{1}"
 
 #. 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."
@@ -15694,8 +15766,13 @@ msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi ei saa luua."
 
 #. mail:no-create-tmp-path secondary
-#: 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
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
+#: 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}\"."
 
@@ -15720,10 +15797,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
@@ -15743,18 +15820,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."
 
@@ -15764,22 +15843,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."
 
@@ -15794,7 +15881,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."
 
@@ -15837,7 +15926,7 @@ msgstr "Signatuurifaili ei saa salvestada."
 msgid "Because \"{0}\"."
 msgstr "Kuna \"{0}\"."
 
-#. mail:signature-notscript primary
+#  mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
 #, fuzzy
 msgid "Cannot set signature script \"{0}\"."
@@ -15874,9 +15963,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
@@ -15924,32 +16011,27 @@ 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 ""
+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"
 
 #: mail/mail-errors.xml.h:218
-#, fuzzy
 msgid "_Append"
-msgstr "_Saada"
+msgstr "_Lisa"
 
 #: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Töötamine"
-
 #: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
@@ -16046,7 +16128,8 @@ msgstr "Konto %s salvestamine"
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
@@ -16065,19 +16148,7 @@ msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
 #: mail/mail-ops.c:1764
-#, 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:1850
-#, 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:1900
 #, c-format
 msgid ""
@@ -16179,28 +16250,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:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas töö."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Jäta see parool meelde"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
 
@@ -16246,14 +16318,14 @@ msgid "Setting up vfolder: %s"
 msgstr "vKausta ülesseadmine: %s"
 
 #: mail/mail-vfolder.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s:%s'"
-msgstr "vkaustade uri: %s uuendamine"
+msgstr "'%s:%s' vkaustade uuendamine"
 
 #: mail/mail-vfolder.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s'"
-msgstr "vkaustade uri: %s uuendamine"
+msgstr "'%s' vKaustade uuendamine"
 
 #: mail/mail-vfolder.c:959
 msgid "vFolders"
@@ -16267,67 +16339,67 @@ msgstr "vKausta redigeerimine"
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -16336,9 +16408,8 @@ msgid "Due By"
 msgstr "Tähtaeg:"
 
 #: mail/message-list.etspec.h:4
-#, fuzzy
 msgid "Flag Status"
-msgstr "Olekutekst"
+msgstr "Sildi olek"
 
 #: mail/message-list.etspec.h:5
 msgid "Flagged"
@@ -16377,7 +16448,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"
 
@@ -16386,11 +16458,13 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Käsule %s ei tulnud vastust."
 
-#: 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"
 
@@ -16398,7 +16472,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"
@@ -16467,20 +16542,15 @@ 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
@@ -16499,33 +16569,34 @@ msgstr "kirjad"
 msgid "Brought to you by"
 msgstr "Teieni tõid"
 
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:545
+#: shell/e-shell.c:546
 #, fuzzy, c-format
 msgid "%ld KB"
-msgstr "%d. %B"
+msgstr "%.0f kb/s"
 
-#: shell/e-shell.c:744
-#, fuzzy
+#: shell/e-shell.c:743
 msgid "Uknown system error."
-msgstr "Tundmatu viga"
+msgstr "Tundmatu süsteemi viga."
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1100
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1102
 msgid "Cannot register on OAF"
 msgstr "OAF'i ei saa registreerida"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1104
 msgid "Configuration Database not found"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1106
 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)"
 
@@ -16535,18 +16606,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:"
 
@@ -16558,7 +16628,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"
@@ -16571,7 +16642,8 @@ msgstr ""
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451
+#: shell/e-shell-importer.c:1026
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
@@ -16585,7 +16657,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"
@@ -16624,7 +16697,8 @@ msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:723
+#: shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16637,7 +16711,8 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:853
+#: shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
@@ -16669,9 +16744,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 ""
@@ -16699,9 +16772,7 @@ msgstr "'.' ja '..' on reserveeritud kaustanimed."
 #: shell/e-shell-window.c:336
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse "
-"siirdumiseks vajuta seda nuppu."
+msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
 
 #: shell/e-shell-window.c:343
 #, fuzzy
@@ -16711,14 +16782,12 @@ msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 #: shell/e-shell-window.c:349
 #, 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:621
 #, fuzzy, c-format
 msgid "Switch to %s"
-msgstr "Meiliaadressile"
+msgstr "Lülitumine: %1"
 
 #: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16746,11 +16815,13 @@ msgstr "Ximian Evolutionist"
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395
+#: ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408
+#: ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -16762,35 +16833,6 @@ msgstr "Kontrollkast"
 msgid "New"
 msgstr "Uus"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Tundmatu viga."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uus test"
@@ -16943,7 +16985,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"
 
@@ -17036,11 +17079,9 @@ 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"
+"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."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
 
 #. shell:upgrade-failed primary
@@ -17055,28 +17096,29 @@ msgstr ""
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\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 "Ühendamine"
+msgstr "Jätka"
 
 #. shell:noshell title
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#. shell:noshell-reason title
+#: shell/shell-errors.xml.h:17
+#: shell/shell-errors.xml.h:25
 #, fuzzy
 msgid "Cannot start Evolution"
-msgstr ""
-"Tänud\n"
-"Ximian Evolution'i meeskond\n"
+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
+#. shell:noshell-reason primary
+#: shell/shell-errors.xml.h:19
+#: shell/shell-errors.xml.h:27
 #, fuzzy
 msgid "Evolution can not start."
-msgstr "Evolution'i kontoassistent"
+msgstr "EI saa käivitada wombatit"
 
 #. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
@@ -17096,21 +17138,25 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:128
+#: smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:243
+#: smime/gui/certificate-manager.c:409
 #: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:251
+#: smime/gui/certificate-manager.c:425
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259
+#: smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -17164,6 +17210,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr "Näita lõimedena ka teema &järgi"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "_Vali sertifikaat"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ei ole sertifikaadi osa>"
@@ -17217,12 +17268,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:1024
+#: smime/gui/smime-ui.glade.h:14
+#: smime/lib/e-cert.c:1024
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -17293,11 +17343,13 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34
+#: smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35
+#: smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
@@ -17330,8 +17382,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-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:45
@@ -17342,7 +17393,8 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:234
+#: smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17454,11 +17506,13 @@ msgstr "Teema avaliku võtme info"
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:757
+#: smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit ei saa töödelda"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:778
+#: smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -17504,7 +17558,8 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:888
+#: smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -17517,7 +17572,8 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1039
+#: smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -17538,7 +17594,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:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
@@ -17601,7 +17657,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"
 
@@ -17609,7 +17666,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"
 
@@ -17625,7 +17683,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"
 
@@ -17633,8 +17692,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"
@@ -17684,17 +17745,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:25
+#: 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:25
 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..."
 
@@ -17702,14 +17770,15 @@ 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"
 
 #: ui/evolution-addressbook.xml.h:41
 #, fuzzy
 msgid "_Save as VCard..."
-msgstr "_Salvesta VKaardina"
+msgstr "Salvesta VKaardina"
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -17759,7 +17828,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"
 
@@ -17767,7 +17837,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"
 
@@ -17779,7 +17850,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"
 
@@ -17819,7 +17891,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"
@@ -17840,16 +17913,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:3
 msgid "Close"
 msgstr "Sulge"
@@ -17858,12 +17934,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:11
+#: 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:11
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -17871,23 +17950,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"
@@ -17901,11 +17984,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:27
 msgid "_File"
 msgstr "_Fail"
@@ -17914,7 +17999,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"
 
@@ -17926,7 +18012,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"
@@ -17982,11 +18069,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"
 
@@ -18071,11 +18160,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"
 
@@ -18096,8 +18187,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
@@ -18108,7 +18198,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"
 
@@ -18156,7 +18247,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"
 
@@ -18164,12 +18256,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:4
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "Sul_ge"
@@ -18573,7 +18667,8 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129
+#: ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18589,7 +18684,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"
 
@@ -18605,7 +18701,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"
 
@@ -18973,9 +19070,8 @@ msgid "_Send / Receive"
 msgstr "_Saada / Võta vastu"
 
 #: ui/evolution.xml.h:36
-#, fuzzy
 msgid "_Window"
-msgstr "Uus _aken"
+msgstr "_Aken"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -19043,7 +19139,7 @@ msgid "With _Status"
 msgstr "_Staatusega"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19061,8 +19157,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"
@@ -19101,7 +19196,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"
 
@@ -19162,13 +19258,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"
 
@@ -19185,7 +19284,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"
 
@@ -19201,32 +19301,32 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: 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:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr "Evolutioni info"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr "Evolutioni päring"
 
 #  setup a dummy error
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, 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"
@@ -19245,9 +19345,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
@@ -19296,15 +19394,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..."
 
@@ -19320,7 +19421,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"
 
@@ -19360,93 +19462,13 @@ msgstr "Faili \"{0}\" pole võimalik salvestada."
 msgid "Cannot open file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa avada."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#, fuzzy
-#~ msgid "UID of the contacts source that the view will display"
-#~ msgstr "URI, mida kalender näitab"
-
-#, fuzzy
-#~ msgid "The URI that the address book will display"
-#~ msgstr "URI, mida kaustalehitseja näitab"
-
-#, fuzzy
-#~ msgid "Evolution Addressbook folder viewer"
-#~ msgstr "Evolutioni aadressiraamatu aadressikuva"
-
-#~ msgid "Could not initialize gnome-vfs"
-#~ msgstr "Ei saa gnome-vfs initsialiseerida"
-
-#~ msgid "Could not open the folder in '%s'"
-#~ msgstr "Ei saa avada kausta '%s'"
-
-#~ msgid "The URI that the calendar will display"
-#~ msgstr "URI, mida kalender näitab"
-
-#~ msgid "The type of view to show"
-#~ msgstr "Vaate tüüp näitamiseks"
-
-#~ msgid "Display a message"
-#~ msgstr "Näita teadet"
-
-#  create the dialog
-#  create the dialog
-#~ msgid "Select source"
-#~ msgstr "Vali lähte "
-
-#~ msgid "Calendar file could not be updated!\n"
-#~ msgstr "Kalendrifaili ei saa uuendada!\n"
-
-# !PARANDA!
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Evolution'i kalendrivaa"
-
-#, fuzzy
-#~ msgid "Evolution Tasks viewer"
-#~ msgstr "Evolution'i kalendrivaa"
-
-#~ msgid "The URI of the tasks folder to display"
-#~ msgstr "Kuvatava ülesannete kausta URI"
-
-#~ msgid "Could not load the tasks in `%s'"
-#~ msgstr "Ei saa laadida '%s' ülesandeid"
-
-#~ msgid ""
-#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
-#~ "\""
-#~ msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
-
-#, fuzzy
-#~ msgid "Failed to migrate pop3 uid caches: %s"
-#~ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
-
-#, fuzzy
-#~ msgid "Failed to migrate folder expand state: %s"
-#~ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
-
-#, fuzzy
-#~ msgid "Failed to open store for `%s': %s"
-#~ msgstr "'%s' avamine kirjutamiseks ebaõnnestus: %s"
-
-# !PARANDA!
-#, fuzzy
-#~ msgid "Evolution Mail folder viewer"
-#~ msgstr "Saa&detud kirjade kaust:"
-
-#, fuzzy
-#~ msgid "URI of the mail source that the view will display"
-#~ msgstr "URI, mida kalender näitab"
-
-#~ msgid "_Resend..."
-#~ msgstr "_Uuestisaatmine..."
-
-#~ msgid "Because \"{1}\""
-#~ msgstr "Kuna \"${1}\""
author	Priit Laes <plaes@cvs.gnome.org>	2004-05-22 16:13:31 +0800
committer	Priit Laes <plaes@src.gnome.org>	2004-05-22 16:13:31 +0800
commit	91d3a80df6d9fd738ad7db4b5daf2342e55ec126 (patch)
tree	4f8ef154cf968bc59f5e714e8a483d40daebf6f1
parent	a46aa4c5f75040be6df3f64e074ddcf5f2988b3b (diff)
download	gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.tar.gz gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.tar.zst gsoc2013-evolution-91d3a80df6d9fd738ad7db4b5daf2342e55ec126.zip