Translation updated by Ivar Smolin.

2005-08-10  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated by Ivar Smolin.

svn path=/trunk/; revision=30074

1 files changed, 340 insertions, 306 deletions

diff --git a/po/et.po b/po/et.po
index 39b05a9137..2f8dfd6d65 100644
--- a/po/et.po
+++ b/po/et.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-04 05:34+0000\n"
-"PO-Revision-Date: 2005-08-04 17:26+0300\n"
+"POT-Creation-Date: 2005-08-09 05:43+0000\n"
+"PO-Revision-Date: 2005-08-09 17:10+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -568,7 +568,7 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #. create the local source group
-#. On This Computer is always first and vFolders is always last
+#. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
 #: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
@@ -672,7 +672,7 @@ msgstr "Autentimine"
 
 #: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
@@ -842,7 +842,7 @@ msgstr "Millal kuvada eelvaatluspaani."
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -903,7 +903,7 @@ msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Alati"
 
@@ -938,7 +938,7 @@ msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Mitte kunagi"
 
@@ -1106,7 +1106,7 @@ msgstr "kaardid"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1946
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -3550,11 +3550,11 @@ msgstr "GTK Puuvaade"
 msgid "Importing ..."
 msgstr "Importimine ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:651
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:653
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
@@ -4176,7 +4176,7 @@ msgid "_Save"
 msgstr "_Salvesta"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:121
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Saada"
 
@@ -4747,7 +4747,7 @@ msgstr "Puudub"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2081
+#: ../calendar/gui/gnome-cal.c:2094
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
@@ -5040,8 +5040,8 @@ msgstr "%.0fG"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
 #: ../calendar/gui/dialogs/comp-editor.c:2426
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:439
-#: ../mail/em-utils.c:476 ../widgets/misc/e-attachment-bar.c:336
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:336
 msgid "attachment"
 msgstr "manus"
 
@@ -5953,12 +5953,12 @@ msgstr "<b>Saatja:</b>"
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2121
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:464
+#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1607
+#: ../plugins/itip-formatter/itip-formatter.c:1613
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
 #: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
@@ -6530,7 +6530,7 @@ msgstr "Alguskuupäev"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Kokkuvõte"
 
@@ -6576,9 +6576,9 @@ msgstr "Ei"
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1239
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:238
-#: ../plugins/itip-formatter/itip-formatter.c:1632
+#: ../plugins/itip-formatter/itip-formatter.c:1638
 #: ../plugins/plugin-manager/plugin-manager.c:72
 #: ../widgets/misc/e-attachment-bar.c:643
 #: ../widgets/misc/e-charset-picker.c:62
@@ -6990,12 +6990,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1626
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
 #: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1623
+#: ../plugins/itip-formatter/itip-formatter.c:1629
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
@@ -7003,7 +7003,7 @@ msgstr "Proovinõusolek antud"
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1632
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
@@ -7390,7 +7390,7 @@ msgstr "Katseline"
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Delegated"
 msgstr "Delegeeritud"
 
@@ -7485,7 +7485,7 @@ msgstr "Vajalikud inimesed ja _üks ressurss"
 msgid "Enter the password for %s"
 msgstr "Sisesta parool %s jaoks"
 
-#: ../calendar/gui/e-tasks.c:797 ../calendar/gui/gnome-cal.c:2519
+#: ../calendar/gui/e-tasks.c:797 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7531,36 +7531,36 @@ msgid "Updating query"
 msgstr "Päringu uuendamine"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2196 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2197 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2202 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2365
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2384
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2485
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3375
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -9730,7 +9730,7 @@ msgid "Open File"
 msgstr "Ava fail"
 
 #: ../composer/e-msg-composer.c:2005 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
@@ -10050,7 +10050,7 @@ msgstr "Kas sa soovid seda üle kirjutada?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fail &quot;{0}&quot; on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:120
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -10285,10 +10285,11 @@ msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:978
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Väljaminev"
 
@@ -10494,50 +10495,50 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:760
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:1938
+#: ../mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: ../mail/em-account-editor.c:2106 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2157 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2216 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2253 ../mail/em-account-editor.c:2327
+#: ../mail/em-account-editor.c:2258 ../mail/em-account-editor.c:2332
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2254 ../mail/em-account-editor.c:2328
+#: ../mail/em-account-editor.c:2259 ../mail/em-account-editor.c:2333
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/em-account-editor.c:2652 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2652 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -10575,7 +10576,7 @@ msgstr "Allkirjaskripti lisamine"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:853
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
@@ -10783,7 +10784,7 @@ msgstr "Saajad"
 
 #: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex sobivus"
 
 #: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
@@ -10842,7 +10843,7 @@ msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
 #: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1671
-#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -10860,8 +10861,8 @@ msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
 #: ../mail/em-folder-browser.c:134
-msgid "Create _vFolder From Search..."
-msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
+msgid "C_reate Search Folder From Search..."
+msgstr "Loo otsingu baasil _Otsikaust..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -10895,8 +10896,8 @@ msgstr "_Kausta nimi:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-msgid "vFolders"
-msgstr "VKaustad"
+msgid "Search Folders"
+msgstr "Otsikaustad"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
@@ -10960,7 +10961,7 @@ msgstr "_Kopeeri kausta"
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
@@ -11110,20 +11111,20 @@ msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
 #: ../mail/em-folder-view.c:1074
-msgid "vFolder on _Subject"
-msgstr "vKaust _teema järgi"
+msgid "Search Folder from _Subject"
+msgstr "Otsikaust _teema järgi"
 
 #: ../mail/em-folder-view.c:1075
-msgid "vFolder on Se_nder"
-msgstr "vKaust _saatja järgi"
+msgid "Search Folder from Se_nder"
+msgstr "Otsikaust _saatja järgi"
 
 #: ../mail/em-folder-view.c:1076
-msgid "vFolder on _Recipients"
-msgstr "vKaust _adressaatide järgi"
+msgid "Search Folder from _Recipients"
+msgstr "Otsikaust _adressaatide järgi"
 
 #: ../mail/em-folder-view.c:1077
-msgid "vFolder on Mailing _List"
-msgstr "vKaust _postiloendi järgi"
+msgid "Search Folder from Mailing _List"
+msgstr "Otsikaust _postiloendi järgi"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11161,8 +11162,8 @@ msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
 #: ../mail/em-folder-view.c:2419
-msgid "Create _vFolder"
-msgstr "_vKausta loomine"
+msgid "Create _Search Folder"
+msgstr "Loo uus _otsikaust"
 
 #: ../mail/em-folder-view.c:2420
 msgid "_From this Address"
@@ -11178,16 +11179,16 @@ msgid "Click to mail %s"
 msgstr "Kliki, et saata sõnumit aadressile %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:444
+#: ../mail/em-format-html-display.c:442
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:596
+#: ../mail/em-format-html-display.c:694 ../mail/em-format-html.c:596
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:694
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11195,11 +11196,11 @@ msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:695 ../mail/em-format-html.c:597
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:695
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11207,11 +11208,11 @@ msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:693 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:598
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11219,21 +11220,21 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:694
+#: ../mail/em-format-html-display.c:697
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:694
+#: ../mail/em-format-html-display.c:697
 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:700 ../mail/em-format-html.c:605
+#: ../mail/em-format-html-display.c:703 ../mail/em-format-html.c:605
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:700
+#: ../mail/em-format-html-display.c:703
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11241,11 +11242,11 @@ msgstr ""
 "See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt "
 "ja see võis näha olla ka kolmandale osapoolele."
 
-#: ../mail/em-format-html-display.c:701 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:704 ../mail/em-format-html.c:606
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:701
+#: ../mail/em-format-html-display.c:704
 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 "
@@ -11255,22 +11256,22 @@ msgstr ""
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi "
 "krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:702 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:607
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:702
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:703 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:608
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:703
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11279,71 +11280,71 @@ msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga.  Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteering lahti murda."
 
-#: ../mail/em-format-html-display.c:804 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:807 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: ../mail/em-format-html-display.c:819
+#: ../mail/em-format-html-display.c:822
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1107
+#: ../mail/em-format-html-display.c:1104
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1115
+#: ../mail/em-format-html-display.c:1112
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1118
+#: ../mail/em-format-html-display.c:1115
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1175
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1176
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1177
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1181
+#: ../mail/em-format-html-display.c:1178
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1550
+#: ../mail/em-format-html-display.c:1547
 msgid "Attachment Button"
 msgstr "Manuse nupp"
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:1754
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1795
+#: ../mail/em-format-html-display.c:1792
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1803
+#: ../mail/em-format-html-display.c:1800
 msgid "Save Selected..."
 msgstr "Valitu salvestamine..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1870
+#: ../mail/em-format-html-display.c:1867
 #, c-format
 msgid "%d Attachment"
 msgid_plural "%d Attachments"
 msgstr[0] "%d manus"
 msgstr[1] "%d manust"
 
-#: ../mail/em-format-html-display.c:1898
+#: ../mail/em-format-html-display.c:1895
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:1901
+#: ../mail/em-format-html-display.c:1898
 msgid "Save All"
 msgstr "Salvesta kõik"
 
@@ -11402,35 +11403,35 @@ msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1675 ../mail/em-format-quote.c:319
+#: ../mail/em-format-html.c:1675 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Postiprogramm"
@@ -11445,7 +11446,7 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1715 ../mail/em-format-quote.c:326
+#: ../mail/em-format-html.c:1715 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
@@ -11461,27 +11462,27 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: ../mail/em-format.c:1140 ../mail/em-format.c:1273
+#: ../mail/em-format.c:1140 ../mail/em-format.c:1279
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-format.c:1263
+#: ../mail/em-format.c:1269
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1411
+#: ../mail/em-format.c:1417
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME sõnumit pole võimalik analüüsida. Kuvatakse lähtekoodina."
 
-#: ../mail/em-format.c:1430
+#: ../mail/em-format.c:1436
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
@@ -11623,35 +11624,35 @@ msgstr "Serverit ei ole valitud"
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: ../mail/em-utils.c:294
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Filtrid"
 
-#: ../mail/em-utils.c:437 ../mail/em-utils.c:474
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:609
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:658
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1137
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
 #: ../mail/em-vfolder-editor.c:104
-msgid "v_Folders"
-msgstr "v_Kaustad"
+msgid "Search _Folders"
+msgstr "_Otsikaustad"
 
 #: ../mail/em-vfolder-rule.c:574
-msgid "vFolder source"
-msgstr "vKausta allikas"
+msgid "Search Folder source"
+msgstr "Otsikausta allikas"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12417,7 +12418,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filtri valikud</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1922
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
@@ -12971,103 +12972,103 @@ msgstr "värvusega"
 msgid "description"
 msgstr "kirjeldus"
 
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vKausta allikad</b>"
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr "<b>Otsikausta allikad</b>"
 
-#: ../mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digitaalallkiri</span>"
 
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Krüptimine</span>"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:5
 msgid "Case _Sensitive"
 msgstr "_Tõstutundlik"
 
-#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Lõpetatud"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "_Otsing:"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Märgi jälgimiseks"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Kaustade tellimused"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Kasutustingimused"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ühtegi pole valitud"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Turvalisuse teave"
 
-#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Nõustu kasutustingimustega"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Silt:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Telli"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:26
 msgid "with all active remote folders"
 msgstr "koos kõigi aktiivsete võrgukaustadega"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all local and active remote folders"
 msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local folders"
 msgstr "koos kõigi kohalike kalatoogidega"
 
@@ -13090,7 +13091,7 @@ msgstr "E-posti võtmine"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
+#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13099,114 +13100,114 @@ msgstr ""
 "Tõrge lisamisel kasuta %s: %s\n"
 "Selle asemel lisan kausta `Saadetud'."
 
-#: ../mail/mail-ops.c:620
+#: ../mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: ../mail/mail-ops.c:732
+#: ../mail/mail-ops.c:733
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: ../mail/mail-ops.c:757
+#: ../mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:759 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Loobutud."
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:858
+#: ../mail/mail-ops.c:859
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite tõstmine kausta %s"
 
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1209
+#: ../mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1281
+#: ../mail/mail-ops.c:1282
 #, c-format
 msgid "Opening store %s"
 msgstr "Avan hoidlat %s"
 
-#: ../mail/mail-ops.c:1359
+#: ../mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1453
+#: ../mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1518
+#: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1574
+#: ../mail/mail-ops.c:1575
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1610 ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: ../mail/mail-ops.c:1658
+#: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1742
+#: ../mail/mail-ops.c:1743
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1852
+#: ../mail/mail-ops.c:1853
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d sõnumi vastuvõtmine"
 msgstr[1] "%d sõnumi vastuvõtmine"
 
-#: ../mail/mail-ops.c:1938
+#: ../mail/mail-ops.c:1939
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:1988
+#: ../mail/mail-ops.c:1989
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13215,7 +13216,7 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2017
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13224,11 +13225,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2087
+#: ../mail/mail-ops.c:2088
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2099
+#: ../mail/mail-ops.c:2100
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13237,22 +13238,22 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2109
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2375
+#: ../mail/mail-ops.c:2376
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
@@ -13304,7 +13305,7 @@ msgstr "Parooli sisestamine %s jaoks"
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:238
+#: ../mail/mail-session.c:244
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
@@ -13347,26 +13348,26 @@ msgstr "Vigane kaust: `%s'"
 
 #: ../mail/mail-vfolder.c:91
 #, c-format
-msgid "Setting up vFolder: %s"
-msgstr "vKausta ülesseadmine: %s"
+msgid "Setting up Search Folder: %s"
+msgstr "Otsikausta ülesseadmine: %s"
 
 #: ../mail/mail-vfolder.c:240
 #, c-format
-msgid "Updating vFolders for '%s:%s'"
-msgstr "'%s:%s' vkaustade uuendamine"
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "'%s:%s' otsikaustade uuendamine"
 
 #: ../mail/mail-vfolder.c:247
 #, c-format
-msgid "Updating vFolders for '%s'"
-msgstr "'%s' vKaustade uuendamine"
+msgid "Updating Search Folders for '%s'"
+msgstr "'%s' otsikaustade uuendamine"
 
 #: ../mail/mail-vfolder.c:1046
-msgid "Edit vFolder"
-msgstr "vKausta redigeerimine"
+msgid "Edit Search Folder"
+msgstr "Otsikausta redigeerimine"
 
 #: ../mail/mail-vfolder.c:1130
-msgid "New vFolder"
-msgstr "Uus vKaust"
+msgid "New Search Folder"
+msgstr "Uus otsikaust"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
@@ -13446,8 +13447,8 @@ msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:19
-msgid "Cannot add vFolder &quot;{0}&quot;."
-msgstr "vKausta &quot;{0}&quot; pole võimalik lisada."
+msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
 #: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13474,9 +13475,9 @@ msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
-"vKausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
+"Otsikausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13703,10 +13704,14 @@ msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
 #: ../mail/mail.error.xml.h:79
+msgid "Search Folders automatically updated."
+msgstr "Otsikaustad automaatselt uuendatud."
+
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13714,7 +13719,7 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13724,25 +13729,25 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid ""
-"The following filter rule(s):\n"
+"The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -13750,23 +13755,23 @@ msgid ""
 "and resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi sõnumi saajat"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13774,92 +13779,88 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua kahte sama nimega kontot."
 
-#: ../mail/mail.error.xml.h:109
-msgid "You must name this vFolder."
-msgstr "Sa pead sellele vKaustale nime andma."
+#: ../mail/mail.error.xml.h:111
+msgid "You must name this Search Folder."
+msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/mail.error.xml.h:122
-msgid "vFolders automatically updated."
-msgstr "vKaustad automaatselt uuendatud."
-
 #: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Nägemata"
@@ -13925,7 +13926,7 @@ msgstr "%a, %d. %Y"
 
 #: ../mail/message-list.c:2042
 msgid "Message List"
-msgstr ""
+msgstr "Sõnumiloend"
 
 #: ../mail/message-list.c:3387
 msgid "Generating message list"
@@ -14121,6 +14122,9 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to mails. Also fills in IM contact information from your buddy lists."
 msgstr ""
+"Plugin, mis automaatselt täidab sinu aadressiraamatut sinu poolt vastatavate "
+"sõnumite adressaatide nimede ja e-posti aadressisega. Samuti täidetakse "
+"aadressiraamatut välksõnumite sõbranimekirja kontaktide andmetega."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14200,6 +14204,8 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
+"Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
+"demonstreeriseks."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
@@ -14207,7 +14213,7 @@ msgstr "Kopeeri _e-posti aadress"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
-msgstr ""
+msgstr "Kopeerimisvahend"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -14485,6 +14491,14 @@ msgstr "_Ülesanded:"
 msgid "Permissions..."
 msgstr "Pääsuõigused..."
 
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+msgid "Folder Name"
+msgstr "Kausta nimi"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+msgid "Folder Size"
+msgstr "Kausta suurus"
+
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange kirjakaustade puu"
@@ -15066,7 +15080,7 @@ msgstr ""
 
 #: ../plugins/groupwise-features/proxy-login.c:221
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:470
+#: ../plugins/groupwise-features/proxy.c:474
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15076,7 +15090,7 @@ msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:664
+#: ../plugins/groupwise-features/proxy.c:668
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -15191,26 +15205,26 @@ msgid ""
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1907
+#: ../plugins/itip-formatter/itip-formatter.c:1913
 msgid "Meetings and Tasks"
 msgstr "Koosolekud ja ülesanded"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1930
+#: ../plugins/itip-formatter/itip-formatter.c:1936
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1940
+#: ../plugins/itip-formatter/itip-formatter.c:1946
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Konfliktide otsing</span>"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1953
+#: ../plugins/itip-formatter/itip-formatter.c:1959
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vali kalendrid, millest tuleb koosolekute konflikte otsida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1970
+#: ../plugins/itip-formatter/itip-formatter.c:1976
 msgid "Conflict Search Table"
 msgstr "Konfliktide otsimise tabel"
 
@@ -17198,12 +17212,12 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Süsteemi %s sulgemine (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "Kopeeri kontakt(id) teise kausta..."
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr "Kopeeri valitud kontaktid teise kausta..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "Kopeerib valiku"
+msgstr "Valiku kopeerimine"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
@@ -17211,15 +17225,15 @@ msgstr "Kopeeri kausta..."
 
 #: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "Lõikab valiku"
+msgstr "Valiku lõikamine"
 
 #: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
-msgstr "Tõsta kontakt(id) teise kausta..."
+msgid "Move Selected Contacts to Another Folder..."
+msgstr "Tõsta valitud kontaktid teise kausta..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
@@ -17227,7 +17241,7 @@ msgstr "Tõsta kausta..."
 
 #: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
-msgstr "Asetab lõikepuhvri"
+msgstr "Lõikepuhvri asetamine"
 
 #: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
@@ -17463,12 +17477,12 @@ msgid "Create a new folder for storing mail"
 msgstr "Uue kausta loomine e-posti hoidmiseks"
 
 #: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr "Uute sõnumite filtreerimisreeglite loomine või muutmine"
+msgid "Create or edit Search Folder definitions"
+msgstr "Otsikausta kirjelduste loomine või muutmine"
 
 #: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit vFolder definitions"
-msgstr "vKausta kirjelduste loomine või muutmine"
+msgid "Create or edit rules for filtering new mail"
+msgstr "Uute sõnumite filtreerimisreeglite loomine või muutmine"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
@@ -17682,36 +17696,38 @@ msgid "Create R_ule"
 msgstr "Loo _reegel"
 
 #: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a rule to filter messages from this sender"
-msgstr "Reegli loomine selle saatja poolt saadetud sõnumite filtreerimiseks"
+msgid "Create a Search Folder for these recipients"
+msgstr "Otsikausta loomine nende adressaatide jaoks"
 
 #: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Reegli loomine nendele adressaatidele saadetud sõnumite filtreerimiseks"
+msgid "Create a Search Folder for this mailing list"
+msgstr "Otsikausta loomine selle postiloendi jaoks"
 
 #: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Reegli loomine sellese postiloendisse saadetud sõnumite filtreerimiseks"
+msgid "Create a Search Folder for this sender"
+msgstr "Otsikausta loomine selle saatja jaoks"
 
 #: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a rule to filter messages with this subject"
-msgstr "Reegli loomine selle teemaga sõnumite filtreerimiseks"
+msgid "Create a Search Folder for this subject"
+msgstr "Otsikausta loomine selle teema jaoks"
 
 #: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a vFolder for these recipients"
-msgstr "Loo vKaust nende adressaatide jaoks"
+msgid "Create a rule to filter messages from this sender"
+msgstr "Reegli loomine selle saatja poolt saadetud sõnumite filtreerimiseks"
 
 #: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a vFolder for this mailing list"
-msgstr "Loo vKaust selle postiloendi jaoks"
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+"Reegli loomine nendele adressaatidele saadetud sõnumite filtreerimiseks"
 
 #: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a vFolder for this sender"
-msgstr "Loo vKaust selle saatja jaoks"
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+"Reegli loomine sellese postiloendisse saadetud sõnumite filtreerimiseks"
 
 #: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a vFolder for this subject"
-msgstr "Loo vKaust selle teema jaoks"
+msgid "Create a rule to filter messages with this subject"
+msgstr "Reegli loomine selle teemaga sõnumite filtreerimiseks"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -17910,61 +17926,61 @@ msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
 #: ../ui/evolution-mail-message.xml.h:84
+msgid "Search Folder from Mailing _List..."
+msgstr "Otsikaust posti_loendi järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Search Folder from Recipients..."
+msgstr "Otsikaust adressaatide järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from S_ubject..."
+msgstr "Otsikaust teema järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Sen_der..."
+msgstr "Otsikaust saatja järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Select _All Text"
 msgstr "V_ali kogu tekst"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Select all the text in a message"
 msgstr "Sõnumi kogu teksti valimine"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näitab kuvatava sõnumi sisus vilkuvat kursorit"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Show message in the normal style"
 msgstr "Näitab sõnumit tavalise stiiliga"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show message with all email headers"
 msgstr "Näitab sõnumit koos kõigi päistega"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show the raw email source of the message"
 msgstr "Näitab sõnumit töötlemata kujul"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Un-delete the selected messages"
 msgstr "Taastab valitud sõnumi"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Uni_mportant"
 msgstr "_Vähetähtis"
 
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "VFolder on Mailing _List..."
-msgstr "vKaust posti_loendi järgi..."
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "VFolder on Recipients..."
-msgstr "VKaust saajate järgi..."
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "VFolder on S_ubject..."
-msgstr "vKaust teema järgi..."
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "VFolder on Sen_der..."
-msgstr "vKaust saatja järgi..."
-
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Zoom _Out"
 msgstr "_Vähenda"
@@ -18126,38 +18142,38 @@ msgid "Save As"
 msgstr "Salvesta kui"
 
 #: ../ui/evolution-message-composer.xml.h:20
+msgid "Save Draft"
+msgstr "Mustandi salvestamine"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Salvesta _mustand"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save as draft"
 msgstr "Salvestamine mustandina"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
 #: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Käesoleva faili salvestamine"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file with a different name"
 msgstr "Käesoleva faili salvestamine teise nime alla"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
 msgstr "Käesoleva faili salvestamine teise kausta"
 
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "SaveDraft"
-msgstr "SalvestaMustand"
-
 #: ../ui/evolution-message-composer.xml.h:29
 #: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19737,6 +19753,27 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "vFolders"
+#~ msgstr "VKaustad"
+
+#~ msgid "Create _vFolder"
+#~ msgstr "_vKausta loomine"
+
+#~ msgid "v_Folders"
+#~ msgstr "v_Kaustad"
+
+#~ msgid "vFolder source"
+#~ msgstr "vKausta allikas"
+
+#~ msgid "Edit vFolder"
+#~ msgstr "vKausta redigeerimine"
+
+#~ msgid "New vFolder"
+#~ msgstr "Uus vKaust"
+
+#~ msgid "SaveDraft"
+#~ msgstr "SalvestaMustand"
+
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
@@ -19906,9 +19943,6 @@ msgstr ""
 #~ msgid "<b>If</b>"
 #~ msgstr "<b>Kui</b>"
 
-#~ msgid "Create New Folder"
-#~ msgstr "Uue kausta loomine"
-
 #~ msgid "spamd port"
 #~ msgstr "spamd port"
 
@@ -19943,9 +19977,9 @@ msgstr ""
 #~ "\n"
 #~ "Do you want to quit using the Assistant now?"
 #~ msgstr ""
-#~ "Kui sa praegu Evolutioni seadistusabilise sulged, lähevad kõik "
-#~ "sisestatud andmed kaotsi. Sel juhul pead sa Evolutioni järgmisel "
-#~ "käivitamisel uuesti ka seadistusabilise käivitama.\n"
+#~ "Kui sa praegu Evolutioni seadistusabilise sulged, lähevad kõik sisestatud "
+#~ "andmed kaotsi. Sel juhul pead sa Evolutioni järgmisel käivitamisel uuesti "
+#~ "ka seadistusabilise käivitama.\n"
 #~ "\n"
 #~ "Kas sa soovid seadistusabilist sulgeda?"