Translation updated by Ivar Smolin.

2005-06-16  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated by Ivar Smolin.

svn path=/trunk/; revision=29515

1 files changed, 8701 insertions, 7553 deletions

diff --git a/po/et.po b/po/et.po
index 5e741678e6..10d26d8dcb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS HEAD\n"
-"Report-Msgid-Bugs-To: gnome-et@linux.ee\n"
-"POT-Creation-Date: 2005-02-28 14:10+0100\n"
-"PO-Revision-Date: 2005-04-22 18:33+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-06-13 05:33+0000\n"
+"PO-Revision-Date: 2005-06-13 13:28+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -24,135 +24,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:196
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:196
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:204
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:204
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: a11y/addressbook/ea-minicard-view.c:149
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "käesolev aadressiraamatu kaust sisaldab %d kaardi"
 msgstr[1] "käesolev aadressiraamatu kaust sisaldab %d kaarti"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:863
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Ava"
 
-#: a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "Kontaktide nimekiri: "
 
-#: a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "Kontakt:"
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "evolutioni minikaart"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr ""
 
-#: a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "See omab kordumisi."
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "See on kohtumine."
 
-#: a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendrisündmus: Kokkuvõte on %s."
 
-#: a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendrisündmus: Kokkuvõte puudub."
 
-#: a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr ""
 
-#: a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
 msgstr "Uus sündmus"
 
-#: a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
 msgstr "Uus kogu päeva hõlmav sündmus"
 
-#: a11y/calendar/ea-cal-view.c:308
-#: calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1444
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
 msgstr "Mine tänasele päevale"
 
-#: a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
 msgstr "Mine kuupäevale"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:146
-#: a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, fuzzy, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] ", %d sündmus"
 msgstr[1] ", %d sündmus"
 
-#: a11y/calendar/ea-day-view.c:148
-#: a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Töönädala vaade: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päeva vaade: %s. %s"
 
-#: a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr ""
 
-#: a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
 msgstr ""
 
-#: a11y/calendar/ea-gnome-calendar.c:187
-#: calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:660
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y"
 
@@ -162,31 +159,30 @@ msgstr "%A, %d. %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190
-#: calendar/gui/calendar-component.c:663
-#: calendar/gui/e-day-view-top-item.c:719
-#: calendar/gui/e-day-view.c:1511
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192
-#: a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199
-#: calendar/gui/calendar-component.c:665
-#: calendar/gui/calendar-component.c:670
-#: calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:665
+#: ../calendar/gui/calendar-component.c:670
+#: ../calendar/gui/calendar-component.c:672
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216
-#: a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228
-#: a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:684
-#: calendar/gui/calendar-component.c:691
-#: calendar/gui/calendar-component.c:697
-#: calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:684
+#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:697
+#: ../calendar/gui/calendar-component.c:699
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -195,356 +191,316 @@ msgstr "%d. %B %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220
-#: calendar/gui/calendar-component.c:689
-#: calendar/gui/e-day-view-top-item.c:723
-#: calendar/gui/e-day-view.c:1527
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247
-#: a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:726
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr ""
 
-#: a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "Evolutioni kalendri otsinguriba"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr ""
 
-#: a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuu vaade: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nädala vaade: %s. %s"
 
-#: a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr ""
 
-#: a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr ""
 
-#: a11y/widgets/ea-calendar-item.c:296
-#: a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:304
 #, fuzzy, c-format
 msgid "Calendar: from %s to %s"
 msgstr "iKalendri vorming (.ics)"
 
-#: a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "evolution'i kalendrikirje"
 
-#: a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:40
 msgid "Combo Button"
 msgstr ""
 
-#: a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:50
 #, fuzzy
 msgid "Activate Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
 msgstr ""
 
-#. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
-msgid "This addressbook could not be opened."
-msgstr "Seda aadressisaamatud pole võimalik avada."
-
-#. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
-msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:1
+#, fuzzy
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr "Sellise aadressiga kontakt on juba olemas.  Kas sa soovid uut lisada?"
 
-#. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
-msgid "Failed to authenticate with LDAP server."
-msgstr "Tõrge LDAP serverisse autentimisel."
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "Address '{0}' already exists."
+msgstr "Aadress '{0}' on juba olemas"
 
-#. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Kontrolli, kas parool on õigesti kirjutatud ja kas sa kasutad toetatud logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et caps lock ei oleks peal."
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot move contact."
+msgstr "Ei saa kontakti ümber tõsta."
 
-#. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
-msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Category editor not available."
+msgstr "Kategooriaredaktor ei ole saadaval."
 
-#. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+#: ../addressbook/addressbook.error.xml.h:5
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
+"Kontrolli, kas parool on õigesti kirjutatud ja kas sa kasutad toetatud "
+"logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et "
+"caps lock ei oleks peal."
 
-#. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
-msgid "This server does not support LDAPv3 schema information."
-msgstr "See server ei toeta LDAPv3 skeemiinfot."
-
-#. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "Ei saa LDAP serveri skeemiinfot."
 
-#. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP server ei saatnud korrektset skeemiinfot."
-
-#. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "Ei saa eemaldada aadressiraamatut."
 
-#. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Delete address book '{0}'?"
 msgstr "Kustutame aadressiraamatu '{0}'?"
 
-#. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Error loading addressbook."
+msgstr "Viga aadressiraamatu laadimisel."
+
+#: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Viga kontakti salvestamisel {0}: {1}"
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid "Failed to authenticate with LDAP server."
+msgstr "Tõrge LDAP serverisse autentimisel."
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP server ei saatnud korrektset skeemiinfot."
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Server Version"
+msgstr "Serveri versioon"
+
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
+
+#: ../addressbook/addressbook.error.xml.h:16
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "This address book will be removed permanently."
 msgstr "See aadressisaamat eemaldatakse lõplikult."
 
-#. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
-msgid "Category editor not available."
-msgstr "Kategooriaredaktor ei ole saadaval."
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "This addressbook could not be opened."
+msgstr "Seda aadressisaamatud pole võimalik avada."
 
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. 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
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40
-#: mail/mail-errors.xml.h:75
-#: mail/mail-errors.xml.h:77
-#: mail/mail-errors.xml.h:79
-#: mail/mail-errors.xml.h:81
-#: mail/mail-errors.xml.h:83
-#: mail/mail-errors.xml.h:85
-#: mail/mail-errors.xml.h:89
-#: mail/mail-errors.xml.h:93
-msgid "{0}"
-msgstr "{0}"
+#: ../addressbook/addressbook.error.xml.h:19
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
 
-#. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4
-#: mail/mail-errors.xml.h:97
-msgid "{1}"
-msgstr "{1}"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
 
-#. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "This server does not support LDAPv3 schema information."
+msgstr "See server ei toeta LDAPv3 skeemiinfot."
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "Unable to open addressbook"
 msgstr "Ei saa avada aadressiraamatut"
 
-#. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
-msgid "Error loading addressbook."
-msgstr "Viga aadressiraamatu laadimisel."
-
-#. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to perform search."
 msgstr "Otsingut pole võimalik läbi viia."
 
-#. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:24
+#, fuzzy
+msgid "Unable to save {0}."
+msgstr "Ei saa kontakt(e) salvestada."
+
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
-#. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/addressbook-errors.xml.h:45
-msgid "_Discard"
-msgstr "_Unusta"
-
-#. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
-msgid "Cannot move contact."
-msgstr "Ei saa kontakti ümber tõsta."
-
-#. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
-msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
+#: ../addressbook/addressbook.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:59
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
 msgstr ""
 
-#. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
-msgid "Unable to save contact(s)."
-msgstr "Ei saa kontakt(e) salvestada."
-
-#. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
-msgid "Error saving contacts to {0}: {1}"
-msgstr "Viga kontakti salvestamisel {0}: {1}"
-
-#. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
-
-#. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:28
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr ""
 
-#. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
-msgid "Address '{0}' already exists."
-msgstr "Aadress '{0}' on juba olemas"
-
-#. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
-msgid "A contact already exists with this address.  Would you like to add a new card with the same address anyway?"
-msgstr "Sellise aadressiga kontakt on juba olemas.  Kas sa soovid uut lisada?"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
 
-#: addressbook/addressbook-errors.xml.h:62
-#: mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Add"
 msgstr "_Lisa"
 
-#. addressbook:server-version title
-#. calendar:server-version title
-#: addressbook/addressbook-errors.xml.h:64
-#: calendar/calendar-errors.xml.h:142
-msgid "Server Version"
-msgstr "Serveri versioon"
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "_Discard"
+msgstr "_Unusta"
 
-#. addressbook:server-version primary
-#. calendar:server-version primary
-#: addressbook/addressbook-errors.xml.h:66
-#: calendar/calendar-errors.xml.h:144
-msgid "Your server needs to be updated"
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "{0}"
+msgstr "{0}"
 
-#. addressbook:server-version secondary
-#: addressbook/addressbook-errors.xml.h:68
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "{1}"
+msgstr "{1}"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Automaatne lõpetamine"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontaktid"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Sertifikaadid"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Seadista automaatlõpetamist siit"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:235
-#: calendar/gui/migration.c:385
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution'i aadressiraamat"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolutioni aadressiraamatu aadressikuva"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolutioni aadressiraamatu kaardikuva"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolutioni aadressiraamatu komponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution'i S/Mime sertifikaatide haldamise juhtimine"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolutioni kaustaseadistuste juhtimine"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 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
-#: addressbook/gui/component/addressbook-component.c:133
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/calendar-component.c:208
-#: calendar/gui/migration.c:459
-#: calendar/gui/migration.c:552
-#: calendar/gui/tasks-component.c:188
-#: mail/em-folder-tree-model.c:197
-#: mail/em-folder-tree-model.c:199
-#: mail/mail-component.c:290
-#: mail/mail-vfolder.c:222
+#: ../addressbook/gui/component/addressbook-component.c:133
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
 
@@ -553,150 +509,144 @@ msgstr "Kohalikus arvutis"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: addressbook/gui/component/addressbook-component.c:141
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: calendar/gui/calendar-component.c:216
-#: calendar/gui/migration.c:467
-#: calendar/gui/migration.c:560
-#: calendar/gui/tasks-component.c:196
-#: filter/filter-label.c:123
-#: mail/em-migrate.c:1043
-#: mail/mail-config.c:78
-#: mail/mail-config.glade.h:101
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Isiklik"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:149
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:197
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:198
 msgid "Create a new contact"
 msgstr "Loob uue kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:205
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:206
 msgid "Create a new contact list"
 msgstr "Loob uue kontaktide nimekirja"
 
-#: addressbook/gui/component/addressbook-component.c:212
-#: addressbook/gui/component/addressbook-config.c:1120
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:212
+#: ../addressbook/gui/component/addressbook-config.c:1120
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:213
 msgid "Address _Book"
 msgstr "_Aadressiraamat"
 
-#: addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:214
 msgid "Create a new address book"
 msgstr "Lisab uue aadressiraamatu"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:287
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Tõrge aadressiraamatu kataloogide või seadistuste uuendamisel."
 
-#: addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:192
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tüüp:"
 
-#: addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
 msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372
-#: mail/em-folder-properties.c:215
-#: mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
 msgstr "Serveri teave"
 
-#: addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12
-#: smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
-#: addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
 msgstr "Otsing"
 
-#: addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: addressbook/gui/component/addressbook-config.c:1118
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142
-#: mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189
-#: mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 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:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -706,7 +656,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -716,1627 +666,1671 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:935
-#: calendar/gui/calendar-component.c:526
-#: calendar/gui/tasks-component.c:430
-#: mail/em-filter-i18n.h:11
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:527
-#: calendar/gui/tasks-component.c:431
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
-#: addressbook/gui/component/addressbook.c:193
-#: plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:193
+#: ../plugins/groupwise-features/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
-#: addressbook/gui/component/addressbook.c:200
-#: plugins/groupwise-account-setup/camel-gw-listener.c:461
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-features/camel-gw-listener.c:461
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 #, fuzzy
 msgid "Autocomplete length"
 msgstr "Automaatne lõpetamine"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 #, fuzzy
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
 msgstr "Vertikaalpaani asukoht kuuvaates"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 #, fuzzy
 msgid "Show preview pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-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:6
+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:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr ""
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 #, fuzzy
 msgid "Whether to show the preview pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/cal-attachment.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
-#: mail/mail-dialogs.glade.h:6
-#: mail/message-tags.glade.h:1
-#: plugins/shared-folder/properties.glade.h:1
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Kuva</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Allalaadimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Serveri info</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tüüp:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
 msgid "Always"
 msgstr "Alati"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Peamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:299
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
 msgid "Never"
 msgstr "Mitte kunagi"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Üks tase alla (One)"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Otsingubaas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
-msgstr "See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult juhul, kui LDAP server toetab SSL või TLS protokolli."
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
+msgstr ""
+"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
+"juhul, kui LDAP server toetab SSL või TLS protokolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
-msgstr "See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
+msgstr ""
+"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
+"ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja sinu "
+"LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis Evolution ei "
+"pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba turvaline."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
-msgstr "See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolle. Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
+msgstr ""
+"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolle. "
+"Seega ei ole sinu ühendus turvaline ja võib-olla ohustatud turvaaukudest."
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Kogu alampuu (Sub)"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37
-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:37
+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:38
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-msgstr "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. Nimekiri standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa peaksid määrama."
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"See on LDAP serveri port, kuhu Evolution üritab ühendust luua. Nimekiri "
+"standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
+"peaksid määrama."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:300
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Lisa _aadressiraamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Leia võimalikud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
-msgid "_Log in method:"
+#: ../addressbook/gui/component/ldap-config.glade.h:46
+#, fuzzy
+msgid "_Login method:"
 msgstr "_Sisselogimismeetod"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#: mail/mail-config.glade.h:160
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:165
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Ajapiirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "_Turvalise ühenduse kasutamine:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kaardid"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: 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:1884
-#: plugins/calendar-http/calendar-http.c:263
-#: plugins/calendar-weather/calendar-weather.c:564
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../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:1940
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minutit"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Kodu</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Kiirsuhtlus</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Töö</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Muu</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Teised</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Võrguaadressid</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 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:182
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Pilt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Kodune aadress"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Hüüdnimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Isiklik teave"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:199
-#: filter/filter-label.c:122
-#: mail/em-migrate.c:1042
-#: mail/mail-config.c:77
-#: mail/mail-config.glade.h:148
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Töö"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
 msgstr "_Aadress:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Aastapäev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1619
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1619
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Kategooriad"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Linn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Riik:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Osakond:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Salvesta kui:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Vaba/hõivatud:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Koduleht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Juht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Märkused:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Sidejaoskonna postkast:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Eriala:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Abikaasa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tiitel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videovestlus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Veebilogi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Kus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Aadress"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:310
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigeeritav"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Ühendriigid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Alžeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Austraalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani territoorium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Kaimani saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Tšaad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Tšiili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Hiina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Jõulusaar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared (Keelingi saared)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, Demokraatlik vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Küpros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Tšehhi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Taani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Dominikaani vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Eesti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Fääri saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidži"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Soome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Prantsuse Polüneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Prantsuse Lõunaalad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Kreeka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Gröönimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Guinea-Bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Heardi ja McDonaldi saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Vatikan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong-Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Ungari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Iraan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Iraak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Mani saar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Iisrael"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Itaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Jaapan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "Jersey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Keenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea Demokraatlik Rahvavabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Korea Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kõrgõzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Läti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Liibüa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Moldova Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Maroko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Holland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaanid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Omaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peruu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Poola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Réunioni departemang"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "São Tomé ja Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Serbia ja Montenegro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seišellid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Lõuna-Aafrika Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Lõuna Georgia ja Lõuna Sandwichi saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Hispaania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre ja Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Teravmäed"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Süüria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tansaania, Ühendatud Vabariik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Tai"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Türgi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Türkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turksi ja Caicose saared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Araabia Ühendemiraadid"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Ühendkuningriik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Ühendriikide hajasaared"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Neitsisaared, Briti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Neitsisaared, U.S."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Sambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Nimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Teenus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Asukoht"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
 msgid "Home"
 msgstr "Kodu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr "Vajalikud väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontaki jaoks pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2344,220 +2338,240 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:306
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
 msgid "_Full name:"
 msgstr "Täis_nimi:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:316
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Kas sa tõesti soovid\n"
 "kustutada need kontaktid?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
-"to delete this contact?"
+"to delete these contact lists?"
 msgstr ""
 "Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
+"kustutada need kontaktid?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_Linn:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Riik:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Täisaadress"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Postiindeks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Preili"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Härra"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Proua"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Pr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Eesnimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Perekonnanimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "L_iignimi:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Järelliide:"
 
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Lisa KS konto:"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "_Konto nimi:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_KS teenus:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
-#: plugins/calendar-weather/calendar-weather.c:410
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Asukoht:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Lisa sõnum loendisse"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Insert email adresses from Adress Book"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "Insert email addresses from Address Book"
 msgstr "Lisab aadressiraamatust e-posti aadressi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Liikmed"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Eemaldab e-postiaadressi loendist"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sõnumi saatmisel sellesse loendisse"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Loendi nimi:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Select"
 msgstr "_Vali"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:296
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
 msgid "_Members"
 msgstr "_Liikmed"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
 msgid "Contact List Members"
 msgstr "Kontaktiloendi liikmed"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Muudetud kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Vastulous kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Avastati korduv kontakt"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2565,15 +2579,15 @@ msgstr ""
 "Muudetud kontakti e-posti aadress või nimi juba\n"
 "on antud kaustas juba olemas. Kas sa soovid seda ikka lisada?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Uus kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Esialgne kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2582,297 +2596,290 @@ msgstr ""
 "juba olemas. Kas sa soovid seda siiski lisada?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Kontakte pole"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:303
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Päring"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Mudel"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Name begins with"
 msgstr "Nimi algab"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Email begins with"
 msgstr "E-post algab"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
 msgid "Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "Allikas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:244
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:319
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:337
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:543
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: addressbook/gui/widgets/e-addressbook-view.c:1982
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:806
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1986
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:920
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:921
 msgid "New Contact List..."
 msgstr "Uus kontaktide loend..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:926
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:925
-#: calendar/gui/calendar-commands.c:120
-#: calendar/gui/print.c:2489
-#: ui/evolution-addressbook.xml.h:16
-#: ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80
-#: ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:927
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:930
 msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
 msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: calendar/gui/calendar-component.c:525
-#: calendar/gui/tasks-component.c:429
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1537
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1539
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1738
 msgid "Print cards"
 msgstr "Trüki kaardid"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistendi telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax tööl"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon tööl"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon tööl 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tagasihelistamise telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Kategooriad"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firma telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560
-#: smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Kataloogi kui"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Antud nimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Kodune faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Kodune telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Kodune telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Päevik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Juht"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Märkus"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Muu telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Piipar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 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:326
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:345
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Abikaasa"
 
@@ -2882,62 +2889,62 @@ msgstr "Abikaasa"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Tiitel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Ühik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Koduleht"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Laius"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Kõrgus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Väli"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Välja nimi"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Teksti mudel"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Suurim välja nime pikkus"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
 msgstr "Veeru laius"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -2951,7 +2958,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -2965,7 +2972,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -2975,7 +2982,7 @@ msgstr ""
 "\n"
 "Otsi kontakti."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2985,192 +2992,212 @@ msgstr ""
 "\n"
 "Selles vaates kirjed puuduvad."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Valitud"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kaart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Ametikoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "isiklik"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
 msgid "Home page"
 msgstr "Koduleht"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Õnnestus"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei ole olemas"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Enda kontakti ei ole kirjeldatud"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Kontakti ei leitud"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Kontakti ID on juba olemas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-cal-model-tasks.c:347
-#: calendar/gui/e-cal-model-tasks.c:660
-#: calendar/gui/e-calendar-table.c:458
-#: calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Katkestatud"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Ei saa katkestada"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Tõrge autentimisel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Sellist allikat ei ole olemas"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
-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:98
+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:105
-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õib olla see, et sisestasid vigase URI või kasutatav LDAP server ei ole kättesaadav."
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
+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õib olla see, et sisestasid "
+"vigase URI või kasutatav LDAP server ei ole kättesaadav."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
-msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
-msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAP'i toega. Kui sa soovid kasutada Evolution'i koos LDAP'i toega, pead paigaldama omale vastava Evolution'i paki."
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Käesolev Evolution'i versioon ei ole kompileeritud LDAP'i toega. Kui sa "
+"soovid kasutada Evolution'i koos LDAP'i toega, pead paigaldama omale vastava "
+"Evolution'i paki."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
-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 nurjus.  Põhjuseks võib olla see, et sisestasid vigase URI või kasutatav server ei ole kättesaadav."
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
+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 nurjus.  Põhjuseks võib olla see, et sisestasid "
+"vigase URI või kasutatav server ei ole kättesaadav."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3178,7 +3205,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3186,45 +3213,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Viga loendi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:675
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Viga loendi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:633
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3239,7 +3266,7 @@ msgstr[1] ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3248,44 +3275,54 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:360
+#: ../addressbook/gui/widgets/eab-gui-util.c:363
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "kontakt"
+msgstr[1] "kontakti"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:410
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:729
 msgid "Move contact to"
 msgstr "Kontakti ümbertõstmine"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Copy contact to"
 msgstr "Kontakti kopeerimine"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:734
 msgid "Move contacts to"
 msgstr "Kontaktide ümbertõstmine"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Copy contacts to"
 msgstr "Kontaktide kopeerimine"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:739
 msgid "Select target addressbook."
 msgstr "Vali sihtaadressiraamat."
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:962
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:965
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
@@ -3295,880 +3332,857 @@ msgstr "VKaart %s kohta"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(puudub)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Vali tegevus"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Loob uue kontakti \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] ""
 msgstr[1] ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Kogu VKaardi kuvamine"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Kompaktse VKaardi näitamine"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Salvesta aadressiraamatusse"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Kaardi vaade"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Evolutioni VKaardi importija"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:213
-#: addressbook/printing/e-contact-print-envelope.c:234
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktine Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Tühjad väljad lõpus:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Sisu"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "All:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Mõõtmed:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "_Kirjatüüp..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Jalus:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Vorming"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Päis"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Päis/jalus"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Päised"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Päised iga kirja jaoks"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Kõrgus:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Vahetult üksteise järgi"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Lisa:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Rõhtpaigutus"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Vasakul:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Tähenupud küljel"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Veerised"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Valikud"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-#: e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Suund"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Lehekülg"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Lehekülje sätted:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Paber"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Paberiallikas:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Püstpaigutus"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Eelvaade:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Trükkimisel kasuta halli varjutamist"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Paarisarvulised leheküljed peeglisse"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Paremal:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sektsioonid:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Varjutamine"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Suurus:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Alusta uuelt leheküljelt"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stiili nimi:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Ülevalt:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:176
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Laius:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Kirjatüüp..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr ""
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../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/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr ""
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
-msgstr "Faili ei saa avada"
+msgstr "Faili pole võimalik avada"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Määra standardväljundi asemel väljundfail"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "VÄLJUNDFAIL"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "Kohalike aadressiraamatute kaustade kuvamine"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vkaard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Toeta ainult csv või vcard vorminguid."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "Asünkroonrežiimis peab väljund olema fail."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Käsitlemata viga"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Sisendfail"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Failinime ei esitatud."
 
-#. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2
-#: calendar/calendar-errors.xml.h:12
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "Kas soovid teisi osalejaid katkestamisest teavitada?"
-
-#. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
-msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
-msgstr "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad katkestamisest mitte teada saada."
-
-#: calendar/calendar-errors.xml.h:5
-#: calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25
-#: calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93
-#: calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
-msgid "Don't Send"
-msgstr "Ära saada"
-
-#: calendar/calendar-errors.xml.h:6
-#: calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
-msgid "Send Notice"
-msgstr "Teavita"
-
-#. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
+#: ../calendar/calendar.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Saving the appointment will "
+"cause the appointment to be saved without those pending attachments "
+msgstr ""
 
-#. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
-msgid "All information on this meeting will be deleted and can not be restored."
-msgstr "Kõik selle koosoleku kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+" There are few attachments getting downloaded. Saving the task will cause "
+"the task to be saved without those pending attachments "
+msgstr ""
 
-#. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
-msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
-msgstr "Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle ülesande kustutamisest mitte teada saada."
+#: ../calendar/calendar.error.xml.h:3
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
 
-#. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18
-#: calendar/calendar-errors.xml.h:44
-msgid "Are you sure you want to delete this task?"
-msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
 
-#. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20
-#: calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
-msgid "All information on this task will be deleted and can not be restored."
-msgstr "Kõik selle ülesande kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+"Kõik nende päevikukirjete kohta käiv teave kustutatakse ja seda ei ole "
+"võimalik enam taastada."
 
-#. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr "Kas soovid teisi osalejaid selle päevikukirje katkestamisest teavitada?"
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+"Kõik selle päeviku kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
-msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
-msgstr "Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle päeviku kustutamisest mitte teada saada."
+#: ../calendar/calendar.error.xml.h:7
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Kõik nende sündmuste kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28
-#: calendar/calendar-errors.xml.h:52
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Kas sa tõesti soovid kustutada seda päevikukirjet?"
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+"Kõik nende ülesannete kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
-msgid "All information on this journal entry will be deleted and can not be restored."
-msgstr "Kõik selle päevikukirje kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"Kõik selle sündmuse kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Kas sa tõesti soovid kustutada sündmust nimega '{0}'?"
+#: ../calendar/calendar.error.xml.h:10
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+"Kõik selle päevikukirje kohta käiv teave kustutatakse ja seda ei ole "
+"võimalik enam taastada."
 
-#. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34
-#: calendar/calendar-errors.xml.h:38
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Kõik selle sündmuse kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+"Kõik selle koosoleku kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"Kõik selle ülesande kohta käiv teave kustutatakse ja seda ei ole võimalik "
+"enam taastada."
 
-#. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Kas sa tõesti soovid kustutada ülesannet '{0}'?"
 
-#. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar.error.xml.h:14
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Kas sa tõesti soovid kustutada sündmust nimega '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Kas sa tõesti soovid kustutada päevikukirjet '{0}'?"
 
-#. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50
-#: calendar/calendar-errors.xml.h:54
-msgid "All information in this journal will be deleted and can not be restored."
-msgstr "Kõik selle päeviku kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
-
-#. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Kas sa tõesti soovid kustutada neid {0} sündmusi?"
 
-#. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
-msgid "All information on these appointments will be deleted and can not be restored."
-msgstr "Kõik nende sündmuste kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Kas sa tõesti soovid kustutada neid {0} päevikukirjeid?"
 
-#. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Kas sa tõesti soovid kustutada neid {0} ülesandeid?"
 
-#. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Kõik nende ülesannete kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
 
-#. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Kas sa tõesti soovid kustutada neid {0} päevikukirjeid?"
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Kas sa tõesti soovid kustutada seda päevikukirjet?"
 
-#. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
-msgid "All information in these journal entries will be deleted and can not be restored."
-msgstr "Kõik nende päevikukirjete kohta käiv teave kustutatakse ja seda ei ole võimalik enam taastada."
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
 
-#. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
-msgid "Save Appointment"
-msgstr "Salvesta sündmus"
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete this task?"
+msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
 
-#. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Oled sa kindel, et soovid seda sündmust ilma kokkuvõtteta saata?"
 
-#. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "Sa oled muutnud seda sündmust, kuid muudatused ei ole salvestatud."
+#: ../calendar/calendar.error.xml.h:24
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete calendar '{0}'?"
+msgstr "Kustutada kalender '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Delete task list '{0}'?"
+msgstr "Kas kustutata ülesannete loend '{0}'?"
 
-#: calendar/calendar-errors.xml.h:73
-#: calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar.error.xml.h:27
 msgid "Discard Changes"
 msgstr "Loobu muudatustest"
 
-#: calendar/calendar-errors.xml.h:74
-#: calendar/calendar-errors.xml.h:82
-msgid "Save Changes"
-msgstr "Salvesta muudatused"
+#: ../calendar/calendar.error.xml.h:28
+msgid "Don't Send"
+msgstr "Ära saada"
 
-#. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
-msgid "Save Task"
-msgstr "Salvesta ülesanne"
+#: ../calendar/calendar.error.xml.h:29
+#, fuzzy
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
 
-#. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
-msgid "Would you like to save your changes to this task?"
-msgstr "Kas soovid selle ülesande muudatusi salvestada?"
+#: ../calendar/calendar.error.xml.h:30
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
 
-#. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "Sa oled seda ülesannet muutnud aga muudatused on salvestamata."
+#: ../calendar/calendar.error.xml.h:31
+msgid "Editor could not be loaded."
+msgstr "Redaktorit pole võimalik laadida."
 
-#. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Kas soovid saata osalejatele osalemiskutsed?"
+#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+"E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
+"neil oma osalemisest teada anda (RSVP)."
 
-#. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
-msgid "Email invitations will be sent to all participants and allow them to RSVP."
-msgstr "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab neil oma osalemisest teada anda (RSVP)."
+#: ../calendar/calendar.error.xml.h:33
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
+"neil ülesandele nõusolekut anda."
 
-#: calendar/calendar-errors.xml.h:88
-#: calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100
-#: calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Saada"
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading calendar"
+msgstr "Viga kalendri laadimisel"
 
-#. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading task list"
+msgstr "Viga ülesandeloendi laadimisel"
 
-#. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Värskendatud teave aitab teistel osalejatel nende kalendreid ajakohasena hoida"
+#: ../calendar/calendar.error.xml.h:36
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+"Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad selle "
+"päeviku kustutamisest mitte teada saada."
 
-#. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
-msgid "Would you like to send this task to participants?"
-msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Kui sa ei saada katkestamisteadet, siis ülejäänud osalised võivad "
+"katkestamisest mitte teada saada."
 
-#. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab neil ülesandele nõusolekut anda."
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Kui sa ei saada kustutamisteadet, siis ülejäänud osalised võivad selle "
+"ülesande kustutamisest mitte teada saada."
 
-#. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
-msgid "Would you like to send updated task information to participants?"
-msgstr "Kas soovid saata osalejatele värskemat teavet ülesande kohta?"
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Salvesta muudatused"
 
-#. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Värskendatud teave aitab teistel osalejatel nende ülesannete nimekirja ajakohasena hoida"
+#: ../calendar/calendar.error.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Saada"
 
-#. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
-msgid "The Evolution tasks have quit unexpectedly."
+#: ../calendar/calendar.error.xml.h:41
+msgid "Send Notice"
+msgstr "Teavita"
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr ""
+"Värskendatud teave aitab teistel osalejatel nende kalendreid ajakohasena "
+"hoida"
 
-#. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
-msgid "Your tasks will not be available until Evolution is restarted."
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr ""
+"Värskendatud teave aitab teistel osalejatel nende ülesannete nimekirja "
+"ajakohasena hoida"
 
-#. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution'i kalender lõpetas ootamatult."
 
-#. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
-msgid "Your calendars will not be available until Evolution is restarted."
+#: ../calendar/calendar.error.xml.h:46
+msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
-#. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
-msgid "Delete calendar '{0}'?"
-msgstr "Kustutada kalender '{0}'?"
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar is not marked for offline usage"
+msgstr ""
 
-#. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar.error.xml.h:48
+msgid "The task list is not marked for offline usage"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
-#. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
-msgid "Delete task list '{0}'?"
-msgstr "Kas kustutata ülesannete loend '{0}'?"
-
-#. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-#. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Oled sa kindel, et soovid seda sündmust ilma kokkuvõtteta saata?"
+#: ../calendar/calendar.error.xml.h:51
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
 
-#. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
-msgid "Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about."
+#: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to save your changes to this task?"
+msgstr "Kas soovid selle ülesande muudatusi salvestada?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
+"Kas soovid teisi osalejaid selle päevikukirje katkestamisest teavitada?"
 
-#: calendar/calendar-errors.xml.h:127
-#: calendar/calendar-errors.xml.h:132
-#: 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"
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr "Kas soovid teisi osalejaid katkestamisest teavitada?"
 
-#. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
+#: ../calendar/calendar.error.xml.h:55
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 
-#. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
-msgid "Adding a meaningful Summary to your task will give your recipients an idea of what your task is about."
-msgstr ""
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send this task to participants?"
+msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 
-#. calendar:prompt-no-contents-offline-calendar primary
-#: calendar/calendar-errors.xml.h:134
-msgid "Error loading calendar"
-msgstr "Viga kalendri laadimisel"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 
-#. calendar:prompt-no-contents-offline-calendar secondary
-#: calendar/calendar-errors.xml.h:136
-msgid "The calendar is not marked for offline usage"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send updated task information to participants?"
+msgstr "Kas soovid saata osalejatele värskemat teavet ülesande kohta?"
 
-#. calendar:prompt-no-contents-offline-tasks primary
-#: calendar/calendar-errors.xml.h:138
-msgid "Error loading task list"
-msgstr "Viga ülesandeloendi laadimisel"
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Sa oled muutnud seda sündmust, kuid muudatused ei ole salvestatud."
 
-#. calendar:prompt-no-contents-offline-tasks secondary
-#: calendar/calendar-errors.xml.h:140
-msgid "The task list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:61
+msgid "You have made changes to this task, but not yet saved them."
+msgstr "Sa oled seda ülesannet muutnud aga muudatused on salvestamata."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#. calendar:server-version secondary
-#: calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version"
+#: ../calendar/calendar.error.xml.h:63
+msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: calendar/common/authentication.c:49
-#: calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/calendar.error.xml.h:64
+#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Salvesta"
+
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+msgid "_Send"
+msgstr "_Saada"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "{0}."
+msgstr "{0}."
+
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Ei saa käivitada andmeserverit (evolution-data-server)"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki ei suudetud lugeda"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki ei suudetud lugeda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1290
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1292
 msgid "Calendars"
 msgstr "Kalendrid"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Häälesta siin oma ajavöönd, kalender ja ülesandeloend"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolutioni kalender ja ülesanded"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolutioni kalendri seadistuste juhtimine"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution'i kalendri/ülesande redaktor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolutioni kalendrikomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Evolutioni ülesannetekomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1219
-#: calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:508
-#: calendar/gui/tasks-component.c:981
-#: calendar/gui/tasks-control.c:408
-#: calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:701
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
+#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-features/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendrid"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ülesanded"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution'i kalendri alarmteadete teenus"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:140
-#: calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Sündmus"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+msgid "Start time"
+msgstr "Algusaeg"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Appointment Title"
-msgstr "Sündmuse pealkiri"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#, c-format
+msgid ""
+"<big><b>%s</b></big>\n"
+"%s until %s"
+msgstr ""
 
-#. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:876
-msgid "End time:"
-msgstr "Lõpp:"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+msgid "Appointments"
+msgstr "Sündmused"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118
-#: plugins/itip-formatter/itip-view.c:859
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "_Edasilükkamise aeg:"
 
-#. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:867
-msgid "Start time:"
-msgstr "Algus:"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-#: filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153
-#: 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-tasks.xml.h:22
-#: ui/evolution.xml.h:38
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
 msgstr "_Lükka edasi"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "description of appointment"
 msgstr "sündmuse kirjeldus"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
-msgid "end-time"
-msgstr "lõppaeg"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "sündmuse asukoht"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
-msgid "location"
-msgstr "asukoht"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
-msgid "start-time"
-msgstr "algusaeg"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr "Katkesta"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:956
-#: calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
-msgstr "Asukoha kohta teave puudub."
+msgstr "Asukoha kohta puudub teave."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4177,12 +4191,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4194,10 +4208,11 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, 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"
@@ -4209,2127 +4224,2153 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa lähtestada Bonobot"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "vigane aeg"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 #, fuzzy
 msgid "Alarm programs"
 msgstr "Programmi käivitamine"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 #, fuzzy
 msgid "Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Täna tähtaja ületavate ülesannete värv"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 #, fuzzy
 msgid "Compress weekends in month view"
 msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 #, fuzzy
 msgid "Confirm expunge"
 msgstr "_Kinnituse küsimine enne kataloogi puhastamist"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 #, fuzzy
 msgid "Default appointment reminder"
 msgstr "Kustuta sündmus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 #, fuzzy
 msgid "Default reminder units"
 msgstr "Vaikimisi akna laius."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 #, fuzzy
 msgid "Default reminder value"
 msgstr "Vaikimisi vastamise laad"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 #, fuzzy
 msgid "Free/busy server urls"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 #, fuzzy
 msgid "Free/busy template url"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Peida lõpetatud ülesanded"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 #, fuzzy
 msgid "Hide task units"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 #, fuzzy
 msgid "Last alarm time"
 msgstr "algusaeg"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server urls for free/busy publishing."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Minute the workday ends on, 0 to 59"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut, millal tööpäev lõpeb, 0 kuni 59"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut, millal tööpäev algab, 0 kuni 59."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 #, fuzzy
 msgid "Month view horizontal pane position"
 msgstr "Horisontaalpaani asukoht"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 #, fuzzy
 msgid "Month view vertical pane position"
 msgstr "Vertikaalpaani asukoht põhivaates"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
-msgid "Position of the vertical pane, between task list and the task preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr "Vertikaalpaani asukoht ülesandevaates"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
-msgid "The url template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgid ""
+"The url template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-msgid "Time divisions</short> <short>Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#, fuzzy
+msgid "Time divisions"
+msgstr "_Aja jaotised:"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas peita lõpetatud ülesanded"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas küsida nõusolekut sündmuste kustutamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "Kas näidata kellaaega 24-tunnises vormingus või kasutada EL/PL vormingut"
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Kas näidata kellaaega 24-tunnises vormingus või kasutada EL/PL vormingut"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-commands.c:120
-#: calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:362
-#: calendar/gui/gnome-cal.c:1943
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:1974
+#: ../plugins/groupwise-features/camel-gw-listener.c:382
+#: ../plugins/groupwise-features/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:355
-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 lõplikult kõik sündmused, mis on vanemad kui valitud päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
+#: ../calendar/gui/calendar-commands.c:355
+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 lõplikult kõik sündmused, mis on vanemad kui valitud "
+"päevade arv. Eemaldatud sõnumeid ei ole hiljem enam võimalik taastada."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Puhasta sündmustest, mis on vanemad kui"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#: filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
-#: plugins/calendar-weather/calendar-weather.c:566
-#: widgets/misc/e-send-options.glade.h:39
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "päeva"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: calendar/gui/calendar-component.c:223
-#: calendar/gui/migration.c:486
-#: calendar/gui/migration.c:579
-#: calendar/gui/tasks-component.c:204
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "Veebis"
 
-#: calendar/gui/calendar-component.c:241
-#: calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
 #. Create the weather group
-#: calendar/gui/calendar-component.c:247
-#: plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:258
+#: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Ilm"
 
-#: calendar/gui/calendar-component.c:524
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:450
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:843
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1155
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1267
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: calendar/gui/calendar-component.c:1456
+#: ../calendar/gui/calendar-component.c:1458
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: calendar/gui/calendar-component.c:1457
+#: ../calendar/gui/calendar-component.c:1459
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1460
 msgid "Create a new appointment"
 msgstr "Lisab uue sündmuse"
 
-#: calendar/gui/calendar-component.c:1464
+#: ../calendar/gui/calendar-component.c:1466
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1465
+#: ../calendar/gui/calendar-component.c:1467
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1468
 msgid "Create a new meeting request"
 msgstr "Loob uue koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1472
+#: ../calendar/gui/calendar-component.c:1474
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1473
+#: ../calendar/gui/calendar-component.c:1475
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1476
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava sündmuse"
 
-#: calendar/gui/calendar-component.c:1480
+#: ../calendar/gui/calendar-component.c:1482
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1484
 msgid "Create a new calendar"
 msgstr "Loob uue kalendri"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Päeva vaade"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Töönädala vaade"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Nädala vaade"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Viga kalendri avamisel"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: calendar/gui/comp-editor-factory.c:437
-#: shell/e-shell.c:1260
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Valikud</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Kordumine</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Alarmi lisamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Kohandatud _sõnum"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Kohandatud alarmheli"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "_Sõnum:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Heli mängimine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Hoiatuse kuvamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Programmi käivitamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "E-kirja saatmine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
 msgstr "_Argumendid:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
 msgstr "_Programm:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
 msgstr "_Alarmi täiendav kordamine"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
 msgstr "_Heli:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "pärast"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "enne"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "päev(a)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "sündmuse lõppu"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
-#: filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
-#: plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "minut(it)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "L_isa"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
+#: ../composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:111
-#: composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
+#: ../composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
+#: ../composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:298
-#: calendar/gui/dialogs/cal-attachment-bar.c:913
-#: composer/e-msg-composer-attachment-bar.c:295
-#: mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "manus"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:439
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:437
-#: plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
+#: ../calendar/gui/dialogs/meeting-page.c:837
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:440
-#: composer/e-msg-composer-attachment-bar.c:438
-#: mail/em-folder-tree.c:2818
-#: ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:442
-#: composer/e-msg-composer-attachment-bar.c:440
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../composer/e-msg-composer-attachment-bar.c:473
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
-#: calendar/gui/dialogs/cal-attachment-bar.c:699
-#: composer/e-msg-composer-attachment-bar.c:703
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
+#: ../composer/e-msg-composer-attachment-bar.c:740
 #, fuzzy
 msgid "Attachment Bar"
 msgstr "Manus"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: calendar/gui/dialogs/cal-attachment.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:95
-#: composer/e-msg-composer-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:96
+#: ../composer/e-msg-composer-select-file.c:116
 msgid "Suggest automatic display of attachment"
 msgstr "Manuse automaatkuvamise soovitamine"
 
-#: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:231
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:235
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: calendar/gui/dialogs/cal-attachment.c:197
-#: calendar/gui/dialogs/cal-attachment.c:213
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:210
+#: ../calendar/gui/dialogs/cal-attachment.c:226
+#: ../calendar/gui/dialogs/cal-attachment.c:319
+#: ../calendar/gui/dialogs/cal-attachment.c:335
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ei saa lisada faili manusesse: %s: %s"
 
-#: calendar/gui/dialogs/cal-attachment.c:205
-#: composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:218
+#: ../calendar/gui/dialogs/cal-attachment.c:327
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:2
-#: composer/e-msg-composer-attachment.glade.h:2
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Manuse omadused"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:68
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:4
-#: composer/e-msg-composer-attachment.glade.h:4
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Faili nimi:"
 
-#: calendar/gui/dialogs/cal-attachment.glade.h:5
-#: composer/e-msg-composer-attachment.glade.h:5
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME tüüp:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: mail/em-account-prefs.c:460
-#: mail/em-composer-prefs.c:888
-#: plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Oled sa kindel, et soovid eemaldada seda URL'i?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Eemalda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ära eemalda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: mail/em-account-prefs.c:307
-#: mail/em-account-prefs.c:335
-#: mail/em-account-prefs.c:366
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Keela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: mail/em-account-prefs.c:307
-#: mail/em-account-prefs.c:335
-#: mail/em-account-prefs.c:368
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Luba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Alarmid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Üldine</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>Avalikustamine</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Ülesandeloend</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Aeg</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Töönädal</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post aadressist.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
+"aadressist.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendri ja ülesannete sätted"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Päev(a)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Kuva"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: mail/mail-config.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Reede"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Tund(i)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minut(it)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Publishing Table"
+msgstr "<b>Avalikustamine</b>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletuse näitamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr "_N"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
 msgstr "Mall:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.c:1043
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "Ajavorming:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr "Nä_dala algus:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr "_URL'i lisamine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr "Päev _algab:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr "_R"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
 msgstr "_Peida lõpetatud ülesanded pärast"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr "_E"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
 msgstr "_Tähtaja ületanud ülesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr "_L"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
 msgstr "_Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr "_Aja jaotised:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr "_T"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr ""
 "Kalendri sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+#, fuzzy
+msgid "Copy task list contents locally for offline operation"
+msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Vä_rvus:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Ülesannete loend"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:448
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Kalendri lisamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Lisa uus ülesandeloend"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#: mail/mail-config.glade.h:102
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:105
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "Lisa _kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "Lisa uus _ülesandeloend"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
-#: plugins/calendar-weather/calendar-weather.c:549
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "_Värskendamissagedus:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#: filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
-#: plugins/calendar-weather/calendar-weather.c:567
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "nädalat"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Antud ülesanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Antud päeviku sissekanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr ""
+"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Antud sündmust on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Antud ülesannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Antud päeviku sissekannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
+msgstr ""
+"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
+"redaktorit?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:181
-#: composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:184 ../composer/e-msg-composer.c:2654
 #, c-format
 msgid "Attached message - %s"
 msgstr ""
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:186
-#: calendar/gui/dialogs/comp-editor.c:349
-#: composer/e-msg-composer.c:2681
-#: composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:189
+#: ../calendar/gui/dialogs/comp-editor.c:358 ../composer/e-msg-composer.c:2659
+#: ../composer/e-msg-composer.c:2835
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/dialogs/comp-editor.c:412
-#: calendar/gui/e-calendar-table.c:1164
-#: calendar/gui/e-calendar-view.c:1402
-#: composer/e-msg-composer.c:2906
-#: mail/em-folder-tree.c:1046
-#: mail/em-folder-view.c:966
-#: mail/message-list.c:1707
-#: 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:105
-#: ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/dialogs/comp-editor.c:421
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1474 ../composer/e-msg-composer.c:2899
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../mail/message-list.c:1708 ../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:100 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/dialogs/comp-editor.c:413
-#: composer/e-msg-composer.c:2907
-#: mail/em-folder-tree.c:1047
-#: mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862
-#: mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:422 ../composer/e-msg-composer.c:2900
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-view.c:929
+#: ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Liiguta"
 
-#: calendar/gui/dialogs/comp-editor.c:415
-#: composer/e-msg-composer.c:2909
-#: mail/em-folder-tree.c:1049
-#: mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:424 ../composer/e-msg-composer.c:2902
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:697
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:820
-#: composer/e-msg-composer.c:2310
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
+#: ../calendar/gui/dialogs/comp-editor.c:876 ../composer/e-msg-composer.c:2308
+#, fuzzy, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: calendar/gui/dialogs/comp-editor.c:873
-#: composer/e-msg-composer.c:2339
-msgid "Hide _Attachment Bar (drop attachments here)"
+#: ../calendar/gui/dialogs/comp-editor.c:971
+#, fuzzy
+msgid "_Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba peitmine (tõsta manused siia)"
 
-#: calendar/gui/dialogs/comp-editor.c:876
-#: calendar/gui/dialogs/comp-editor.c:928
-#: composer/e-msg-composer.c:2342
-#: composer/e-msg-composer.c:3471
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "_Manuseriba kuvamine (tõsta manused siia)"
-
-#: calendar/gui/dialogs/comp-editor.c:952
-#: composer/e-msg-composer.c:3493
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1499
-#: calendar/gui/dialogs/comp-editor.c:1542
+#: ../calendar/gui/dialogs/comp-editor.c:1581
+#: ../calendar/gui/dialogs/comp-editor.c:1624
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: calendar/gui/dialogs/comp-editor.c:1505
-#: calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1587
+#: ../calendar/gui/dialogs/comp-editor.c:1630
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1507
-#: calendar/gui/dialogs/comp-editor.c:1550
+#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1632
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1511
-#: calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1593
+#: ../calendar/gui/dialogs/comp-editor.c:1636
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1513
-#: calendar/gui/dialogs/comp-editor.c:1556
+#: ../calendar/gui/dialogs/comp-editor.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1638
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1516
-#: calendar/gui/dialogs/comp-editor.c:1559
+#: ../calendar/gui/dialogs/comp-editor.c:1598
+#: ../calendar/gui/dialogs/comp-editor.c:1641
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1527
-#: calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1609
+#: ../calendar/gui/dialogs/comp-editor.c:1651
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:2003
-#: calendar/gui/dialogs/comp-editor.c:2036
-#: calendar/gui/dialogs/comp-editor.c:2060
+#: ../calendar/gui/dialogs/comp-editor.c:2089
+#: ../calendar/gui/dialogs/comp-editor.c:2122
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2170
 msgid "Unable to use current version!"
-msgstr "Praegust versiooni ei saa kasutada!"
+msgstr "Praegust versiooni pole võimalik kasutada!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Lähteallika avamine nurjus"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Sihtkoha avamine nurjus"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Sihtkoht on kirjutuskaitstud"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
-msgstr "Seda sündmust ei saa tänu corba veale kustutada"
+msgstr "Seda sündmust pole võimalik tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
-msgstr "Seda ülesannet ei saa tänu corba veale kustutada"
+msgstr "Seda ülesannet pole võimalik tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Päeviku sissekannet ei saa kustutada tänu corba veale"
+msgstr "Päeviku sissekannet pole võimalik tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
-msgstr "Seda elementi ei saa tänu corba veale kustutada"
+msgstr "Seda elementi pole võimalik tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Sündmust ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Ülesannet ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Päeviku sissekannet ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Elementi ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Sündmust ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Ülesannet ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Päeviku sissekannet ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Elementi ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontaktid..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Delegeerida:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Sündmus"
+
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:161
-#: calendar/gui/dialogs/event-editor.c:233
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:420
 msgid "Scheduling"
 msgstr "Plaanimine"
 
-#: calendar/gui/dialogs/event-editor.c:168
-#: calendar/gui/dialogs/event-editor.c:236
-#: calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:175
+#, fuzzy
+msgid "Delegatees"
+msgstr "Delegeeritud"
+
+#: ../calendar/gui/dialogs/event-editor.c:179
+#, fuzzy
+msgid "Attendees"
+msgstr "Osaleja"
+
+#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:423
 msgid "Invitations"
 msgstr "Kutsed"
 
-#: calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:725
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:728
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:894
-#: calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:894
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:904
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:927
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:934
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/event-page.c:1680
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Kalendrit '%s' ei saa avada."
+msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: calendar/gui/dialogs/event-page.c:1881
+#: ../calendar/gui/dialogs/event-page.c:1886
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: calendar/gui/dialogs/event-page.c:1889
+#: ../calendar/gui/dialogs/event-page.c:1894
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/event-page.c:1902
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "1 päev enne sündmust"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "1 tund enne sündmust"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "<b>Basics</b>"
 msgstr "<b>Sisu</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Date and Time</b>"
 msgstr "<b>Kuupäev ja kellaaeg</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<b>Send Options</b>"
 msgstr "<b>Saatmise valikud</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Kestab kogu _päeva"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "Ad_vanced  send options"
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "_Kohanda..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "_Liigitamine"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305
-#: calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/e-calendar-table.c:362
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "_Asukoht:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:303
-#: calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/e-calendar-table.c:361
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-cal-list-view.c:253
-#: calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-cal-model.c:301
-#: calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Näita aega kui _hõivatut"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Su_mmary:"
 msgstr "K_okkuvõte:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Sellel sündmusel on kohandatud alarmid"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Algus:"
 
+#: ../calendar/gui/dialogs/meeting-page.c:303
+#, fuzzy
+msgid "<b>Dele_gatees</b>"
+msgstr "<b>_Allkirjad</b>"
+
+#: ../calendar/gui/dialogs/meeting-page.c:307
+#, fuzzy
+msgid "From:"
+msgstr "_Saatja:"
+
 #. an empty string is the same as 'None'
 #. 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:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652
-#: calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2117
-#: filter/filter-rule.c:878
-#: mail/em-account-editor.c:684
-#: mail/em-account-editor.c:1290
-#: mail/em-account-prefs.c:421
-#: mail/em-folder-view.c:993
-#: plugins/calendar-weather/calendar-weather.c:371
-#: plugins/calendar-weather/calendar-weather.c:425
-#: plugins/itip-formatter/itip-formatter.c:1376
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248
-#: widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497
-#: widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:313
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1062
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../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
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:834
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:308
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:325
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osaleja"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Osavõtja lisamiseks vajuta siia"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Üldine nimi"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Kust delegeeritud"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Kuhu delegeeritud"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Keel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Liige"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:333
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:353
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:146
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:340
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
-#: mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:147
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:361
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>_Osalejad</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
 msgstr "_Muuda korraldajat"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "_Kontaktid..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
 msgstr "Ko_rraldaja:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr "Korraldaja"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendri valikud</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Lisa uus kalender"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalendri grupp"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalendri asukoht"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalendri nimi"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Ülesandeloendi valikud</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Lisa uus ülesandeloend"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Ülesandeloendi grupp"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Ülesandeloendi nimi"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:51
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:55
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+#: ../calendar/gui/dialogs/recur-comp.c:59
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Ainult see juhtum"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "See ja eelnevad juhtumid"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "See ja tulevad juhtumid"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Kõik juhtumid"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:812
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: calendar/gui/dialogs/recurrence-page.c:923
+#: ../calendar/gui/dialogs/recurrence-page.c:926
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "first"
 msgstr "esimene"
 
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "second"
 msgstr "teine"
 
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "fourth"
 msgstr "neljas"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "last"
 msgstr "viimane"
 
-#: calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "day"
 msgstr "päev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1367
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-#: mail/mail-config.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Kordumine</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Vahemikuga"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "See sündmus _kordub"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "kuni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "igavesti"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "kuu(d)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "kuupäevani"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nädal(at)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
-#: calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:522
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Muu</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Olek</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-cal-model-tasks.c:345
-#: calendar/gui/e-cal-model-tasks.c:658
-#: calendar/gui/e-calendar-table.c:457
-#: calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196
-#: calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:382
-#: mail/message-list.c:1006
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Kõrge"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-cal-model-tasks.c:343
-#: calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-cal-model-tasks.c:731
-#: calendar/gui/e-calendar-table.c:456
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Töös"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:384
-#: mail/message-list.c:1004
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Madal"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250
-#: calendar/gui/e-cal-model.c:899
-#: calendar/gui/e-calendar-table.c:383
-#: mail/message-list.c:1005
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Keskmine"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-cal-model-tasks.c:341
-#: calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:455
-#: calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Pole alanud"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "Täitmis_protsent"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Määramata"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "_Lõpetamise kuupäev:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "Tä_htsus:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: calendar/gui/dialogs/task-editor.c:137
-#: calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Ülesanne"
 
-#: calendar/gui/dialogs/task-editor.c:157
-#: calendar/gui/dialogs/task-editor.c:219
-#: calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Täitjad"
 
-#: calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:873
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ei saa avada ülesandeid '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "_Kirjeldus:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Task Description"
 msgstr "Ülesande kirjeldus"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Vaba/hõivatud kal_endrid</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Avalikustamise sagedus</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>Avalikustamise _asukoht</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Vaba/Hõivatud avalikustamise sätted"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "Iga_päevane"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Käsitsi"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Parool:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "Parooli _meeldejätmine"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "Iga_nädalane"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d nädal"
 msgstr[1] "%d nädalat"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuti"
 msgstr[1] "%d minutit"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
-#: calendar/gui/e-alarm-list.c:474
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s enne sündmuse algust"
 
-#: calendar/gui/e-alarm-list.c:477
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s pärast sündmuse algust"
 
-#: calendar/gui/e-alarm-list.c:482
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s sündmuse alguses"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s enne sündmuse lõppu"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:500
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s pärast sündmuse lõppu"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:505
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s sündmuse lõpus"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s at %s"
 msgstr "%s @ %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-component-preview.c:70
-#: mail/em-folder-view.c:2573
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliki, et avada aadressi %s"
 
-#: calendar/gui/e-cal-component-preview.c:155
-#: filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Alguskuupäev:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #. write status
 #. translators: exchange out of office status header
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132
-#: plugins/exchange-account-setup/exchange-account-setup.c:209
-#: plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:227
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Olek:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Veebileht:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 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:21
+#: ../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
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: calendar/gui/e-cal-model-calendar.c:179
-#: calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/e-cal-model-calendar.c:182
-#: calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "N"
-msgstr "Põ"
-
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "S"
-msgstr "Lõ"
-
-#: calendar/gui/e-cal-model-tasks.c:299
-#: smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ida"
-
-#: calendar/gui/e-cal-model-tasks.c:299
-msgid "W"
-msgstr "Lä"
-
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6339,293 +6380,274 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:163
-#: calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178
-#: calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-cal-model.c:905
-#: calendar/gui/e-meeting-list-view.c:164
-#: calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307
-#: calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153
-#: 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:1173
-#: plugins/itip-formatter/itip-formatter.c:251
-#: plugins/itip-formatter/itip-formatter.c:1398
-#: plugins/plugin-manager/plugin-manager.c:72
-#: shell/e-component-registry.c:201
-#: shell/e-component-registry.c:205
-#: widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../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:1175
+#: ../plugins/itip-formatter/itip-formatter.c:251
+#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:516
+#: ../calendar/gui/e-calendar-table.c:516
 msgid "Task Table"
 msgstr "Ülesannete tabel"
 
-#: calendar/gui/e-calendar-table.c:694
-#: calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:653
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:873
-#: calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:780
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1014
-#: calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1083 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: calendar/gui/e-calendar-table.c:1156
-#: calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1467 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: calendar/gui/e-calendar-table.c:1158
-#: calendar/gui/e-calendar-view.c:1396
-#: mail/em-folder-view.c:976
-#: mail/em-popup.c:494
-#: ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1468 ../mail/em-folder-view.c:1043
+#: ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1159
-#: calendar/gui/e-calendar-view.c:1376
-#: calendar/gui/e-calendar-view.c:1397
-#: ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1448
+#: ../calendar/gui/e-calendar-view.c:1469 ../mail/em-folder-view.c:1044
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1163
-#: calendar/gui/e-calendar-view.c:1401
-#: ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1473 ../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:1165
-#: calendar/gui/e-calendar-view.c:1379
-#: calendar/gui/e-calendar-view.c:1403
-#: 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:119
-#: ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1451
+#: ../calendar/gui/e-calendar-view.c:1475 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1176
-#: calendar/gui/e-calendar-view.c:1414
-#: mail/em-folder-tree.c:2814
-#: mail/em-folder-view.c:980
-#: ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1487 ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: calendar/gui/e-calendar-table.c:1328
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
-#: mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Lõpetatud"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Lõpetamise kuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Alguskuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ülesannete sortimine"
 
-#: calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1204
 msgid "Moving items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1206
 msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1442
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1443
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1445
 msgid "New Task"
 msgstr "Uus ülesanne"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1455
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: calendar/gui/e-calendar-view.c:1385
-#: ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1457 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1458
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1391
-#: ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1463 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Avalikusta vaba/hõivatud teave"
 
-#: calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1479
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1481
+#, fuzzy
+msgid "_Delegate Meeting..."
+msgstr "_Ajasta koosolek..."
+
+#: ../calendar/gui/e-calendar-view.c:1482
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1483
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1489
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta seekordne sündmus"
 
-#: calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1490
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused kordused"
 
@@ -6634,9 +6656,8 @@ msgstr "Kustuta k_õik sündmused kordused"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115
-#: e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../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"
 
@@ -6645,13 +6666,12 @@ msgstr "%a, %d.%m.%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118
-#: e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../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"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6662,7 +6682,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:553
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutiline jaotamine"
@@ -6673,556 +6693,537 @@ msgstr "%02i-minutiline jaotamine"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:715
-#: calendar/gui/e-day-view.c:1494
-#: calendar/gui/e-week-view-main-item.c:312
-#: calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1499
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748
-#: calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751
-#: calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Iga päev"
 msgstr[1] "Iga %d päeva järel"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Iga nädal"
 msgstr[1] "Iga %d nädala järel"
 
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, 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:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Algab"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iKalendri teave"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:329
-#: plugins/itip-formatter/itip-view.c:330
-#: plugins/itip-formatter/itip-view.c:397
-#: plugins/itip-formatter/itip-view.c:398
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
-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:1137
-#: calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188
-#: calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:421
-#: plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/e-itip-control.c:1089
+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:1137
+#: ../calendar/gui/e-meeting-list-view.c:186
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: calendar/gui/e-itip-control.c:1141
-#: calendar/gui/itip-utils.c:424
-#: plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190
-#: calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:427
-#: calendar/gui/itip-utils.c:453
-#: plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1229
-msgid "The meeting has been cancelled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1229
+msgid ""
+"The meeting has been cancelled, however it could not be found in your "
+"calendars"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1231
-msgid "The task has been cancelled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1231
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, 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:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, 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:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, 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:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, 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:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, 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:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1358
-#: calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, 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:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, 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:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, 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:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, 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:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud teave"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, 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:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, 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:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 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:1959
+#: ../calendar/gui/e-itip-control.c:1959
 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:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek värskendatud\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:852
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:852
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
+msgstr ""
+"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:2029
-#: calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:2031
-#: calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
-msgstr "Seda kirjet ei saa saata!\n"
+msgstr "Seda kirjet pole võimalik saata!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Nõustun"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud teabe saatmine"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Värskenda vastaja olekut"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Saadab värskeima teabe"
 
-#: calendar/gui/e-itip-control.c:2375
-#: calendar/gui/itip-utils.c:441
-#: mail/mail-send-recv.c:414
-#: mail/mail-send-recv.c:466
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
+#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--kellele--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendri sõnum"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Kuupäev:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Kalendri laadimine"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Kalendri laadimine..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serveri teade:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "lõppkuup."
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:135
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Optional Participants"
 msgstr "Võimalikud osalejad"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:135
-#: calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116
-#: calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:146
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Isik"
 
-#: calendar/gui/e-meeting-list-view.c:136
-#: calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:147
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:137
-#: calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:138
-#: calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:149
-#: calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:150
-#: calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153
-#: calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:151
-#: calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:152
-#: calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:174
-#: calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209
-#: calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:177
-#: calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215
-#: calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:178
-#: calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:198
-#: calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Töös"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7232,11 +7233,9 @@ msgstr "%A, %d. %B %Y"
 #. %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:448
-#: calendar/gui/e-meeting-time-sel.c:2137
-#: 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:448
+#: ../calendar/gui/e-meeting-time-sel.c:2137 ../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"
 
@@ -7246,73 +7245,69 @@ msgstr "%a, %d.%m.%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299
-#: widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:413
-#: designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Teave puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:763
-#: calendar/gui/gnome-cal.c:2373
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7321,584 +7316,586 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:811
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:895
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan ülesanded asukohast %s"
 
-#: calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1091
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1114
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1141
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "Ajavööndi nupp"
 
 #. 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/e-week-view-main-item.c:329
-#: calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:723
 msgid "Updating query"
 msgstr "Päringu uuendamine"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2058
-#: widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Kohandatud vaade"
 
-#: calendar/gui/gnome-cal.c:2059
+#: ../calendar/gui/gnome-cal.c:2090
 msgid "Save Custom View"
 msgstr "Salvesta kohandatud vaade"
 
-#: calendar/gui/gnome-cal.c:2064
-#: widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Kirjelda vaateid..."
 
-#: calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2258
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2242
+#: ../calendar/gui/gnome-cal.c:2277
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2339
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:3229
+#: ../calendar/gui/gnome-cal.c:3268
 msgid "Purging"
 msgstr "Puhastamine"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "August"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Detsember"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Veebruar"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Jaanuar"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juuli"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juuni"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Märts"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktoober"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Kuupäeva valimine"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:270
-#: calendar/gui/itip-utils.c:318
-#: calendar/gui/itip-utils.c:350
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: calendar/gui/itip-utils.c:305
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:393
-#: calendar/gui/itip-utils.c:502
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:395
-#: calendar/gui/itip-utils.c:504
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:397
-#: calendar/gui/itip-utils.c:506
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Päevaraamatu teave"
 
-#: calendar/gui/itip-utils.c:399
-#: calendar/gui/itip-utils.c:524
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud teave"
 
-#: calendar/gui/itip-utils.c:401
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Kalendri teave"
 
-#: calendar/gui/itip-utils.c:437
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: calendar/gui/itip-utils.c:445
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: calendar/gui/itip-utils.c:449
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: calendar/gui/itip-utils.c:520
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud teave (%s -> %s)"
 
-#: calendar/gui/itip-utils.c:530
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: calendar/gui/itip-utils.c:672
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 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 ""
-"Evolution'i kontaktikaustade asukoht ja hierarhia on peale Evolution 1.x. versiooni muutunud.\n"
+"Evolution'i kontaktikaustade asukoht ja hierarhia on peale Evolution 1.x. "
+"versiooni muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 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..."
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:745
-#: calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "Kalendrit `%s' ei saa siirdada"
+msgstr "Kalendrit `%s' pole võimalik siirdada"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "Ülesandeid `%s' ei saa siirdada"
+msgstr "Ülesandeid `%s' pole võimalik siirdada"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "P"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "E"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "T"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "K"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "N"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "R"
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "L"
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1942
-#: calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1947
-#: calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valitud nädal (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Valitud kuu (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Summary: %s"
+msgstr "Kokkuvõte:"
+
+#: ../calendar/gui/print.c:2328
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "Asukoht:"
+
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2565
-#: calendar/gui/print.c:2653
-#: calendar/gui/print.c:2779
-#: mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
-#: calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Trüki kirje"
 
-#: calendar/gui/tasks-component.c:428
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr "Uus ülesandeloend"
 
-#: calendar/gui/tasks-component.c:504
+#: ../calendar/gui/tasks-component.c:515
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ülesanne"
 msgstr[1] "%d ülesannet"
 
-#: calendar/gui/tasks-component.c:506
-#: mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valitud"
 msgstr[1] ", %d valitud"
 
-#: calendar/gui/tasks-component.c:553
+#: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: calendar/gui/tasks-component.c:847
+#: ../calendar/gui/tasks-component.c:860
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:862
+#: ../calendar/gui/tasks-component.c:875
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:956
+#: ../calendar/gui/tasks-component.c:969
 msgid "Task Source Selector"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1139
+#: ../calendar/gui/tasks-component.c:1152
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:1140
+#: ../calendar/gui/tasks-component.c:1153
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:1141
+#: ../calendar/gui/tasks-component.c:1154
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:1147
+#: ../calendar/gui/tasks-component.c:1160
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: calendar/gui/tasks-component.c:1148
+#: ../calendar/gui/tasks-component.c:1161
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: calendar/gui/tasks-component.c:1149
+#: ../calendar/gui/tasks-component.c:1162
 msgid "Create a new assigned task"
 msgstr "Lisab uue omistatud ülesande"
 
-#: calendar/gui/tasks-component.c:1155
+#: ../calendar/gui/tasks-component.c:1168
 msgid "New task list"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:1156
+#: ../calendar/gui/tasks-component.c:1169
 msgid "Task l_ist"
 msgstr "Ü_lesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:1157
+#: ../calendar/gui/tasks-component.c:1170
 msgid "Create a new task list"
 msgstr "Lisab uue ülesannete nimekirja"
 
-#: calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:370
 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:373
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "PETKNRL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution'i intelligentne kalendriimportija"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Evolution'i iKalendri imoportija"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Evolution'i vKalendri importija"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iKalendri failid (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vKalendri failid (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Sündmused ja koosolekud"
 
-#: calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Meeldetuletus!!"
 
-#: calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Kalendrisündmused"
 
-#: calendar/importers/icalendar-importer.c:719
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7911,1540 +7908,1540 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Aafrika/Abidjan"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Aafrika/Accra"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Aafrika/Addis_Ababa"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Aafrika/Alžeeria"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Aafrika/Asmara"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Aafrika/Bamako"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Aafrika/Bangui"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Aafrika/Banjul"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Aafrika/Bissau"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Aafrika/Blantyre"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Aafrika/Brazzaville"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Aafrika/Bugumbura"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Aafrika/Kairo"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Aafrika/Casablanca"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Aafrika/Ceuta"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Aafrika/Conakry"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Aafrika/Dakar"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Aafrika/Dar_es_Salaam"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Aafrika/Djibouti"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Aafrika/Douala"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Aafrika/El_Aauin"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Aafrika/Freetown"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Aafrika/Gaborone"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Aafrika/Harare"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Aafrika/Johannesburg"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Aafrika/Kampala"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Aafrika/Khartum"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Aafrika/Kigali"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Aafrika/Kinshasa"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Aafrika/Lagos"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Aafrika/Libreville"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Aafrika/Lome"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Aafrika/Luanda"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Aafrika/Lubumbashi"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Aafrika/Lusaka"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Aafrika/Malabo"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Aafrika/Maputo"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Aafrika/Maseru"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Aafrika/Mbabane"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Aafrika/Mogadishu"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Aafrika/Monrovia"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Aafrika/Nairobi"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Aafrika/Ndjamena"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Aafrika/Niamey"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Aafrika/Nouakchott"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Aafrika/Ouagadougou"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Aafrika/Porto-Novo"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Aafrika/Sao_Tome"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Aafrika/Timbuktu"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Aafrika/Tripoli"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Aafrika/Tunis"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Aafrika/Windhoek"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Ameerika/Adak"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Ameerika/Anchorage"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Ameerika/Anguilla"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Ameerika/Antigua"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Ameerika/Araguaina"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Ameerika/Aruba"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Ameerika/Asuncion"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Ameerika/Barbados"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Ameerika/Belem"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Ameerika/Belize"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Ameerika/Boa_Vista"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Ameerika/Bogota"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Ameerika/Boise"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Ameerika/Buenos_Aires"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Ameerika/Cambridge_Bay"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Ameerika/Cancun"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Ameerika/Caracas"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Ameerika/Catamarca"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Ameerika/Cayenne"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Ameerika/Cayman"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Ameerika/Chicago"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Ameerika/Chihuahua"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Ameerika/Cordoba"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Ameerika/Costa_Rica"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Ameerika/Cuiaba"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Ameerika/Curacao"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Ameerika/Damnarkshavn"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Ameerika/Dawson"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Ameerika/Dawson_Creek"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Ameerika/Denver"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Ameerika/Detroit"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Ameeria/Dominica"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Ameerika/Edmonton"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Ameerika/Eirunepe"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Ameerika/El_Salvador"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Ameerika/Fortaleza"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Ameerika/Glace_Bay"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Ameerika/Godthab"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Ameerika/Goose_Bay"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Ameerika/Grand_Turk"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Ameeria/Grenada"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Ameerika/Guadeloupe"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Ameerika/Guatemala"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Ameerika/Guayaquil"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Ameerika/Guyana"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Ameerika/Halifax"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Ameerika/Havana"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Ameerika/Hermosillo"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameerika/Indiana/Indianapolis"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Ameerika/Indiana/Knox"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Ameerika/Indiana/Marengo"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Ameerika/Indiana/Vevay"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Ameerika/Indianapolis"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Ameerika/Inuvik"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Ameerika/Iqaluit"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Ameerika/Jamaika"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Ameerika/Jujuy"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Ameerika/Juneau"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Ameerika/Kentucky/Louisville"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Ameerika/Kentucky/Monticello"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Ameerika/La_Paz"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Ameerika/Lima"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Ameerika/Los_Angeles"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Ameerika/Louisville"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Ameerika/Maceio"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Ameerika/Managua"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Ameerika/Manaus"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Ameerika/Martinique"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Ameerika/Mazatlan"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Ameerika/Mendoza"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Ameerika/Menominee"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Ameerika/Merida"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Ameerika/Mexico_City"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "Ameerika/Miquelon"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Ameerika/Monterrey"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Ameerika/Montevideo"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Ameerika/Montreal"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Ameerika/Montserrat"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Ameerika/Nassau"
 
-#: calendar/zones.h:138
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Ameerika/New_York"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Ameerika/Nipigon"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Ameerika/Nome"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Ameerika/Noronha"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Ameerika/Põhja_Dakota/Center"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Ameerika/Panama"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Ameerika/Pangnirtung"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Ameerika/Paramaribo"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Ameerika/Phoenix"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Ameerika/Port-au-Prince"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Ameerika/Port_of_Spain"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Ameerika/Porto_Velho"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Ameerika/Puerto_Rico"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Ameerika/Rainy_River"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Ameerika/Rankin_Inlet"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Ameerika/Recife"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Ameerika/Regina"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Ameerika/Rio_Branco"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Ameerika/Rosario"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Ameerika/Santiago"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Ameerika/Santo_Domingo"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Ameerika/Sao_Paulo"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Ameerika/Scoresbysund"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Ameerika/Shiprocks"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Ameerika/St_Johns"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Ameerika/St_Kitts"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Ameerika/St_Lucia"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Ameerika/St_Thomas"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Ameerika/St_Vincent"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Ameerika/Swift_Current"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Ameerika/Tegucigalpa"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Ameerika/Thule"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Ameerika/Thunder_Bay"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Ameerika/Tijuana"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Ameerika/Tortola"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Ameerika/Vancouver"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Ameerika/Whitehorse"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Ameerika/Winnipeg"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Ameerika/Yakutat"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Ameerika/Yelloknife"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDurville"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arktika/Longyearbyen"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Aasia/Aden"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Aasia/Almaty"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Aasia/Amman"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Aasia/Anadyr"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Aasia/Aqtau"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Aasia/Aqtobe"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Aasia/Ashgabat"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Aasia/Bagdad"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Aasia/Bahrein"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Aasia/Bakuu"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Aasia/Bangkok"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Aasia/Beirut"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Aasia/Bishkek"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Aasia/Brunei"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Aasia/Calcutta"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Aasia/Choibalsan"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Aasia/Chongqing"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Aasia/Colombo"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Aasia/Damascus"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Aasia/Dhaka"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Aasia/Dili"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Aasia/Dubai"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Aasia/Dushanbe"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Aasia/Gaza"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Aasia/Harbin"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Aasia/Hong_Kong"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Aasia/Hovd"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Aasia/Irkuts"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Aasia/Istanbu"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Aasia/Jakarta"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Aasia/Jayapura"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Aasia/Jeruusalem"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Aasia/Kabul"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Aasia/Kamchatka"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Aasia/Karachi"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Aasia/Kashgar"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Aasia/Katmandu"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Aasia/Krasnojarsk"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Aasia/Kuala_Lumpur"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Aasia/Kuching"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Aasia/Kuveit"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Aasia/Macao"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Aasia/Macau"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Aasia/Magadan"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Aasia/Makassar"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Aasia/Muscat"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Aasia/Nicosia"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Aasia/Oral"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Aasia/Phnom_Penh"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Aasia/Pontianak"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Aasia/Pyongyang"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Aasia/Qatar"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Aasia/Qyzylorda"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Aasia/Rangoon"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Aasia/Riyadh"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Aasia/Saigon"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Aasia/Sakhalin"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Aasia/Seoul"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapur"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Aasia/Tashkent"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Aasia/Tehran"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Aasia/Thimphu"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Aasia/Ujung_Pandang"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaator"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Aasia/Urumqi"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Aasia/Vientiane"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Jakuts"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Jekaterinburg"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlandi_ookean/Bermuda"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlandi_ookean/Canary"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlandi_ookean/Cape_Verde"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlandi_ookean/Fääri_saared"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlandi_ookean/Jan_Mayen"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlandi_ookean/Madeira"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlandi_ookean/Reykjavik"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlandi_ookean/South_Georgia"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlandi_ookean/St_Helena"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlandi_ookean/Stanley"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Austraalia/Adelaide"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Austraalia/Brisbane"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Austraalia/Broken_Hill"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Austraalia/Darwin"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Austraalia/Hobart"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Austraalia/Lindeman"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Austraalia/Lord_Howe"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Austraalia/Melbourne"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Austraalia/Perth"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austraalia/Sydney"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Euroopa/Amsterdam"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Euroopa/Andorra"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Euroopa/Ateena"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Euroopa/Belfast"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Euroopa/Belgrad"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Euroopa/Berliin"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Euroopa/Bratislava"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Euroopa/Brüssel"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Euroopa/Bukarest"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Euroopa/Budapest"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Euroopa/Chisinau"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Euroopa/Kopenhaagen"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Euroopa/Dublin"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Euroopa/Gibraltar"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Euroopa/Helsingi"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Euroopa/Istanbul"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Euroopa/Kaliningrad"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Euroopa/Kiiev"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Euroopa/Lisbon"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Euroopa/Ljubljana"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Euroopa/London"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Euroopa/Luxembourg"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Euroopa/Madriid"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Euroopa/Malta"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Euroopa/Minsk"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Euroopa/Monaco"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Euroopa/Moskva"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Euroopa/Nicosia"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Euroopa/Oslo"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Euroopa/Pariis"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Euroopa/Praha"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Euroopa/Riia"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Euroopa/Rooma"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Euroopa/Samaara"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Euroopa/San_Marino"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Euroopa/Sarajevo"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Euroopa/Simferoopol"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Euroopa/Skopje"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Euroopa/Sofia"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Euroopa/Stockholm"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Euroopa/Tallinn"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Euroopa/Tirana"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Euroopa/Vaduz"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Euroopa/Vatikan"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Euroopa/Viin"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Euroopa/Vilnius"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Euroopa/Varssavi"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Euroopa/Zagreb"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozie"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Euroopa/Zürich"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "India_ookean/Antananarivo"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "India_ookean/Chagos"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "India_ookean/Christmas"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "India_ookean/Cocos"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "India_ookean/Comoro"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "India_ookean/Kerguelen"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "India_ookean/Mahe"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "India_ookean/Maldives"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "India_ookean/Mauritius"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "India_ookean/Mayotte"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "India_ookean/Reunion"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Vaikne_ookean/Apia"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Vaikne_ookean/Auckland"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Vaikne_ookean/Chatham"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Vaikne_ookean/Easter"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Vaikne_ookean/Efate"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Vaikne_ookean/Enderbury"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Vaikne_ookean/Fakaofo"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Vaikne_ookean/Fiji"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Vaikne_ookean/Funafuti"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Vaikne_ookean/Galapagos"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Vaikne_ookean/Gambier"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Vaikne_ookean/Guadalcanal"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Vaikne_ookean/Guam"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Vaikne_ookean/Honolulu"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Vaikne_ookean/Johnston"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Vaikne_ookean/Kiritimati"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Vaikne_ookean/Kosrae"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Vaikne_ookean/Kwajalein"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Vaikne_ookean/Majuro"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Vaikne_ookean/Marquesas"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Vaikne_ookean/Midway"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Vaikne_ookean/Nauru"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Vaikne_ookean/Niue"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Vaikne_ookean/Norfolk"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Vaikne_ookean/Noumea"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Vaikne_ookean/Pago_Pago"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Vaikne_ookean/Palau"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Vaikne_ookean/Pitcairn"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Vaikne_ookean/Ponape"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Vaikne_ookean/Port_Moresby"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Vaikne_ookean/Rarotonga"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Vaikne_ookean/Saipan"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Vaikne_ookean/Tahiti"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Vaikne_ookean/Tarawa"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Vaikne_ookean/Tongatapu"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Vaikne_ookean/Truk"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Vaikne_ookean/Wake"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Vaikne_ookean/Wallis"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
-#: composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:525
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:526
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:560
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
@@ -9455,363 +9452,381 @@ msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:590
 msgid "_Reply-To:"
 msgstr "_Vasta-kellele:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:597
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:598
+#: ../composer/e-msg-composer-hdrs.c:604
 msgid "S_ubject:"
 msgstr "_Teema:"
 
-#: composer/e-msg-composer-hdrs.c:608
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:615
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:612
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:616
+#: ../composer/e-msg-composer-hdrs.c:622
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:617
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+#: ../composer/e-msg-composer-hdrs.c:623
+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
 #.
-#: composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "_Post To:"
 msgstr "_Postita kellele:"
 
-#: composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:635
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:641
 #, fuzzy
 msgid "Post To:"
 msgstr "Postita kellele:"
 
-#: composer/e-msg-composer.c:730
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole signeerimissertifikaati määratud."
+#: ../composer/e-msg-composer-select-file.c:81
+#, fuzzy
+msgid "A_ttach"
+msgstr "Manusta"
+
+#: ../composer/e-msg-composer.c:737
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
+"signeerimissertifikaati määratud."
 
-#: composer/e-msg-composer.c:737
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole krüptimissertifikaati määratud."
+#: ../composer/e-msg-composer.c:744
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
+"krüptimissertifikaati määratud."
 
-#: composer/e-msg-composer.c:1222
-#: composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1292
 msgid "Could not open file"
 msgstr "Tõrge faili avamisel"
 
-#: composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1300
 msgid "Unable to retrieve message from editor"
 msgstr "Ei saa sõnumit redaktorist kätte"
 
-#: composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1570
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1604
+#: ../composer/e-msg-composer.c:1604
 msgid "Open File"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:2001
-#: mail/em-account-editor.c:587
-#: mail/em-account-editor.c:632
-#: mail/em-account-editor.c:699
+#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: composer/e-msg-composer.c:2100
+#: ../composer/e-msg-composer.c:2095
 msgid "Si_gnature:"
 msgstr "_Signatuur:"
 
-#: composer/e-msg-composer.c:2359
-#: composer/e-msg-composer.c:3360
-#: composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2337 ../composer/e-msg-composer.c:3373
+#: ../composer/e-msg-composer.c:3374
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
 
-#: composer/e-msg-composer.c:4542
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
-msgstr "<b>(Redaktor sisaldab mittetekstilist sõnumit ja seda ei ole võimalik redigeerida.)<b>"
+#: ../composer/e-msg-composer.c:3484
+#, fuzzy
+msgid "_Attachment Bar"
+msgstr "Manus"
 
-#. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Sa ei saa sellele sõnumile manustada faili `{0}'"
+#: ../composer/e-msg-composer.c:4557
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redaktor sisaldab mittetekstilist sõnumit ja seda ei ole võimalik "
+"redigeerida.)<b>"
 
-#. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Fail `{0}' ei ole tavafail ja seda ei saa sõnumis saata."
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
 
-#. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
-msgid "Directories can not be attached to Messages."
-msgstr "Katalooge ei saa sõnumitele manustada."
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Kõik kontod on kustutatud."
 
-#. 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."
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"Kas sa tõesti soovid tühistada sõnumit '{0}', mille koostamine on pooleli?"
+
+#: ../composer/mail-composer.error.xml.h:4
+#, fuzzy
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "Sa pead sõnumile valima teised seaded, põhjus: \"{0}\"."
+
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:16
+#, fuzzy
+msgid "Because &quot;{1}&quot;."
+msgstr "Kuna \"{1}\"."
+
+#: ../composer/mail-composer.error.xml.h:6
+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 ""
+"Selle redaktoriakna sulgemine tühistab sõnumi lõplikult. Kui sa tahad sõnumi "
+"koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
 
-#. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr "Redaktoriakent pole võimalik luua."
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr "Sõnumit pole võimalik luua."
+
+#: ../composer/mail-composer.error.xml.h:9
+#, fuzzy
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr ""
 
-#. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42
-#: mail/mail-errors.xml.h:105
-#: mail/mail-errors.xml.h:117
-#: widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Kuna \"{1}\"."
+#: ../composer/mail-composer.error.xml.h:11
+#, fuzzy
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Faili \"{0}\" pole võimalik automaatselt salvestada."
 
-#. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
-msgid "Unfinished messages found"
-msgstr "Leidsin lõpetamata sõnumi"
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr "Katalooge pole võimalik sõnumitele manustada."
 
-#. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Kas sa soovid lõpetamata sõnumid taastada?"
 
-#. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
-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:21
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Don't Recover"
 msgstr "Ära taasta"
 
-#: composer/mail-composer-errors.xml.h:22
-msgid "Recover"
-msgstr "Taasta"
-
-#. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Faili \"{0}\" ei saa automaatselt salvestada."
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Download in progress. Do you want to send the mail?"
+msgstr ""
 
-#. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
-msgid "Error saving to autosave because \"{1}\"."
+#: ../composer/mail-composer.error.xml.h:16
+#, fuzzy
+msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Viga faili automaatsel salvestamisel, põhjus: \"{1}\"."
 
-#. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
-msgid "Warning: Modified Message"
-msgstr "Hoiatus: salvestamata sõnum"
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
 
-#. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
-msgstr "Kas sa tõesti soovid tühistada sõnumit '{0}', mille koostamine on pooleli?"
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Recover"
+msgstr "Taasta"
 
-#. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
-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 "Selle redaktoriakna sulgemine tühistab sõnumi lõplikult. Kui sa tahad sõnumi koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr "Fail `{0}' ei ole tavafail ja seda pole võimalik sõnumis saata."
 
-#: composer/mail-composer-errors.xml.h:33
-msgid "_Discard Changes"
-msgstr "_Loobu muudatustest"
+#: ../composer/mail-composer.error.xml.h:20
+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 ""
 
-#: composer/mail-composer-errors.xml.h:34
-msgid "_Save Message"
-msgstr "_Salvesta sõnum"
+#: ../composer/mail-composer.error.xml.h:21
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
 
-#. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
-msgid "Could not create message."
-msgstr "Sõnumit ei saa luua."
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr ""
 
-#. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "Sa pead sõnumile valima teised seaded, põhjus: \"{0}\"."
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "Leidsin lõpetamata sõnumi"
 
-#. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
-msgid "Could not read signature file \"{0}\"."
-msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr "Hoiatus: salvestamata sõnum"
 
-#. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
-msgid "All accounts have been removed."
-msgstr "Kõik kontod on kustutatud."
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Sa ei saa sellele sõnumile manustada faili `{0}'"
 
-#. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
-msgid "Could not create composer window."
-msgstr "Redaktoriakent ei saa luua."
-
-#. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
-msgid "Unable to activate the address selector control."
-msgstr ""
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Loobu muudatustest"
 
-#. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
-msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
-msgstr ""
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Save Message"
+msgstr "_Salvesta sõnum"
 
-#: data/evolution.desktop.in.in.h:1
-#: shell/main.c:521
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
 msgid "Evolution"
 msgstr "Evolution"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Evolution grupitarkvarakomplekt"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "aadressikaart"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "kalendri teave"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Puhkuseteade:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Olek:</b>"
 
-#: designs/OOA/ooa.glade.h:6
+#: ../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"
 "kes saadab sulle kirja ajal kui sa puhkusel oled.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "Olen praegu tööl"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Ei, ära muuda olekut"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Puhkuseteadete assistent"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Jah, muuda staatust"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>E-posti vastuvõtmine</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>E-posti saatmine:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../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
-msgid "Always send back a read reciept"
+#: ../designs/read_receipts/read.glade.h:6
+msgid "Always send back a read receipt"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr ""
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 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?"
+#: ../designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9819,18 +9834,62 @@ msgstr ""
 "Antud nimega fail on juba olemas.\n"
 "Kirjutada üle?"
 
-#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269
-#: widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr "Evolutioni viga"
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr "Evolutioni hoiatus"
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr "Evolutioni info"
+
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr "Evolutioni küsimus"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:438
+#, 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>"
+
+#: ../e-util/e-system.error.xml.h:2
+#, fuzzy
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "Faili \"{0}\" pole võimalik avada."
+
+#: ../e-util/e-system.error.xml.h:3
+#, fuzzy
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "Faili \"{0}\" pole võimalik salvestada."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Kas sa soovid seda üle kirjutada?"
+
+#: ../e-util/e-system.error.xml.h:5
+#, fuzzy
+msgid "File exists &quot;{0}&quot;."
+msgstr "Fail \"{0}\" on juba olemas."
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+msgid "_Overwrite"
+msgstr "_Kirjuta üle"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185
-#: e-util/e-time-utils.c:398
+#: ../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"
 
@@ -9838,68 +9897,65 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339
-#: e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343
-#: e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -9908,10 +9964,8 @@ msgstr "%H:%M:%S"
 #. 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:1431
-#: widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -9919,239 +9973,218 @@ msgstr "%I:%M %p"
 #. 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:1428
-#: widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
-#: e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr ""
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter.error.xml.h:1
+#, fuzzy
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Vigane regulaaravaldis \"{0}\"."
+
+#: ../filter/filter.error.xml.h:2
+#, fuzzy
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
+
+#: ../filter/filter.error.xml.h:3
+#, fuzzy
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "Faili \"{0}\" ei ole olemas või pole see tavaline fail."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Puuduv kuupäev."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Puuduv faili nimi."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+msgid "Missing name."
+msgstr "Puuduv nimi."
+
+#: ../filter/filter.error.xml.h:7
+#, fuzzy
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Nimi \"{0}\" on juba kasutusel."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Palun vali mõni teine nimi."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Kuupäeva valimine on kohustuslik."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Sa pead sellele filtrile nime määrama."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Failinime andmine on kohustuslik"
+
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund tagasi"
 msgstr[1] "%d sekundit tagasi"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut tagasi"
 msgstr[1] "%d minutit tagasi"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tund tagasi"
 msgstr[1] "%d tundi tagasi"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päev tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 nädal tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuu tagasi"
 msgstr[1] "%d kuud tagasi"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 aasta tagasi"
 msgstr[1] "%d aastat tagasi"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 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"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Võrdlusaja valimine"
 
-#. filter:no-date primary
-#: filter/filter-errors.xml.h:2
-msgid "Missing date."
-msgstr "Puuduv kuupäev."
-
-#. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
-msgid "You must choose a date."
-msgstr "Kuupäeva valimine on kohustuslik."
-
-#. filter:no-file primary
-#: filter/filter-errors.xml.h:6
-msgid "Missing file name."
-msgstr "Puuduv faili nimi."
-
-#. filter:no-file secondary
-#. 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"
-
-#. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Faili \"{0}\" ei ole olemas või pole see tavaline fail."
-
-#. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
-msgid "Bad regular expression \"{0}\"."
-msgstr "Vigane regulaaravaldis \"{0}\"."
-
-#. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
-
-#. filter:no-name primary
-#. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18
-#: mail/mail-errors.xml.h:219
-msgid "Missing name."
-msgstr "Puuduv nimi."
-
-#. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
-msgid "You must name this filter."
-msgstr "Sa pead sellele filtrile nime määrama."
-
-#. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
-msgid "Name \"{0}\" already used."
-msgstr "Nimi \"{0}\" on juba kasutusel."
-
-#. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
-msgid "Please choose another name."
-msgstr "Palun vali mõni teine nimi."
-
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#: filter/filter-label.c:121
-#: mail/em-filter-i18n.h:26
-#: mail/em-migrate.c:1041
-#: mail/mail-config.c:76
-#: mail/mail-config.glade.h:90
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:1044
-#: mail/mail-config.c:79
-#: mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:1045
-#: mail/mail-config.c:80
-#: mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
 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"
 
-#: filter/filter-rule.c:790
+#: ../filter/filter-rule.c:791
 msgid "_Rule name:"
 msgstr "_Reegli nimi:"
 
-#: filter/filter-rule.c:818
-msgid "<b>If</b>"
-msgstr "<b>Kui</b>"
+#: ../filter/filter-rule.c:819
+#, fuzzy
+msgid "If"
+msgstr "I"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
 msgstr "kõik tingimused on täidetud"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if any criteria are met"
 msgstr "üks tingimustest on täidetud"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:860
 msgid "Execute actions"
 msgstr "Tegevused täidetakse juhul, kui"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "All related"
 msgstr "Kõik seonduvad"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies"
 msgstr "Vastused"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies and parents"
 msgstr "Vastused ja eelnenud"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:883
 msgid "Include threads"
 msgstr "Lõimedest kaasatakse"
 
-#: filter/filter-rule.c:975
-#: filter/filter.glade.h:3
+#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:978
 msgid "Outgoing"
 msgstr "Väljaminev"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filtri reeglid</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Võrdle"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "Näita filtreid sõnumitele:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10159,7 +10192,7 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud kuupäeva kella 12:00'ga."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10167,7 +10200,7 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse ajahetkega,\n"
 "mis on suhteline filtri käivitamise hetkega."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10175,116 +10208,114 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse ajahetkega,\n"
 "mis on võrdne filtri käivitamise hetkega."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:18
-#: mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "sekundit"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "praegune aeg"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "sinu poolt määratud aeg"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "aastat"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Muuda reeglit"
 
-#: filter/rule-editor.c:693
+#: ../filter/rule-editor.c:693
 msgid "Rule name"
 msgstr "Reegli nimi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Sõnumikoostaja eelistused"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Säti oma e-posti kontosid siin"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolutioni e-posti klient"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolutioni e-posti kontode seadistuste juhtimine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution'i e-posti komponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolutioni sõnumikoostaja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: mail/em-folder-view.c:469
-#: mail/importers/elm-importer.c:418
-#: mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474
-#: mail/mail-component.c:557
-#: mail/mail-component.c:608
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
+#: ../mail/mail-component.c:645
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "Postikontod"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: mail/mail-config.glade.h:95
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Preferences"
 msgstr "E-posti eelistused"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_Post"
 
-#: mail/em-account-editor.c:386
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Litsents %s"
 
-#: mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10293,1649 +10324,1613 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: mail/em-account-editor.c:463
-#: mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: mail/em-account-editor.c:1663
-#: mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:758
+#, fuzzy
+msgid "Ask for each message"
+msgstr "Sõnumit ei leitud"
+
+#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identiteet"
 
-#: mail/em-account-editor.c:1699
-#: mail/mail-config.glade.h:114
+#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: mail/em-account-editor.c:1876
+#: ../mail/em-account-editor.c:1932
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: mail/em-account-editor.c:2044
-#: mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: mail/em-account-editor.c:2088
-#: mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
-#: mail/em-account-editor.c:2147
-#: mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2184
-#: mail/em-account-editor.c:2259
+#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: mail/em-account-editor.c:2185
-#: mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: mail/em-account-editor.c:2600
-#: mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: mail/em-account-editor.c:2600
-#: mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoabiline"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:412
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: mail/em-account-prefs.c:468
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:306
-#: mail/em-composer-prefs.c:429
-#: mail/mail-config.c:935
+#: ../mail/em-account-prefs.c:489
+#, fuzzy
+msgid "Mail Accounts Table"
+msgstr "Postikontod"
+
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:894
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:937
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:957
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:911
+#: ../mail/em-composer-utils.c:852
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1521
+#: ../mail/em-composer-utils.c:1644
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1568
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell ${24Hour}:${Minute}, kirjutas ${Sender}:"
+#: ../mail/em-composer-utils.c:1691
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell "
+"${24Hour}:${Minute}, kirjutas ${Sender}:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filtreerimisreeglid"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Muuda punkte"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Omista värvus"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Manused"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Piiksu"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "sisaldab"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Vastuvõtmise kuupäev"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Saatmise kuupäev"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "ei lõpe stringiga"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "pole olemas"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "ei tagasta"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "ei kõla nagu"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "ei alga stringiga"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Ei ole olemas"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Mustand"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "lõpeb stringiga"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "On olemas"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "on olemas"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Avaldis"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Jälgimislipp"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "on"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "on pärast"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "on enne"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "on tähistatud"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "on väiksem kui"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "ei ole"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ei ole tähistatud"
 
-#: mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Rämpspost"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr ""
 
-#: mail/em-filter-i18n.h:37
-#: mail/em-folder-view.c:992
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Postiloend"
 
-#: mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr ""
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Sõnumi keha"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Sõnumi päis"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Sõnum on rämps"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Sõnum ei ole rämpspost"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Tõsta kausta"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Suuna programmi"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: mail/em-filter-i18n.h:47
-#: mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Loetud"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Saajad"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr ""
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Vastatud"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "tagastab"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "tagastab suurema kui"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "tagastab väiksema kui"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: mail/em-filter-i18n.h:55
-#: mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Hinne"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Saatja"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Määra olek"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "kõlab kui"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Lähtekonto"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr ""
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "algab stringiga"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: mail/em-filter-i18n.h:65
-#: mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306
-#: mail/em-format.c:853
-#: mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:7
-#: smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
+#: ../mail/em-format-quote.c:310 ../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
+#: ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Teema"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Määramata olek"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:134
 msgid "Create _vFolder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:144
+#: ../mail/em-folder-properties.c:144
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
-#: mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:156
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
 msgstr[1] "Lugemata sõnumeid:"
 
-#: mail/em-folder-properties.c:278
-#: plugins/shared-folder/properties.glade.h:3
+#: ../mail/em-folder-properties.c:278
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kausta omadused"
 
-#: mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
-#: mail/em-folder-selector.c:166
-msgid "Create New Folder"
-msgstr "Uue kausta loomine"
-
-#: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2527
-#: mail/mail-component.c:770
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
-msgid "Specify where to create the folder:"
-msgstr "Kirjelda, kuhu tuleb kaust luua:"
-
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "Loo"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree-model.c:201
-#: mail/em-folder-tree-model.c:203
-#: mail/mail-vfolder.c:899
-#: mail/mail-vfolder.c:969
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
 msgid "vFolders"
 msgstr "VKaustad"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:207
-#: mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:468
-#: mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
 msgid "Drafts"
 msgstr "Mustandid"
 
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:471
-#: mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:474
-#: mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
 msgid "Outbox"
 msgstr "Väljundkast"
 
-#: mail/em-folder-tree-model.c:476
-#: mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
 msgid "Sent"
 msgstr "Saadetud"
 
-#: mail/em-folder-tree-model.c:495
-#: mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: mail/em-folder-tree.c:688
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:930
-#: mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:932
-#: mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1044
-#: ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:1045
-#: ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:1750
-#: mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: mail/em-folder-tree.c:2023
-#, fuzzy, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Sõnumite kopeerimine %s kausta"
-
-#: mail/em-folder-tree.c:2297
-#: mail/em-folder-tree.c:2311
-#: mail/em-folder-view.c:862
-#: mail/em-folder-view.c:877
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder"
-msgstr "Kausta valimine"
-
-#: mail/em-folder-tree.c:2297
-#: mail/em-folder-view.c:877
-msgid "C_opy"
-msgstr "K_opeeri"
-
-#: mail/em-folder-tree.c:2338
-#: plugins/shared-folder/share-folder-common.c:138
-#, c-format
-msgid "Creating folder `%s'"
-msgstr "Kataloogi `%s' loomine"
-
-#: mail/em-folder-tree.c:2527
-#: mail/mail-component.c:770
-#: plugins/shared-folder/install-shared.c:144
-#: plugins/shared-folder/share-folder-common.c:345
-msgid "Create folder"
-msgstr "Kausta loomine"
-
-#: mail/em-folder-tree.c:2720
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Nimeta kaust \"%s\" uue nimega:"
-
-#: mail/em-folder-tree.c:2722
-msgid "Rename Folder"
-msgstr "Kataloogi ümbernimetamine"
-
-#: mail/em-folder-tree.c:2728
-msgid "Folder names cannot contain '/'"
-msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
-
-#: mail/em-folder-tree.c:2802
-#: ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2108
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2112
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2113
 msgid "_Move..."
 msgstr "_Liiguta..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2117
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: mail/em-folder-view.c:970
-#: mail/em-popup.c:499
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
+msgid "Select folder"
+msgstr "Kausta valimine"
+
+#: ../mail/em-folder-view.c:944
+msgid "C_opy"
+msgstr "K_opeeri"
+
+#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:971
-#: ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:972
-#: mail/em-popup.c:501
-#: ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:975
-#: ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:977
-msgid "_Print"
-msgstr "_Trüki"
-
-#: mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:1048
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:1049
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:983
-#: ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:986
+#: ../mail/em-folder-view.c:1053
+msgid "Mar_k as Read"
+msgstr "_Märgi loetuks"
+
+#: ../mail/em-folder-view.c:1054
+msgid "Mark as U_nread"
+msgstr "Märgi kui l_ugemata"
+
+#: ../mail/em-folder-view.c:1055
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:1056
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:988
-#: ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1057
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:989
-#: ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1058
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: mail/em-folder-view.c:990
+#: ../mail/em-folder-view.c:1059
 #, fuzzy
 msgid "Mark for Follo_w Up..."
 msgstr "_Jälgi..."
 
-#: mail/em-folder-view.c:998
+#: ../mail/em-folder-view.c:1067
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: mail/em-folder-view.c:999
+#: ../mail/em-folder-view.c:1068
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:1002
+#: ../mail/em-folder-view.c:1071
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:1003
+#: ../mail/em-folder-view.c:1072
 msgid "vFolder on _Subject"
 msgstr "vKaust _teema järgi"
 
-#: mail/em-folder-view.c:1004
+#: ../mail/em-folder-view.c:1073
 msgid "vFolder on Se_nder"
 msgstr "vKaust _saatja järgi"
 
-#: mail/em-folder-view.c:1005
+#: ../mail/em-folder-view.c:1074
 msgid "vFolder on _Recipients"
 msgstr "vKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:1006
+#: ../mail/em-folder-view.c:1075
 msgid "vFolder on Mailing _List"
 msgstr "vKaust _postiloendi järgi"
 
-#: mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1079
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1080
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1081
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1082
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1844
-#: mail/em-folder-view.c:1888
+#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1987
+#: ../mail/em-folder-view.c:2065
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2403
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2297
+#: ../mail/em-folder-view.c:2405
 #, fuzzy
 msgid "Create _vFolder"
 msgstr "Kausta loomine"
 
-#: mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2406
 #, fuzzy
 msgid "_From this Address"
 msgstr "E-posti _aadress:"
 
-#: mail/em-folder-view.c:2299
+#: ../mail/em-folder-view.c:2407
 #, fuzzy
 msgid "_To this Address"
 msgstr "_Aadress:"
 
-#: mail/em-folder-view.c:2568
+#: ../mail/em-folder-view.c:2688
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliki, et saata sõnumit aadressile %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:406
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: mail/em-format-html-display.c:680
-#: mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html-display.c:680
-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:653
+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 pole võimalik "
+"garanteerida."
 
-#: mail/em-format-html-display.c:681
-#: mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html-display.c:681
-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:654
+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:682
-#: mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:655 ../mail/em-format-html.c:580
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html-display.c:682
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Selle sõnumi signatuuri ei saa verifitseerida. See võib olla sõnumi kohaletoimetamise käigus asendatud."
+#: ../mail/em-format-html-display.c:655
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+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:683
+#: ../mail/em-format-html-display.c:656
 msgid "Valid signature, cannot verify sender"
-msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
+msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: mail/em-format-html-display.c:683
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:656
+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:689
-#: mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:662 ../mail/em-format-html.c:587
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: mail/em-format-html-display.c:689
-msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
-msgstr "See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt ja see võis näha olla ka kolmandale osapoolele."
+#: ../mail/em-format-html-display.c:662
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"See sõnum ei ole krüptitud. Sõnumi sisu edastati internetis kaudu lahtiselt "
+"ja see võis näha olla ka kolmandale osapoolele."
 
-#: mail/em-format-html-display.c:690
-#: mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html-display.c:690
-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 "See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi krüpteering lahti murda."
+#: ../mail/em-format-html-display.c:663
+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 ""
+"See sõnum on krüptitud nõrga krüptoalgoritmiga.  Võimalikul ründajal peaks "
+"olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi "
+"krüpteering lahti murda."
 
-#: mail/em-format-html-display.c:691
-#: mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:664 ../mail/em-format-html.c:589
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html-display.c:691
-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:664
+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:692
-#: mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:665 ../mail/em-format-html.c:590
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: mail/em-format-html-display.c:692
-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 "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:665
+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 ""
+"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:793
-#: smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:766 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:781
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1011
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1019
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1022
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1064
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1065
 msgid "_Hide"
 msgstr "_Peida"
 
-#: mail/em-format-html-display.c:1340
+#: ../mail/em-format-html-display.c:1309
 msgid "Attachment Button"
 msgstr "Manuse nupp"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: mail/em-format-html.c:472
-#: mail/em-format-html.c:474
+#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:581
 msgid "Valid signature but cannot verify sender"
-msgstr "Signatuur kehtib kuid saatjat ei saa tuvastada"
+msgstr "Signatuur kehtib kuid saatjat pole võimalik tuvastada"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:839
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:880
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:903
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:914
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1140
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: mail/em-format-html.c:1424
-#: mail/em-format-quote.c:193
-#: mail/em-format.c:848
-#: mail/em-mailer-prefs.c:83
-#: mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../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:1424
-#: mail/em-format-quote.c:193
-#: mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: mail/em-format-html.c:1424
-#: mail/em-format-quote.c:193
-#: mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85
-#: mail/message-list.etspec.h:14
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../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:1424
-#: mail/em-format-quote.c:193
-#: mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format-html.c:1424
-#: mail/em-format-quote.c:193
-#: mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537
-#: mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1572
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1575
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1577
-#: mail/em-format-quote.c:322
-#: mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89
-#: mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: mail/em-format-html.c:1600
-#: mail/em-format.c:855
-#: mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1099
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1143
-#: mail/em-format.c:1276
+#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
+msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1261
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1409
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
+msgstr "MIME sõnumit pole võimalik analüüsida. Kuvatakse lähtekoodina."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1428
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: mail/em-junk-filter.c:111
+#: ../mail/em-junk-filter.c:111
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Iga kord"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1198
 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:1632
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ei suuda luua uut kataloogi `%s': %s"
 
-#: mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Kausta `%s' ei saa kopeerida `%s': %s"
+msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Olemasolevaid kaustu asukohas '%s' ei saa läbi vaadata: %s"
+msgstr "Olemasolevaid kaustu asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2561
-#: mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Ei saa luua kohalikku mailikausta asukohas `%s': %s"
+msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: mail/em-migrate.c:2711
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+#: ../mail/em-migrate.c:2711
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:382
+#: ../mail/em-popup.c:382
 msgid "Save As..."
 msgstr "Salvestamine kui..."
 
-#: mail/em-popup.c:401
+#: ../mail/em-popup.c:401
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: mail/em-popup.c:495
+#: ../mail/em-popup.c:495
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: mail/em-popup.c:497
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: mail/em-popup.c:498
-#: ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
-#: mail/em-popup.c:549
+#: ../mail/em-popup.c:549
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: mail/em-popup.c:550
+#: ../mail/em-popup.c:550
 #, fuzzy
 msgid "_Send New Message To..."
 msgstr "S_aada sõnum..."
 
-#: mail/em-popup.c:551
+#: ../mail/em-popup.c:551
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:666
+#: ../mail/em-popup.c:666
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:611
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:859
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:880
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "sõnum"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1071
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
-#: mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:104
 msgid "v_Folders"
 msgstr "v_Kaustad"
 
-#: mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:574
 msgid "vFolder source"
 msgstr "vKausta allikas"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automaatne viidatuvastus"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Automaatne emotikonituvastus"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Otsi sissetuleva posti seest rämpsu"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Tsiteeringu esiletoomise värv"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Tsiteeringu esiletoomise värv."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Sõnumiredaktori vaikimisi akna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Sõnumiredaktori vaikimisi akna laius"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Vaikimisi edastamisstiil"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Vaikimisi redaktoriakna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Vaikimisi sõnumiakna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Tellimisdialoogi kõrguse vaikeväärtus"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Vaikimisi vastamise laad"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Vaikimisi redaktoriakna laius"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Vaikimisi sõnumiakna laius"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Tellimisdialoogi laiuse vaikeväärtus"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Programmi sulgemisel tühjendatakse prügikaustad"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Väljumisel tühjendatakse kõik prügikaustad."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Luba kursorirežiim, seega sa näed kirja lugedes kursori asukohta."
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Sõnumiloendi paani kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
-#: mail/evolution-mail.schemas.in.in.h:27
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-msgstr "Kui kasutaja üritab avada rohkem kui 10 sõnumit ühel ajal, küsi temalt kas ta tõesti soovib seda teha."
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Kui kasutaja üritab avada rohkem kui 10 sõnumit ühel ajal, küsi temalt kas "
+"ta tõesti soovib seda teha."
 
-#: mail/evolution-mail.schemas.in.in.h:28
-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."
+#: ../mail/evolution-mail.schemas.in.in.h:28
+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:29
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: mail/evolution-mail.schemas.in.in.h:33
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.in.h:33
+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:34
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
-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."
+#: ../mail/evolution-mail.schemas.in.in.h:35
+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:36
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: mail/evolution-mail.schemas.in.in.h:39
-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
+#, fuzzy
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images in mail from contacts 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:40
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Märgi Nähtud staatusega peale määratud taimauti"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Märgi Nähtud staatusega peale määratud taimauti."
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Vaikimisi sõnumiakna kõrgus"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Sõnumi kuvamise laad (tavaline, kõik päised, lähtekood)"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Helifail uutest sõnumitest teatamiseks"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Uuest sõnumist teatamise tüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Tühja teema korral küsi kinnitust"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:56
 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:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+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:58
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Kinnituse küsimine, kui kasutaja määrab ainult pimekoopia"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat ega pimekoopa saajat määratud."
+msgstr ""
+"Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
+"ega pimekoopa saajat määratud."
 
-#: mail/evolution-mail.schemas.in.in.h:61
-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 ei soovi HTML sisuga sõnumeid vastu võtta."
+#: ../mail/evolution-mail.schemas.in.in.h:61
+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 ei soovi HTML sisuga "
+"sõnumeid vastu võtta."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat ega pimekoopa saajat määratud."
+msgstr ""
+"Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
+"ega pimekoopa saajat määratud."
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Vaikimisi kirjade saatmine HTML formaadis"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Vaikimisi kirjade saatmine HTML formaadis."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: mail/evolution-mail.schemas.in.in.h:84
-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."
+#: ../mail/evolution-mail.schemas.in.in.h:84
+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:85
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:91
 #, fuzzy
 msgid "Use Spamassassin daemon and client"
 msgstr "Kasuta Spamassassin'i deemonit ja klienti"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:92
 #, fuzzy
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Kasuta Spamassassini deemonit ja klienti (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumi näitamisel"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Kasuta ainult lokaalseid spämmiteste."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Bcc menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Pimekoopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüüelement on valitud"
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüüelement on valitud."
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:108
-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:109
-msgid "port for starting user runned spamd"
+#: ../mail/evolution-mail.schemas.in.in.h:108
+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:110
-msgid "spamd port"
-msgstr "spamd port"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolutioni Elm'i importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Evolutioni Netscape Mail'i importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Evolutioni Outlook Express 4 importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Evolutioni Pine'i importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "Evolutioni mbox'i importija"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MBox (mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Expressi 4 (.mbx)"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251
-#: mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../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:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253
-#: mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Elm'i andmete importimine"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11943,43 +11938,43 @@ msgstr ""
 "Evolution leidis Elm'i faile\n"
 "Kas sa soovid neid Evolution'isse importida?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11994,7 +11989,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12002,7 +11997,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12011,23 +12006,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Netscape'i andmete importimine"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Seaded"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Kirjade filtrid"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12035,15 +12030,15 @@ msgstr ""
 "Evolution leidis Netscape mail'i faile.\n"
 "Kas sa soovid neid Evolution'isse importida?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution impordib sinu Pine andmeid"
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Pine'i andmete importimine"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12051,340 +12046,342 @@ msgstr ""
 "Evolution leidis Pine mail'i faile.\n"
 "Kas sa soovid neid Evolution'isse importida?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:238
-#: mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postiloend"
 
-#: mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:369
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:505
+#: ../mail/mail-component.c:506
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d kustutatut"
 msgstr[1] "%d kustutatut"
 
-#: mail/mail-component.c:507
+#: ../mail/mail-component.c:508
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d rämpssõnum"
 msgstr[1] "%d rämpssõnumit"
 
-#: mail/mail-component.c:530
+#: ../mail/mail-component.c:531
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d mustand"
 msgstr[1] "%d mustandit"
 
-#: mail/mail-component.c:532
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d saadetud"
 msgstr[1] "%d saadetud"
 
-#: mail/mail-component.c:534
+#: ../mail/mail-component.c:535
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d saatmata"
 msgstr[1] "%d saatmata"
 
-#: mail/mail-component.c:538
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kokku"
 msgstr[1] "%d kokku"
 
-#: mail/mail-component.c:540
+#: ../mail/mail-component.c:541
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d lugemata"
 msgstr[1] ", %d lugemata"
 
-#: mail/mail-component.c:722
+#: ../mail/mail-component.c:761
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: mail/mail-component.c:723
+#: ../mail/mail-component.c:762
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: mail/mail-component.c:724
+#: ../mail/mail-component.c:763
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: mail/mail-component.c:730
+#: ../mail/mail-component.c:769
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:731
+#: ../mail/mail-component.c:770
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: mail/mail-component.c:732
+#: ../mail/mail-component.c:771
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: mail/mail-component.c:879
+#: ../mail/mail-component.c:893
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
-#: mail/mail-config.glade.h:1
-#: mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
 
-#: mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_Allkirjad</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Teave konto kohta</span>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmid</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentimise tüüp</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 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:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Seadistused</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 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:15
 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:16
 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:17
 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:1667
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:19
 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:20
 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:21
 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:22
 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:23
+#, fuzzy
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
+
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Uutest sõnumitest teatamine</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslik teave</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Valikud</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 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:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslik teave</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Turvaline MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvalisus</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 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:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri seaded</span>"
 
-#: mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lisa _uus allkiri..."
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati saada koopia (cc):"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati saada _pimekoopia (cc):"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Minu võtmerõngas olevad võtmed _usaldatakse alati"
 
-#: mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Krüptitud sõnumi saatmisel krüptida alati ka _enda jaoks"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Algupärase sõnumi manustamine"
 
-#: mail/mail-config.glade.h:44
-#: mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Automaatne _emotikonipiltide lisamine"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Piiksu uue sõnumi saabumisel"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Sissetulevas posti _rämpsukontroll"
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kon_trolli õigekirja sisestamise ajal"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Kontrolli sissetulevate kirjade seest rämpsu"
 
-#: mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Puhasta"
 
-#: mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Puhasta"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Värvus õigekirjakontrolli probleemsetele sõnade jaoks:"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Värvid"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Kinnituse küsimine enne kataloogi puhastamist"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12400,234 +12397,270 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "_Vaikekodeering:"
 
-#: mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Algupärast sõnumit ei tsiteerita"
 
-#: mail/mail-config.glade.h:71
-#: shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-posti kontod"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-posti _aadress:"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikaustad"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "_Krüptimissertifikaat:"
 
-#: mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
-#: mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Käsu käivitamine..."
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Sõnumite vormindamine _HTML'is"
 
-#: mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML post"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Päised"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "Rõhuta _tsiteeringuid"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "Väliste testide _kaasamine"
 
-#: mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Samal joonel"
 
-#: mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Languages Table"
+msgstr "Keel"
+
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "E-posti seadistused"
 
-#: mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Mail Headers Table"
+msgstr "Kirjakaustade puu"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
 msgstr "Kirjakasti asukoht"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: mail/mail-config.glade.h:98
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
 msgstr "Mängi uue _sõnumi saabumisel heli"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:106
-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 teave oma e-posti väljasaatmise kohta. Kui sa ei tea, mida siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti teenusepakkujalt."
+#: ../mail/mail-config.glade.h:109
+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 teave oma e-posti väljasaatmise kohta. Kui sa ei tea, mida "
+"siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
+"teenusepakkujalt."
 
-#: mail/mail-config.glade.h:107
-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 võib täita siis, kui sa soovid nendes väljades olevat teavet lisada enda saadetud sõnumitesse."
+#: ../mail/mail-config.glade.h:110
+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 võib täita siis, kui sa soovid nendes väljades "
+"olevat teavet lisada enda saadetud sõnumitesse."
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 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
 msgid "Quote original message"
 msgstr "Algupärase sõnumi tsiteerimine"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid "Re_member password"
 msgstr "_Parooli meeldejätmine"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
 msgstr "_Vasta-kellele:"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
 msgid "Remember _password"
 msgstr "Parooli _meeldejätmine"
 
-#: mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "_Vali..."
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
 msgstr "_Tavaline kirjatüüp:"
 
-#: mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
 msgstr "V_ali..."
 
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali trükkimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font for printing"
 msgstr "Vali trükkimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "Send message receipts:"
+msgstr "_Saada sõnum"
+
+#: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "_Serveri tüüp:"
 
-#: mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:135
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
+#, fuzzy
+msgid "Signatures Table"
+msgstr "Allkirjad"
+
+#: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "T_erminal Font:"
 msgstr "T_erminali kirjatüüp"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "T_ype: "
 msgstr "_Tüüp:"
 
-#: mail/mail-config.glade.h:136
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.glade.h:141
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12636,7 +12669,7 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12644,15 +12677,15 @@ msgstr ""
 "Sisesta nimi, millega sa soovid seda kontot kutsuda.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:148
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:149
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12662,740 +12695,718 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "_Alati lae pildid Internetist"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Uutest sõnumitest ei teavitata"
 
-#: mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
-#: mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Edastamise stiil:"
 
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 msgid "_Full Name:"
 msgstr "Täis_nimi:"
 
-#: mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:161
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-config.glade.h:157
-msgid "_Load images if sender is in address book"
-msgstr "_Piltide laadimine, kui saatja on aadressiraamatus"
+#: ../mail/mail-config.glade.h:162
+msgid "_Load images in mail from contacts"
+msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:163
 msgid "_Make this my default account"
 msgstr "_Määra see konto minu vaikimisi kontoks"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:164
 msgid "_Mark messages as read after"
 msgstr "_Märgi sõnum loetuks peale"
 
-#: mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:166
 msgid "_Never load images from the Internet"
 msgstr "_Kunagi ära lae ühtegi pilti Internetist"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Rada:"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:168
 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:164
+#: ../mail/mail-config.glade.h:169
 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:165
+#: ../mail/mail-config.glade.h:170
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Animeeritud piltide kuvamine"
 
-#: mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:173
 msgid "_Use Secure Connection:"
 msgstr "_Turvalise ühenduse kasutamine:"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:174
 msgid "_Use the same fonts as other applications"
 msgstr "_Kasuta sama kirjatüüpi, mis teisedki rakendused"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:175
 msgid "color"
 msgstr "värvusega"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:176
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>vKausta allikad</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digitaalallkiri</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Krüptimine</span>"
 
-#: mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
 msgstr "_Tõstutundlik"
 
-#: mail/mail-dialogs.glade.h:11
-#: mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "_Lõpetatud"
 
-#: mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
 msgstr "_Otsing:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: mail/mail-dialogs.glade.h:15
-#: mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:11 ../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:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Kaustade tellimused"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Kasutustingimused"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "Ühtegi pole valitud"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Turvalisuse teave"
 
-#: mail/mail-dialogs.glade.h:22
-#: mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../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:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
 msgstr "_Nõustu kasutustingimustega"
 
-#: mail/mail-dialogs.glade.h:25
-#: mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: mail/mail-dialogs.glade.h:26
-#: mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Silt:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "_Telli"
 
-#: mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "koos kõigi aktiivsete võrgukaustadega"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "koos kõigi kohalike kalatoogidega"
 
-#. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
-msgid "Invalid authentication"
-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."
-
-#. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Tõrge serverisse \"{0}\" sisselogimisel kasutajana \"{0}\"."
+#: ../mail/mail.error.xml.h:1
+#, fuzzy
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "Kaust nimega \"{1}\" on juba olemas. Palun kasuta teistsugust nime."
 
-#. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
-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 sisestatud.  Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse lülitatud."
+#: ../mail/mail.error.xml.h:2
+msgid ""
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
 
-#. 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/mail.error.xml.h:6
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
+"the reciept notification to {0}?"
+msgstr ""
 
-#. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail.error.xml.h:7
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
-#. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
+#: ../mail/mail.error.xml.h:8
+msgid "Are you sure you want to delete this account?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#. 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."
+#: ../mail/mail.error.xml.h:9
+#, fuzzy
+msgid "Are you sure you want to open {0} messages at once?"
 msgstr ""
+"Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#. 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 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
+"kaustadest?"
 
-#. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail.error.xml.h:11
+#, fuzzy
 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. "
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
 msgstr ""
+"Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
+"\"{0}\"?"
 
-#. 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."
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
+
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
+"Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "Seda sõnumit ei saa saata kuna sa pole määranud ühtegi sõnumi saajat"
+#: ../mail/mail.error.xml.h:14
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#. mail: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."
-msgstr "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad nupule \"Kellele:\"."
+#: ../mail/mail.error.xml.h:15
+#, fuzzy
+msgid "Because &quot;{0}&quot;."
+msgstr "Kuna \"{0}\"."
 
-#. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
-msgid "Use default drafts folder?"
-msgstr "Vaikekausta kasutamine mustandite jaoks?"
+#: ../mail/mail.error.xml.h:17
+#, fuzzy
+msgid "Because &quot;{2}&quot;."
+msgstr "Kuna \"{2}\"."
 
-#. 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?"
-msgstr ""
+#: ../mail/mail.error.xml.h:18
+#, fuzzy
+msgid "Cannot add vFolder &quot;{0}&quot;."
+msgstr "vKausta \"{0}\" pole võimalik lisada."
 
-#: mail/mail-errors.xml.h:41
-msgid "Use _Default"
-msgstr "Kasuta _vaikekodeeringut"
+#: ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kausta \"{0}\" pole võimalik kopeerida \"{1}\" kausta."
 
-#. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
-msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
-msgstr "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast \"{0}\"?"
+#: ../mail/mail.error.xml.h:20
+#, fuzzy
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr "Kausta \"{0}\" pole võimalik luua."
 
-#. mail:ask-expunge secondary
-#. 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 ""
+#: ../mail/mail.error.xml.h:21
+msgid "Cannot create temporary save directory."
+msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: mail/mail-errors.xml.h:46
-msgid "_Expunge"
-msgstr "_Puhasta"
+#: ../mail/mail.error.xml.h:22
+#, fuzzy
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr "Salvestuskataloogi pole võimalik luua, sest \"{1}\""
 
-#. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest kaustadest?"
+#: ../mail/mail.error.xml.h:23
+#, fuzzy
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr "Kausta \"{0}\" pole võimalik kustutada."
 
-#: mail/mail-errors.xml.h:51
-msgid "_Empty Trash"
-msgstr "_Tühjenda prügikast"
+#: ../mail/mail.error.xml.h:24
+#, fuzzy
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr "Süsteemikausta \"{0}\" pole võimalik kustutada."
 
-#. mail:ask-open-many primary
-#: mail/mail-errors.xml.h:53
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgstr "vKausta \"{0}\" pole võimalik redigeerida, kuna seda ei ole olemas."
 
-#. mail:ask-open-many secondary
-#: mail/mail-errors.xml.h:55
-msgid "Opening too many messages at once may take a long time."
-msgstr ""
+#: ../mail/mail.error.xml.h:26
+#, fuzzy
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kausta \"{0}\" pole võimalik liigutada \"{1}\" kausta."
 
-#: mail/mail-errors.xml.h:56
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
-msgid "_Open Messages"
-msgstr "_Ava sõnum"
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr "Allikat \"{1}\" pole võimalik avada"
 
-#. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:58
-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:28
+#, fuzzy
+msgid "Cannot open source &quot;{2}&quot;."
+msgstr "Allikat \"{2}\" pole võimalik avada."
 
-#. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:60
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa Evolution'i uuesti käivitad."
+#: ../mail/mail.error.xml.h:29
+#, fuzzy
+msgid "Cannot open target &quot;{2}&quot;."
+msgstr "Sihtkohta \"{2}\" pole võimalik avada."
 
-#. mail:camel-exception primary
-#: mail/mail-errors.xml.h:62
-msgid "Your message with the subject \"{0}\" was not delivered."
+#: ../mail/mail.error.xml.h:30
+msgid ""
+"Cannot read the license file &quot;{0}&quot;, due to an installation "
+"problem.  You will not be able to use this provider until you can accept its "
+"license."
 msgstr ""
 
-#. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail.error.xml.h:31
+#, fuzzy
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "\"{0}\"-a pole võimalik ümber nimetada \"{1}\"-ks."
+
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr "Süsteemikausta \"{0}\" pole võimalik ümber nimetada ega liigutada."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot save changes to account."
+msgstr "Konto muudatusi pole võimalik salvestada."
+
+#: ../mail/mail.error.xml.h:34
+#, fuzzy
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr "Kataloogi \"{0}\" pole võimalik salvestada."
+
+#: ../mail/mail.error.xml.h:35
+#, fuzzy
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr "Faili \"{0}\" pole võimalik salvestada."
+
+#: ../mail/mail.error.xml.h:36
+#, fuzzy
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr "Signatuuriskripti \"{0}\" pole võimalik määrata."
+
+#: ../mail/mail.error.xml.h:37
 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."
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Kontrolli, kas parool on õigesti sisestatud.  Kuna paroolid on üldiselt "
+"tõstutundlikud, siis veendu, et klaviatuuri caps lock klahv ei oleks sisse "
+"lülitatud."
 
-#. mail:async-error primary
-#: mail/mail-errors.xml.h:67
-msgid "Error while {0}."
-msgstr "Viga toimingul: {0}."
+#: ../mail/mail.error.xml.h:38
+msgid "Could not save signature file."
+msgstr "Signatuurifaili pole võimalik salvestada."
 
-#. mail:async-error secondary
-#: mail/mail-errors.xml.h:69
-msgid "{1}."
-msgstr "{1}."
+#: ../mail/mail.error.xml.h:39
+#, fuzzy
+msgid "Delete &quot;{0}&quot;?"
+msgstr "Kustuta \"{0}\"?"
 
-#. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:71
-msgid "Error while performing operation."
-msgstr "Viga käsu täitmisel."
+#: ../mail/mail.error.xml.h:40
+msgid "Delete account?"
+msgstr "Kustuta konto?"
 
-#. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:73
-msgid "{0}."
-msgstr "{0}."
+#: ../mail/mail.error.xml.h:41
+msgid "Discard changed?"
+msgstr "Loobu muudatustest?"
+
+#: ../mail/mail.error.xml.h:42
+msgid "Do you want the operation to be performed in the subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:43
+msgid "Do you wish to save your changes?"
+msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:87
+#: ../mail/mail.error.xml.h:44
+msgid "Don't delete"
+msgstr "Ära kustuta"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:91
+#: ../mail/mail.error.xml.h:46
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#. mail:no-save-path primary
-#: mail/mail-errors.xml.h:95
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kataloogi \"{0}\" ei saa salvestada."
-
-#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:99
-#: mail/mail-errors.xml.h:107
-#: mail/mail-errors.xml.h:111
-msgid "Cannot save to file \"{0}\"."
-msgstr "Faili \"{0}\" ei saa salvestada."
-
-#. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:101
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Salvestuskataloogi ei saa luua, sest \"{1}\""
-
-#. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:103
-msgid "Cannot create temporary save directory."
-msgstr "Ajutist salvestuskataloogi ei saa luua."
+#: ../mail/mail.error.xml.h:47
+msgid "Error while performing operation."
+msgstr "Viga käsu täitmisel."
 
-#. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:109
+#: ../mail/mail.error.xml.h:48
+msgid "Error while {0}."
+msgstr "Viga toimingul: {0}."
+
+#: ../mail/mail.error.xml.h:49
 msgid "File exists but cannot overwrite it."
-msgstr "Fail on juba olemas, kuid seda ei saa üle kirjutada."
+msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:113
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:115
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kausta \"{0}\" ei saa kustutada."
-
-#. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:119
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
-
-#. mail:no-delete-special-folder secondary
-#. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:121
-#: mail/mail-errors.xml.h:125
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid ei saa ümber nimetada, ümber tõsta või kustutada."
-
-#. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:123
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Süsteemikausta \"{0}\" ei saa ümber nimetada ega liigutada."
-
-#. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:127
-msgid "Delete \"{0}\"?"
-msgstr "Kustuta \"{0}\"?"
+#: ../mail/mail.error.xml.h:51
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
 
-#. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:129
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"Kui sa slle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
+"sõnumid ja alamkaustad."
 
-#. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:131
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-msgstr "Kui sa slle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad sõnumid ja alamkaustad."
-
-#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:133
-#: mail/mail-errors.xml.h:137
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
-
-#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:135
-#: mail/mail-errors.xml.h:197
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Kaust nimega \"{1}\" on juba olemas. Palun kasuta teistsugust nime."
+#: ../mail/mail.error.xml.h:53
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Kui sa seda teed, siis konto kohta käiv teave kustutatakse jäädavalt."
 
-#. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:139
-msgid "Because \"{2}\"."
-msgstr "Kuna \"{2}\"."
+#: ../mail/mail.error.xml.h:54
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
+"Evolution'i uuesti käivitad."
 
-#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:141
-#: mail/mail-errors.xml.h:145
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
-
-#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:143
-#: mail/mail-errors.xml.h:151
-msgid "Cannot open source \"{2}\"."
-msgstr "Allikat \"{2}\" ei saa avada."
-
-#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:147
-#: mail/mail-errors.xml.h:155
-msgid "Cannot open target \"{2}\"."
-msgstr "Sihtkohta \"{2}\" ei saa avada."
-
-#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:149
-#: mail/mail-errors.xml.h:153
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
-
-#. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:157
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kausta \"{0}\" ei saa luua."
-
-#. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:159
-msgid "Cannot open source \"{1}\""
-msgstr "Allikat \"{1}\" ei saa avada"
-
-#. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:161
-#: mail/mail-errors.xml.h:165
-msgid "Cannot save changes to account."
-msgstr "Konto muudatusi ei saa salvestada."
+#: ../mail/mail.error.xml.h:55
+msgid "Ignore"
+msgstr "Eira"
 
-#. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:163
-msgid "You have not filled in all of the required information."
+#: ../mail/mail.error.xml.h:56
+msgid "Invalid authentication"
+msgstr "Vigane autentimine"
+
+#: ../mail/mail.error.xml.h:57
+msgid "Mail filters automatically updated."
+msgstr "Postifiltrid automaatselt uuendatud."
+
+#: ../mail/mail.error.xml.h:58
+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:account-notunique secondary
-#: mail/mail-errors.xml.h:167
-msgid "You may not create two accounts with the same name."
-msgstr "Sa ei saa luua ühe nimega kahte kontot."
+#: ../mail/mail.error.xml.h:59
+#, fuzzy
+msgid "Mark all messages as read"
+msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:169
-msgid "Delete account?"
-msgstr "Kustuta konto?"
+#: ../mail/mail.error.xml.h:60
+#, fuzzy
+msgid "Mark all messages as read in the selected folder"
+msgstr "_Märgi sõnum loetuks peale"
 
-#. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:171
-msgid "Are you sure you want to delete this account?"
-msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+#: ../mail/mail.error.xml.h:61
+msgid "Missing folder."
+msgstr "Puuduv kaust."
 
-#. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:173
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Kui sa seda teed, siis konto kohta käiv teave kustutatakse jäädavalt."
+#: ../mail/mail.error.xml.h:63
+msgid "No sources selected."
+msgstr "Ühtegi allikat pole valitud."
 
-#: mail/mail-errors.xml.h:174
-msgid "Don't delete"
-msgstr "Ära kustuta"
+#: ../mail/mail.error.xml.h:64
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
 
-#. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:176
-msgid "Could not save signature file."
-msgstr "Signatuurifaili ei saa salvestada."
+#: ../mail/mail.error.xml.h:65
+msgid "Please check your account settings and try again."
+msgstr ""
 
-#. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:178
-msgid "Because \"{0}\"."
-msgstr "Kuna \"{0}\"."
+#: ../mail/mail.error.xml.h:66
+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 ""
+"Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
+"nupule \"Kellele:\"."
 
-#. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:180
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Signatuuriskripti \"{0}\" pole võimalik määrata."
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
 
-#. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:182
-msgid "The script file must exist and be executable."
+#: ../mail/mail.error.xml.h:70
+msgid "Please wait."
+msgstr "Palun oota."
+
+#: ../mail/mail.error.xml.h:71
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 
-#. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:184
-msgid "Discard changed?"
-msgstr "Loobu muudatustest?"
+#: ../mail/mail.error.xml.h:72
+msgid "Querying server"
+msgstr ""
 
-#. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:186
-msgid "Do you wish to save your changes?"
-msgstr "Kas soovid tehtud muudatused salvestada?"
+#: ../mail/mail.error.xml.h:73
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:188
-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:74
+#, fuzzy
+msgid "Read receipt requested."
+msgstr "_Vastamise stiil:"
 
-#: mail/mail-errors.xml.h:189
-msgid "_Discard changes"
-msgstr "_Muudatustest loobumine"
+#: ../mail/mail.error.xml.h:75
+#, fuzzy
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
-#. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:191
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei ole olemas."
+#: ../mail/mail.error.xml.h:76
+#, fuzzy
+msgid "Send Receipt"
+msgstr "Saada / võta vastu"
 
-#. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:193
-msgid "This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required."
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
+"Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
+"pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:195
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "vKausta \"{0}\" ei saa lisada."
-
-#. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:199
-msgid "vFolders automatically updated."
-msgstr "vKaustad automaatselt uuendatud."
+#: ../mail/mail.error.xml.h:78
+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. "
+msgstr ""
 
-#. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:201
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#. mail:filter-updated primary
-#: mail/mail-errors.xml.h:207
-msgid "Mail filters automatically updated."
-msgstr "Postifiltrid automaatselt uuendatud."
-
-#. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:209
+#: ../mail/mail.error.xml.h:86
 msgid ""
-"The following filter rule(s):\n"
+"The following vFolder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#. mail:no-folder primary
-#: mail/mail-errors.xml.h:215
-msgid "Missing folder."
-msgstr "Puuduv kaust."
-
-#. mail:no-folder secondary
-#: mail/mail-errors.xml.h:217
-msgid "You must specify a folder."
-msgstr "Kausta valimine on kohustuslik."
-
-#. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:221
-msgid "You must name this vFolder."
-msgstr "Sa pead sellele vKaustale nime andma."
+#: ../mail/mail.error.xml.h:91
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application.  "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
 
-#. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:223
-msgid "No sources selected."
-msgstr "Ühtegi allikat pole valitud."
+#: ../mail/mail.error.xml.h:93
+msgid "The script file must exist and be executable."
+msgstr ""
 
-#. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:225
+#: ../mail/mail.error.xml.h:94
 msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+"This folder may have been added implicitly, go to the vFolder editor to add "
+"it explicitly, if required."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:229
-msgid "Problem migrating old mail folder \"{0}\"."
+#: ../mail/mail.error.xml.h:95
+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:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:231
+#: ../mail/mail.error.xml.h:96
 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"
+"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/mail-errors.xml.h:235
-msgid "Ignore"
-msgstr "Eira"
+#: ../mail/mail.error.xml.h:97
+msgid "This signature has been changed, but has not been saved."
+msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: mail/mail-errors.xml.h:236
-#: widgets/misc/e-system-errors.xml.h:7
-msgid "_Overwrite"
-msgstr "_Kirjuta üle"
+#: ../mail/mail.error.xml.h:98
+#, fuzzy
+msgid "Unable to connect to the GroupWise server."
+msgstr ""
+"Ei saa luua ühendust POP serveriga %s.\n"
+"Viga kasutajanime saatmisel: %s"
 
-#: mail/mail-errors.xml.h:237
-msgid "_Append"
-msgstr "_Lisa"
+#: ../mail/mail.error.xml.h:99
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
 
-#. mail:no-load-license primary
-#: mail/mail-errors.xml.h:239
+#: ../mail/mail.error.xml.h:100
 msgid "Unable to read license file."
-msgstr "Litsentsifaili ei saa lugeda"
+msgstr "Litsentsifaili pole võimalik lugeda"
 
-#. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:241
-msgid ""
-"Cannot read the license file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider until\n"
-"      you can accept its license."
-msgstr ""
+#: ../mail/mail.error.xml.h:101
+msgid "Use _Default"
+msgstr "Kasuta _vaikekodeeringut"
 
-#. mail:checking-service title
-#: mail/mail-errors.xml.h:245
-msgid "Querying server"
+#: ../mail/mail.error.xml.h:102
+msgid "Use default drafts folder?"
+msgstr "Vaikekausta kasutamine mustandite jaoks?"
+
+#: ../mail/mail.error.xml.h:103
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#. mail:checking-service primary
-#: mail/mail-errors.xml.h:247
-msgid "Please wait."
-msgstr "Palun oota."
+#: ../mail/mail.error.xml.h:104
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#. mail:checking-service secondary
-#: mail/mail-errors.xml.h:249
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Serverilt autentimismehhanismide loendi küsimine."
+#: ../mail/mail.error.xml.h:105
+msgid "You may not create two accounts with the same name."
+msgstr "Sa ei saa luua ühe nimega kahte kontot."
+
+#: ../mail/mail.error.xml.h:106
+msgid "You must name this vFolder."
+msgstr "Sa pead sellele vKaustale nime andma."
+
+#: ../mail/mail.error.xml.h:107
+msgid "You must specify a folder."
+msgstr "Kausta valimine on kohustuslik."
 
-#. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:251
+#: ../mail/mail.error.xml.h:108
 msgid ""
-"Unable to connect to the GroupWise\n"
-"server."
+"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:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:254
-msgid ""
-"\n"
-"Please check your account settings and try again.\n"
+#: ../mail/mail.error.xml.h:110
+#, fuzzy
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr "Tõrge serverisse \"{0}\" sisselogimisel kasutajana \"{0}\"."
+
+#: ../mail/mail.error.xml.h:111
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr ""
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail.error.xml.h:112
+msgid "_Append"
+msgstr "_Lisa"
+
+#: ../mail/mail.error.xml.h:113
+msgid "_Discard changes"
+msgstr "_Muudatustest loobumine"
+
+#: ../mail/mail.error.xml.h:114
+msgid "_Empty Trash"
+msgstr "_Tühjenda prügikast"
+
+#: ../mail/mail.error.xml.h:115
+msgid "_Expunge"
+msgstr "_Puhasta"
+
+#: ../mail/mail.error.xml.h:116
+#, fuzzy
+msgid "_Open Messages"
+msgstr "_Ava sõnum"
+
+#: ../mail/mail.error.xml.h:119
+msgid "vFolders automatically updated."
+msgstr "vKaustad automaatselt uuendatud."
+
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:542
-#: mail/mail-ops.c:585
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:562
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Tõrge väljundfiltrite rakendamisel: %s"
+
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13404,131 +13415,123 @@ msgstr ""
 "Tõrge lisamisel kasuta %s: %s\n"
 "Selle asemel lisan kausta `Saadetud'."
 
-#. sending mail, filtering failed
-#: mail/mail-ops.c:564
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Tõrge väljundfiltrite rakendamisel: %s"
-
-#: mail/mail-ops.c:602
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: mail/mail-ops.c:702
+#: ../mail/mail-ops.c:731
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:727
+#: ../mail/mail-ops.c:756
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: mail/mail-ops.c:729
-#: mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Loobutud."
 
-#: mail/mail-ops.c:731
+#: ../mail/mail-ops.c:760
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:828
+#: ../mail/mail-ops.c:857
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "Avan hoidlat %s"
 
-#: mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1583
-#: mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1816
 #, 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:1873
+#: ../mail/mail-ops.c:1902
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
-"Väljundfaili ei saa luua: %s\n"
+"Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13537,11 +13540,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2051
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13550,446 +13553,529 @@ msgstr ""
 "Ei saa luua väljundfaili: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
-msgstr "Andmeid ei saa kirjutada: %s"
+msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2339
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Katkestan..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Kataloog: %s, tüüp: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Tüüp: %s  "
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Posti saatmine ja vastuvõtmine"
 
-#: mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:327
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:416
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:416
-#: mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Allkirja redigeerimine"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Sisesta nimi sellele allkirja jaoks."
 
-#: mail/mail-signature-editor.c:415
-#: plugins/shared-folder/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
 
-#: mail/mail-vfolder.c:90
+#: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vFolder: %s"
 msgstr "vKausta ülesseadmine: %s"
 
-#: mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "'%s:%s' vkaustade uuendamine"
 
-#: mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:1008
+#: ../mail/mail-vfolder.c:1009
 msgid "Edit vFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1092
+#: ../mail/mail-vfolder.c:1093
 msgid "New vFolder"
 msgstr "Uus vKaust"
 
-#: mail/message-list.c:994
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:995
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:996
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:997
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:998
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1336
+#: ../mail/message-list.c:1338
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1343
-#: plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1352
+#: ../mail/message-list.c:1354
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1364
+#: ../mail/message-list.c:1366
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1372
+#: ../mail/message-list.c:1374
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1374
+#: ../mail/message-list.c:1376
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:2041
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr ""
 
-#: mail/message-list.c:3384
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Tähtaeg"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Sildi olek"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Tähistatud"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Jälgimise silt"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Algne asukoht"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Vastuvõetud"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Suurus"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Helista"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Jälgimine"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Teadmiseks"
 
-#: mail/message-tag-followup.c:78
-#: ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Edasta"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:81
-#: ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:82
-#: ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Ülevaade"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Sisu sisaldab"
 
-#: mail/searchtypes.xml.h:2
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Sõnum sisaldab"
 
-#: mail/searchtypes.xml.h:3
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Saaja sisaldab"
 
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Saatja sisaldab"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Teema sisaldab"
 
-#: mail/searchtypes.xml.h:6
+#: ../mail/searchtypes.xml.h:6
 #, fuzzy
 msgid "Subject or Sender contains"
 msgstr "Teema sisaldab"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr "Vali Evolution'i arhiivi nimi"
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
 msgstr "_Peale varundamist taaskäivitatakse Evolution"
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr "Evolution'i arhiivi valimine taastamiseks"
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
 msgstr "_Peale taastamist taaskäivitatakse Evolution"
 
-#: plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "Evolution'i kataloogi varundamine"
 
-#: plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "Evolution'i kataloogi taastamine"
 
-#: plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "Evolution'i arhiivi kontrollimine"
 
-#: plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "Evolution'i taaskäivitamine"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr "Evolutioni andmete ja seadistuste varundamine"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and restore plugin"
+msgstr "Evolutioni andmete ja seadistuste varundamine"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Varundamise sätted..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
 msgstr "Evolutioni andmete ja seadistuste varundamine"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "Taastamise sätted..."
 
-#: plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:398
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
-#: plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:407
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automaatsed kontaktid</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
-msgid "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:420
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kiirsuhtluse kontaktid</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
-msgid "Periodically synchronize contact information and images from my _instant messenger"
+#: ../plugins/bbdb/bbdb.c:451
+msgid ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
 msgstr ""
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:458
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: plugins/calendar-weather/calendar-weather.c:54
-#: plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#, fuzzy
+msgid "Automatic contacts"
+msgstr "Automaatsed kontaktid"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to mails. Also fills in IM contact information from your buddy lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+#, fuzzy
+msgid "Local Calendars"
+msgstr "Kalendri laadimine"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+#, fuzzy
+msgid "HTTP Calendars"
+msgstr "Kalendrid"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
 msgstr "Ilm: Pilves"
 
-#: plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Ilm: Udu"
 
-#: plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
 msgstr "Ilm: Pilves selgimistega"
 
-#: plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
 msgstr "Ilm: Vihmane"
 
-#: plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
 msgstr "Ilm: Lumesadu"
 
-#: plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr "Ilm: Selge"
 
-#: plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
 msgstr "Ilm: Äike"
 
-#: plugins/calendar-weather/calendar-weather.c:268
+#: ../plugins/calendar-weather/calendar-weather.c:268
 msgid "Select a location"
 msgstr "Vali asukoht"
 
-#: plugins/calendar-weather/calendar-weather.c:655
+#: ../plugins/calendar-weather/calendar-weather.c:655
 msgid "_Units:"
 msgstr "Ü_hikud:"
 
-#: plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Meetermõõdustik (Celsius, cm, jms.)"
 
-#: plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:663
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
-#: plugins/default-source/default-source.c:82
-msgid "Mark  as default folder"
-msgstr "Märkida vaikimisi kaustaks"
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+#, fuzzy
+msgid "Weather Calendars"
+msgstr "Kuu kalender"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "E-posti _aadress:"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+#, fuzzy
+msgid "Copy tool"
+msgstr "Kopeeri kausta"
 
-#: plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:108
 #, fuzzy
 msgid "Mark as default folder"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: plugins/exchange-account-setup/exchange-account-setup.c:59
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:68
 #, fuzzy
 msgid "Secure Password"
 msgstr "Parooli sisestamine"
 
 #. i18n: "NTLM" probably doesn't translate
-#: plugins/exchange-account-setup/exchange-account-setup.c:62
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:71
 #, fuzzy
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:70
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:79
 #, fuzzy
 msgid "Plaintext Password"
 msgstr "Parooli sisestamine"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:72
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:81
+#, fuzzy
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+"See valik loob ühenduse IMAPv4rev1 serveriga kasutades tavalist parooli."
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
 #, fuzzy
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "See valik loob ühenduse IMAPv4rev1 serveriga kasutades tavalist parooli."
+msgid "Could not read out-of-office state"
+msgstr "Sõnumit pole võimalik luua."
 
 #. Description section
-#: plugins/exchange-account-setup/exchange-account-setup.c:193
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:211
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -13998,894 +14084,1280 @@ msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
 "kes saadab sulle kirja ajal kui sa puhkusel oled.</small>"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:221
-#: plugins/exchange-account-setup/exchange-account-setup.c:231
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:239
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:249
 msgid "I am out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:224
-#: plugins/exchange-account-setup/exchange-account-setup.c:228
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:242
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:246
 msgid "I am in the office"
 msgstr "Olen praegu tööl"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:257
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:275
 msgid "Out of office Message:"
 msgstr "Puhkuseteade:"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:302
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:319
 #, fuzzy
 msgid "Exchange Settings"
 msgstr "Seaded"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:448
-#: plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:507
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
 msgstr ""
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:456
-#: plugins/exchange-account-setup/exchange-ask-password.c:193
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:532
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Autentimine"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:664
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:597
+#, fuzzy
+msgid "Could not update out-of-office state"
+msgstr "Ei saa uuendada objekti!"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:724
 #, fuzzy
 msgid "Authentication Type"
 msgstr "Autentimine"
 
-#: plugins/exchange-account-setup/exchange-account-setup.c:678
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:738
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Kausta \"%s\" tellimusest loobumine"
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+#, fuzzy
+msgid "Unsubscribe Folders"
+msgstr "_Lõpeta postiloendi tellimus"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
 
-#: plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: widgets/misc/e-send-options.glade.h:20
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Saatmise valikud"
 
-#: plugins/itip-formatter/itip-formatter.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:704
 #, fuzzy
 msgid "Unable to parse item"
-msgstr "Litsentsifaili ei saa lugeda"
+msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: plugins/itip-formatter/itip-formatter.c:757
+#: ../plugins/itip-formatter/itip-formatter.c:757
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:768
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:772
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:777
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:833
+#: ../plugins/itip-formatter/itip-formatter.c:833
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane"
 
-#: plugins/itip-formatter/itip-formatter.c:844
+#: ../plugins/itip-formatter/itip-formatter.c:844
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Kalendrit `%s' ei saa siirdada"
+msgstr "Kalendrit `%s' pole võimalik siirdada"
 
-#: plugins/itip-formatter/itip-formatter.c:848
+#: ../plugins/itip-formatter/itip-formatter.c:848
 msgid "Attendee status updated"
 msgstr "Osavõtja olek uuendatud"
 
-#: plugins/itip-formatter/itip-formatter.c:973
+#: ../plugins/itip-formatter/itip-formatter.c:973
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: plugins/itip-formatter/itip-formatter.c:974
-msgid "The message claims to contain a calendar, but the calendar is not valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:974
+msgid ""
+"The message claims to contain a calendar, but the calendar is not valid "
+"iCalendar."
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1008
-#: plugins/itip-formatter/itip-formatter.c:1064
+#: ../plugins/itip-formatter/itip-formatter.c:1008
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1009
-#: plugins/itip-formatter/itip-formatter.c:1065
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1021
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1035
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1658
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
 msgstr "Koosolekud ja ülesanded"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1691
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr ""
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-formatter.c:1735
+msgid "Conflict Search Table"
+msgstr ""
+
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:175
-#: ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Täna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:180
+#: ../plugins/itip-formatter/itip-view.c:180
 msgid "Today %H:%M"
 msgstr "Täna %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:184
 msgid "Today %H:%M:%S"
 msgstr "Täna %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %l:%M:%S %p"
 msgstr "Täna %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Tomorrow"
 msgstr "Homme"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Tomorrow %H:%M"
 msgstr "Homme kell %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow %H:%M:%S"
 msgstr "Homme kell %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %l:%M %p"
 msgstr "Homme kell %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Homme kell %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:240
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:245
+#: ../plugins/itip-formatter/itip-view.c:245
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %l:%M %p"
 msgstr "%A, %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a, %e. %B %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#: plugins/itip-formatter/itip-view.c:335
+#: ../plugins/itip-formatter/itip-view.c:335
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas läbi %s teabe järgneva koosoleku kohta:"
 
-#: plugins/itip-formatter/itip-view.c:337
+#: ../plugins/itip-formatter/itip-view.c:337
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> avalikustas teabe järgneva koosoleku kohta:"
 
-#: plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:342
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
 msgstr "<b>%s</b> taotleb, et %s osaleks järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:347
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
 
-#: plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
 
-#: plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta järgneva koosoleku kohta:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+"<b>%s</b> soovib saada värskeimat infot ülesande kohta järgneva koosoleku "
+"kohta:"
 
-#: plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:361
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
 
-#: plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> tühistas järgneva koosoleku."
 
-#: plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
 
-#: plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> keeldus järgnevatest koosoleku muudatusest."
 
-#: plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> avalikustas %s kaudu järgneva ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> avalikustas järgmise ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:410
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> taotleb, et %s osaleks järgneval koosolekul:"
 
-#: plugins/itip-formatter/itip-view.c:413
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> määras %s kaudu sulle ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:415
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> määras sulle ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale ülesandele:"
 
-#: plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
 
-#: plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
-#: plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:429
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> nõustus järgneva koosolekuga:"
 
-#: plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva määratud ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> tühistas järgneva määratud ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> esitas järgnevad muudatused määratud ülesandele:"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus %s kaudu järgneva määratud ülesande:"
 
-#: plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus järgnevast määratud ülesandest:"
 
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:867
+msgid "Start time:"
+msgstr "Algus:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:876
+msgid "End time:"
+msgstr "Lõpp:"
+
 #. Comment
-#: plugins/itip-formatter/itip-view.c:892
-#: plugins/itip-formatter/itip-view.c:942
+#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
 msgstr "Kommentaar:"
 
-#. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
+msgid "Displays text/calendar parts in messages."
+msgstr "Kuvab järgmise tähtsa sõnumi"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+#, fuzzy
+msgid "Itip Formatter"
+msgstr "Importijad"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#, fuzzy
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "Võta postilendi _omanikuga ühendust"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "Hangi postilendi _arhiiv"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "_Hangi postilendi kasutusteave"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+msgid "Mailing _List"
+msgstr "_Postiloend"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Koostab vastuse valitud sõnumi postiloendisse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+msgid "_Post message to list"
+msgstr "_Sõnumi saatmine loendisse"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "_Telli postiloend"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr "_Lõpeta postiloendi tellimus"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+#, fuzzy
+msgid "Mailing List Actions"
+msgstr "_Postiloend"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr ""
 
-#. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
-msgid "This message does not contain the header information required for this action."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
 msgstr ""
 
-#. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "Postitamine ei ole lubatud"
 
-#. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Kas saadan sõnumi postiloendisse?"
 
-#. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"Header: {0}"
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
-msgid "_Send message"
-msgstr "_Saada sõnum"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
 msgstr "_Redigeeri sõnumit"
 
-#. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
-msgid "Malformed header"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Saada sõnum"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+#, fuzzy
+msgid "Con_vert to Meeting"
+msgstr "_Inverdi valik"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+#, fuzzy
+msgid "Mail to meeting"
+msgstr "See on kohtumine."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-msgid "No e-mail action"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+msgid "Con_vert to Task"
 msgstr ""
 
-#. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
-msgid ""
-"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
-"\n"
-"Header: {0}"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#, fuzzy
+msgid "Mail to task"
+msgstr "Sõnumi saatja: %s"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
 msgstr ""
 
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/new-mail-notify/new-mail-notify.c:66
-msgid "_Generates a D-BUS message when new mail arrives"
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+#, fuzzy
+msgid "Marks the selected calendar for offline viewing."
+msgstr "Märgib valitud sõnumid kustutatuks"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+#, fuzzy
+msgid "_Do not make this available offline"
+msgstr "See sõnum ei ole autonoomses režiimis kättesaadav."
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Mark Calendar for offline use"
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+#, fuzzy
+msgid "Generates a D-BUS message when new mail arrives."
 msgstr "_Genereerib uue kirja saabumisel D-BUS sõnumi"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Uuest sõnumist teatamise tüüp"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+#, fuzzy
+msgid "New mail notify"
+msgstr "Uuest sõnumist teatamise tüüp"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+#, fuzzy
+msgid "Plugin manager"
+msgstr "Pluginahaldur"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Pluginate lubamine ja keelamine"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Manage Plugins..."
-msgstr "Halda pluginaid..."
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#, fuzzy
+msgid "Plugins"
+msgstr "Plugin"
 
-#: plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
 msgstr "Autor(id)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
 msgstr "Id"
 
-#: plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
 msgstr "Rada"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "Kirjeldus"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
 msgstr "Pluginahaldur"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Märkus: mõningad muudatused rakenduvad alles peale taaskäivitamist"
 
-#: plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
 msgstr "Plugin"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML mails.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#, fuzzy
+msgid "Plain Text Mode"
+msgstr "Teksti mudel"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr ""
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr ""
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML meetod"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "Salvesta manused..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Salvestab kõik manused"
 
-#: plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "Save attachments"
+msgstr "Salvestab kõik manused"
+
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
 msgstr ""
 
-#: plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
 msgstr "MIME tüüp"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Salvesta"
 
-#: plugins/save-calendar/csv-format.c:167
-#, c-format
-msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr ""
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:171
+#, fuzzy
+msgid "%F %T"
+msgstr "%B %Y"
 
-#: plugins/save-calendar/csv-format.c:370
-#, c-format
-msgid "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%sAttendees List%sLocation%sModified%s"
+#: ../plugins/save-calendar/csv-format.c:385
+#, fuzzy
+msgid "Uid"
+msgstr "Unicode"
+
+#: ../plugins/save-calendar/csv-format.c:387
+#, fuzzy
+msgid "Description List"
+msgstr "Kirjeldus"
+
+#: ../plugins/save-calendar/csv-format.c:388
+#, fuzzy
+msgid "Categories List"
+msgstr "Kategooriad: %s"
+
+#: ../plugins/save-calendar/csv-format.c:389
+#, fuzzy
+msgid "Comment List"
+msgstr "Kontaktide _nimekiri"
+
+#: ../plugins/save-calendar/csv-format.c:391
+#, fuzzy
+msgid "Created"
+msgstr "Loo"
+
+#: ../plugins/save-calendar/csv-format.c:392
+#, fuzzy
+msgid "Contact List"
+msgstr "Kontaktide _nimekiri"
+
+#: ../plugins/save-calendar/csv-format.c:393
+#, fuzzy
+msgid "Start"
+msgstr "Algab"
+
+#: ../plugins/save-calendar/csv-format.c:394
+#, fuzzy
+msgid "End"
+msgstr "Lõpeb"
+
+#: ../plugins/save-calendar/csv-format.c:396
+#, fuzzy
+msgid "percent Done"
+msgstr "Täitmis_protsent"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Url"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:399
+#, fuzzy
+msgid "Attendees List"
+msgstr "Osaleja"
+
+#: ../plugins/save-calendar/csv-format.c:401
+#, fuzzy
+msgid "Modified"
+msgstr "Mudel"
+
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
 msgstr "Laiendatud valikus CSV vormingule"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Prepend a header"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr "Väljaeraldaja:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Record delimiter:"
 msgstr "Kirjete eraldaja:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
 msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 
-#: plugins/save-calendar/ical-format.c:136
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#, fuzzy
+msgid "Save Selected"
+msgstr "Ühtegi pole valitud"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Save to _Disk"
+msgstr "Salvesta ülesanne"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Salvesta valitud kontaktid VKaardina."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr ""
+
+#: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:171
-#: plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Vali sihtfail"
 
-#: plugins/save-calendar/save-calendar.c:216
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
-msgid "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
 msgstr ""
 
-#: plugins/send-options/send-options.c:82
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+#, fuzzy
+msgid "Select one source"
+msgstr "Kausta valimine"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+msgid "Selects a single calendar or task source for viewing."
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+#, fuzzy
+msgid "_Show only this Calendar"
+msgstr "Kuu kalender"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "_Show only this Task List"
+msgstr ""
+
+#: ../plugins/groupwise-features/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-msgid "Invalid user"
-msgstr "Vigane kasutaja"
-
-#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
-msgid ""
-"\n"
-"You cannot share folder with specified user \"{0}\" \n"
-msgstr ""
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Create folder"
+msgstr "Kausta loomine"
 
-#. org.gnome.evolution.mail_shared_folder:no-user primary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-msgid "Specify User"
-msgstr "Määra kasutaja"
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Specify where to create the folder:"
+msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
-msgid ""
-"\n"
-"\tYou have to specify a user name whom you want to add to the list \n"
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:2
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+#, fuzzy
+msgid "Groupwise Features"
+msgstr "Grupitöö vahend"
+
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>Kasutajad :</b>"
 
-#: plugins/shared-folder/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Message"
 msgstr "Sõnum"
 
-#: plugins/shared-folder/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontaktid..."
 
-#: plugins/shared-folder/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:12
 #, fuzzy
 msgid "_Cutomize notification message"
-msgstr "Sõnumit ei saa luua."
+msgstr "Sõnumit pole võimalik luua."
 
-#: plugins/shared-folder/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder-common.c:140
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "Kataloogi `%s' loomine"
+
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Users"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: plugins/shared-folder/share-folder-common.c:401
+#: ../plugins/groupwise-features/share-folder-common.c:337
+#, fuzzy
+msgid "New _Shared Folder..."
+msgstr "_Uus kataloog..."
+
+#: ../plugins/groupwise-features/share-folder-common.c:440
 msgid "Sharing"
 msgstr ""
 
+#: ../plugins/startup-wizard/startup-wizard.c:255
+msgid "Evolution Setup Assistant"
+msgstr "Evolution'i seadistusabiline"
+
+#: ../plugins/startup-wizard/startup-wizard.c:260
+msgid "Welcome"
+msgstr "Tere tulemast"
+
+#: ../plugins/startup-wizard/startup-wizard.c:261
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159
+msgid "Please select the information that you would like to import:"
+msgstr "Palun valige teave, mida soovite importida:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:905
+#, c-format
+msgid "From %s:"
+msgstr "Programmist %s:"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "Startup wizard"
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+#, fuzzy
+msgid "Subject Threading"
+msgstr "Vali _teemalõim"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+#, fuzzy
+msgid "Thread messages by subject"
+msgstr "Esitab sõnumeid jutulõngadena"
+
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+msgid "Gives an option to print mail from composer"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolutioni kest"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell Config factory"
+msgstr "Evolutioni kest"
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolutioni test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution'i testkomponent"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Configuration version"
 msgstr "E-posti seadistused"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default sidebar width"
 msgstr "Vaikimisi akna laius."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Vaikimisi akna kõrgus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Vaikimisi akna laius."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Printeri sätted..."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
-#: shell/main.c:476
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
 msgid "Start in offline mode"
 msgstr "Alustamine autonoomses režiimis"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
 msgid "The default height for the main window, in pixels."
 msgstr "Vaikimisi sõnumiakna kõrgus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "The default width for the main window, in pixels."
 msgstr "Vaikimisi sõnumiakna laius"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 #, fuzzy
 msgid "The default width for the sidebar, in pixels."
 msgstr "Vaikimisi kaustariba paani laius"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buutons is determined by the GNOME toolbar setting."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks olema nähtav."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 #, fuzzy
 msgid "Whether the window buttons should be visible."
 msgstr "Millal nupud peaksid olema nähtavad."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 #, fuzzy
 msgid "Window button style"
 msgstr "Akna _nupud"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 #, fuzzy
 msgid "Window buttons are visible"
 msgstr "Nupud on nähtavad"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktiivsed ühendused</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Aktiivsed ühendused"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Kui soovid neid ühendusi sulgeda ja autonoomsesse\n"
 "olekusse siirduda, vajuta \"Olgu\""
 
-#: shell/e-shell-folder-title-bar.c:586
-#: shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:150
 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:156
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:159
-#: shell/e-shell-startup-wizard.c:750
-msgid "Please select the information that you would like to import:"
-msgstr "Palun valige teave, mida soovite importida:"
-
-#: shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:233
-#: shell/e-shell-importer.c:267
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14894,32 +15366,30 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:347
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:462
-#: shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
 
-#: shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:476
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:484
 #, c-format
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:488
-#: shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
 
-#: shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:513
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14928,32 +15398,31 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:589
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:645
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:650
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:662
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:701
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:704
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
-#: shell/e-shell-importer.c:766
-#: shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:772
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14961,92 +15430,68 @@ msgstr ""
 "Palun oota...\n"
 "Üritan tuvastada olemasolevate programmide seadistusi"
 
-#: shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:779
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:899
-#: shell/e-shell-startup-wizard.c:700
-#, c-format
-msgid "From %s:"
-msgstr "Programmist %s:"
-
-#: shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1111
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Faili %s jaoks ei ühtegi importijat saadaval"
 
-#: shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1125
 msgid "Unable to execute importer"
-msgstr "Importijat ei saa käivitada"
+msgstr "Importijat pole võimalik käivitada"
 
-#: shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1241
 msgid "_Import"
 msgstr "_Importimine"
 
-#: shell/e-shell-offline-handler.c:589
-msgid "Closing connections..."
-msgstr "Sulgen ühendused..."
-
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Evolutioni sätted"
 
-#: shell/e-shell-startup-wizard.c:577
-msgid "Starting import"
-msgstr "Importimise alustamine"
-
-#: shell/e-shell-startup-wizard.c:797
-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"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-"Kui sa praegu Evolution'i seadistusabilise sulged, lähevad kõik sisestatud andmed kaotsi. Sel juhul pead sa Evolution'i järgmisel käivitamisel uuesti ka seadistusabilise käivitama.\n"
-"\n"
-"Kas sa soovid seadistusabilist sulgeda?"
-
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Kausta nimi on kirjeldamata."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Kausta nimi ei tohi sisaldada Return sümbolit"
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Kausta nimi ei tohi sisaldada \"/\" sümbolit."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 
-#: shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
-#: shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
 
-#: shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:428
+#: ../shell/e-shell-window-commands.c:507
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001\n"
@@ -15058,176 +15503,145 @@ msgstr ""
 "http://et-gnome.sourceforge.net\n"
 "Veateated, parandused: <gnome-et@linux.ee>"
 
-#: shell/e-shell-window-commands.c:442
+#: ../shell/e-shell-window-commands.c:521
 msgid "Groupware Suite"
 msgstr "Grupitöö vahend"
 
-#: shell/e-shell-window-commands.c:669
+#: ../shell/e-shell-window-commands.c:748
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:682
-#: ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:761 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:695
-#: ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:774
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks vajuta seda nuppu."
+msgstr ""
+"Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
+"vajuta seda nuppu."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda nuppu."
+msgstr ""
+"Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks vajuta seda "
+"nuppu."
 
-#: shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:712
 #, c-format
 msgid "Switch to %s"
 msgstr "Lülitub ümber: %s"
 
-#: shell/e-shell.c:598
+#: ../shell/e-shell.c:622
 msgid "Uknown system error."
 msgstr "Tundmatu süsteemi viga."
 
-#: shell/e-shell.c:806
-#: shell/e-shell.c:807
+#: ../shell/e-shell.c:824 ../shell/e-shell.c:825
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1250
-#: widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "Olgu"
 
-#: shell/e-shell.c:1252
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:1254
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
-msgstr "OAF'i ei saa registreerida"
+msgstr "OAF'i pole võimalik registreerida"
 
-#: shell/e-shell.c:1256
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
-#: shell/e-shell.c:1258
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Üldine viga"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Uus"
 
-#: shell/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Evolution'i seadistusabiline"
-
-#: shell/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Impordi failid"
-
-#: shell/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Ajavöönd"
-
-#: shell/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Tere tulemast"
-
-#: shell/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-
-#: shell/evolution-startup-wizard.glade.h:9
-msgid ""
-"You have successfully entered all of the information needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uus test"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Test"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Loob uue testikirje"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Evolution'i impordiabiline"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Impordi failist"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Impordi asukohast"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Importija tüüp"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Vali importijad"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Vali fail"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 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:29
 msgid "Import"
 msgstr "Impordi"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ära impordi"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:238
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15247,7 +15661,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:262
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15255,154 +15669,120 @@ msgstr ""
 "Täname\n"
 "Evolution'i meeskond\n"
 
-#: shell/main.c:269
+#: ../shell/main.c:261
 msgid "Don't tell me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/main.c:474
+#: ../shell/main.c:466
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution'i käivitamine koos määratud komponendi aktiveerimisega"
 
-#: shell/main.c:478
+#: ../shell/main.c:470
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
 
-#: shell/main.c:481
+#: ../shell/main.c:473
 msgid "Forcibly shut down all Evolution components"
 msgstr "Kõigi Evolution'i komponentide töö lõpetamisele sundimine"
 
-#: shell/main.c:485
+#: ../shell/main.c:477
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uuesti Evolution'i versioonist 1.4 migreerumisele sundimine"
 
-#: shell/main.c:488
+#: ../shell/main.c:480
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili"
 
-#: shell/main.c:491
-msgid "Disable the mono plugin environment."
-msgstr "Mono pluginate keskkonna keelamine."
-
-#: shell/main.c:494
+#: ../shell/main.c:482
 msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
-#: shell/main.c:525
+#: ../shell/main.c:513
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
-"%s: --online ja --offline võtmeid ei saa koos kasutada.\n"
+"%s: --online ja --offline võtmeid pole võimalik koos kasutada.\n"
 "  Täiendava teabe saamiseks käivita %s --help.\n"
 
-#. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell.error.xml.h:1
+msgid "Continue"
+msgstr "Jätka"
+
+#: ../shell/shell.error.xml.h:2
+msgid "Delete old data from version {0}?"
+msgstr "Kas kustutada vanad andmed versioonist {0}?"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Evolution can not start."
+msgstr "Evolution ei ole võimeline käivituma."
+
+#: ../shell/shell.error.xml.h:4
 msgid "Insufficient disk space for upgrade."
 msgstr "Uuendamiseks napib kettaruumi."
 
-#. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you can continue."
-msgstr ""
-"Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid sul on saadaval ainult {1}.\n"
-"\n"
-"Enne jätkamise pead Sa oma kodukataloogi looma rohkem vaba ruumi."
-
-#. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-"Tõrge eelmisest versioonist uuendamisel:\n"
-"{0}"
+#: ../shell/shell.error.xml.h:5
+msgid "Really delete old data?"
+msgstr "Kas tõesti kustutada vanad andmed?"
 
-#. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell.error.xml.h:6
 msgid ""
-"{1}\n"
+"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"permanently removed.\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
-msgstr ""
-"{1}\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
 "\n"
-"Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele andmetele.\n"
-
-#: shell/shell-errors.xml.h:15
-msgid "Continue"
-msgstr "Jätka"
-
-#. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17
-#: shell/shell-errors.xml.h:19
-msgid "Delete old data from version {0}?"
-msgstr "Kas kustutada vanad andmed versioonist {0}?"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
 
-#. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell.error.xml.h:12
+#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of \"evolution\" at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently.  If you choose to "
+"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
 msgstr ""
 "Evolution'i eelmine versioon hoidis andmeid teises kohas.\n"
 "\n"
-"Kui sa valid andmete eemaldamise, siis eemaldatakse kogu \"evolution\" kataloogi jäädavalt. Kui sa valid andmete säilitamise, siis võid sa hiljem omal vabal valikul käsitsi eemaldada kataloogi  \"evolution\".\n"
-
-#: shell/shell-errors.xml.h:25
-msgid "_Remind Me Later"
-msgstr "_Tuleta mulle hiljem meelde"
+"Kui sa valid andmete eemaldamise, siis eemaldatakse kogu \"evolution\" "
+"kataloogi jäädavalt. Kui sa valid andmete säilitamise, siis võid sa hiljem "
+"omal vabal valikul käsitsi eemaldada kataloogi  \"evolution\".\n"
 
-#: shell/shell-errors.xml.h:26
-msgid "_Keep Data"
-msgstr "_Säilita andmed"
-
-#. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28
-#: shell/shell-errors.xml.h:30
-msgid "Really delete old data?"
-msgstr "Kas tõesti kustutada vanad andmed?"
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+msgid "Upgrade from previous version failed: {0}"
+msgstr ""
+"Tõrge eelmisest versioonist uuendamisel:\n"
+"{0}"
 
-#. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell.error.xml.h:17
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
+"Sinu andmete ja sätete uuendamine vajab kuni {0} kettaruumi, kuid sul on "
+"saadaval ainult {1}.\n"
+"\n"
+"Enne jätkamise pead Sa oma kodukataloogi looma rohkem vaba ruumi."
 
-#. shell:noshell title
-#. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39
-#: shell/shell-errors.xml.h:47
-msgid "Cannot start Evolution"
-msgstr "Ei saa käivitada Evolution'i"
-
-#. shell:noshell primary
-#. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41
-#: shell/shell-errors.xml.h:49
-msgid "Evolution can not start."
-msgstr "Evolution ei ole võimeline käivituma."
-
-#. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell.error.xml.h:20
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
 
-#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15411,7 +15791,27 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/ca-trust-dialog.c:96
+#: ../shell/shell.error.xml.h:28
+msgid "_Keep Data"
+msgstr "_Säilita andmed"
+
+#: ../shell/shell.error.xml.h:29
+msgid "_Remind Me Later"
+msgstr "_Tuleta mulle hiljem meelde"
+
+#: ../shell/shell.error.xml.h:30
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele "
+"andmetele.\n"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -15422,69 +15822,75 @@ msgstr ""
 "\n"
 "Muuda usaldussätteid:"
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+#: ../smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr ""
 
-#: smime/gui/cert-trust-dialog.c:149
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+#: ../smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:134
-#: smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:377
-#: smime/gui/certificate-manager.c:385
-#: smime/gui/certificate-manager.c:597
-#: smime/gui/certificate-manager.c:605
-msgid "Select a cert to import..."
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
+#, fuzzy
+msgid "Select a certificate to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:265
-#: smime/gui/certificate-manager.c:474
-#: smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Sertifikaadi nimi"
 
-#: smime/gui/certificate-manager.c:274
-#: smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Kasutusalad"
 
-#: smime/gui/certificate-manager.c:283
-#: smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
 
-#: smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Aegub"
 
-#: smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Sisesta sisesta parool '%s' jaoks"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Palun sisesta uus parool sertifikaatide andmebaasi jaoks"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Sisesta uus parool"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15493,7 +15899,7 @@ msgstr ""
 "Kellele väljastatud:\n"
 "              Teema: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15502,2235 +15908,2258 @@ msgstr ""
 "Väljastaja:\n"
 "     Teema: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Sertifikaadi valimine"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ei ole sertifikaadi osa>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Sertifikaadi väljad</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Sertifikaatide hierarhia</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Välja väärtus</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Sõrmejäljed</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Väljastaja</b>"
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Omanik</b>"
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>See sertifikaat on verifitseeritud järgnevate toimingute tarbeks:</b>"
+msgstr ""
+"<b>See sertifikaat on verifitseeritud järgnevate toimingute tarbeks:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Kehtivus</b>"
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Sertifitseerimiskeskused"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Varunda"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Varunda kõik"
 
-#: 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)."
-msgstr "Enne selle sertifitseerimiskeskuse (SK) usaldamist ükskõik mis eesmärgil, peaksid sa selle SK kasutamisreeglitega ja protseduuridega (kui need on saadaval)."
+#: ../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)."
+msgstr ""
+"Enne selle sertifitseerimiskeskuse (SK) usaldamist ükskõik mis eesmärgil, "
+"peaksid sa selle SK kasutamisreeglitega ja protseduuridega (kui need on "
+"saadaval)."
 
-#: smime/gui/smime-ui.glade.h:14
-#: smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Usaldatav sertifitseerimiskeskus"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Sertifikaadi üksikasjad"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
+#, fuzzy
+msgid "Certificates Table"
+msgstr "Sertifikaadi nimi"
+
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Üldine nimi (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Kontaktide sertifikaadid"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Redigeermine"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "E-post sertifikaadi usaldussätted"
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "E-post vastuvõtja sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "E-posti signeerija sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Aegub"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Väljastatud"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organisatsioon (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Organisatsiooniüksus (OU):"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34
-#: smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35
-#: smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Usalda selle sertifikaadi autentsust"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Usalda seda sertifitseerimiskeskust e-post kasutajate tuvastamisel"
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Usalda seda sertifitseerimiskeskust tarkvaraarendajate tuvastamisel"
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Usalda seda sertifitseerimiskeskust veebisaitide tuvastamisel"
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Vaade"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Sinu sertifikaadid organisatsioonidelt, mis aitavad sind tuvastada:"
 
-#: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Sinu sertifikaadid, mis aitavad sul tuvastada sertifitseerimiskeskusi:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Sinu sertifikaadid, mis sul aitavad tuvastada teisi inimesi:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr "dialog1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:650
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
-#: smime/lib/e-cert.c:238
-#: smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Allkirjasta"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Krüpti"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versioon"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versioon 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versioon 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versioon 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA krüptimine"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape'i sertifikaadi tüüp"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ida"
+
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekti identifikaator (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmi identifikaator"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algoritmi parameetrid"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Teema avaliku võtme info"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:809
-#: smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
-msgstr "Viga: laiendit ei saa töödelda"
+msgstr "Viga: laiendit pole võimalik töödelda"
 
-#: smime/lib/e-cert.c:830
-#: smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL sertifikaadi atesteerimisorgan"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "E-posti sertifikaadi atesteerimisorgan"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Allkirjastamine"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Ebausaldusväärne"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Andmete "
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikaadi allkirjastaja"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL allkirjastaja"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:940
-#: smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Laiendused"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091
-#: smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Väljaandja"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Väljastaja unikaalne ID"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Teema unikaalne ID"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faili parool"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Sisestage PKCS12 faili jaoks parool:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Imporditud sertifikaat"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Lisatav manus."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Manuse sisutüüp."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Kirjas kuvatav failinimi."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Manuse kirjeldus."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr ""
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Vaikimisi sõnumi teema."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' käivitamine pole võimalik: %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Süsteemi %s sulgemine (%s)\n"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 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"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 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"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Liiguta kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 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 "Asetab lõikepuhvri"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 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-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Trükkimise eel_vaade"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Trükib valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Salvesta valitud kontaktid VKaardina."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vali kõik kontaktid"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Saada sõnum valitud kontaktidele."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Saada kontaktile sõnum"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Saadab valitud kontaktid teisele isikule."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Kuva kontakt eelvaateaknas"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Peata"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Peatab laadimise"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39
-#: ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Salvesta VKaardina"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "Vali _kõik"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Saada kontaktile sõnum..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Päev"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Kustuta kõik sündmused"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Kustuta sündmus"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Liigu"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Liigub tagasi"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Liigub edasi"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Loend"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 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:59
 msgid "Next"
 msgstr "Järgmine"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 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:73
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Trükib kalendri"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Avalikusta selle kalendri vaba/hõivatud teave"
 
-#: 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"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Puhasta vanadest sündmustest ja koosolekutest"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Vali _kuupäev"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Valib kindla kuupäeva"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Valib tänase kuupäeva"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Näita loendit"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Näita ühte päeva"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Näita ühte kuud"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Näita ühte nädalat"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Näita ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Käesoleva sündmuse kuvamine"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Nädal"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Töönädal"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Sündmus avamine"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 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
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Lõika valitud tekst lõikelauale"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 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-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Vali kogu tekst"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Minu Evolutioni kohandamine"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Katkestab käimasoleva sõnumioperatsiooni"
 
-#: ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "Koosta _uus sõnum"
+#: ../ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Copy the selected folder into another folder"
+msgstr "Kopeerib valitud sõnumi teise kausta"
+
+#: ../ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Create a new folder for storing mail"
+msgstr "Loo vKaust selle postiloendi jaoks"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Loob või muudab uute sõnumite filtreerimisreegleid"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
 msgid "Create or edit vFolder definitions"
 msgstr "Loo või muuda vKausta ???"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Puhasta _prügist"
 
-#: ui/evolution-mail-global.xml.h:7
-msgid "Open a window for composing a mail message"
-msgstr "Avab sõnumi koostamiseks uue akna"
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "Ka_ust"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:9
+#, fuzzy
+msgid "Message F_ilters"
+msgstr "Kirjade filtrid"
+
+#: ../ui/evolution-mail-global.xml.h:10
+#, fuzzy
+msgid "Message _List As"
+msgstr "Sõnum on rämps"
+
+#: ../ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Message _Preview"
+msgstr "Sõnumi päis"
+
+#: ../ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Move the selected folder into another folder"
+msgstr "Tõstab valitud sõnumi(d) teise kausta"
+
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Post Ne_w Message"
-msgstr "_Uue sõnumi postitamine"
-
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Post a message to a Public folder"
 msgstr "Sõnumi postitamine avalikku kausta"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "S_ubscribe to Folders..."
-msgstr "_Kaustade tellimine..."
+#: ../ui/evolution-mail-global.xml.h:15
+#, fuzzy
+msgid "Search F_olders"
+msgstr "Kausta valimine"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Näitab sõnumi eelvaate akent"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
-msgid "_Filters..."
-msgstr "_Filtrid..."
+#: ../ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "_Copy Folder To..."
+msgstr "_Kopeeri kausta..."
 
-#: ui/evolution-mail-global.xml.h:18
-msgid "vFolder _Editor..."
-msgstr "vKausta _redaktor..."
+#: ../ui/evolution-mail-global.xml.h:19
+#, fuzzy
+msgid "_Move Folder To..."
+msgstr "_Tõsta kausta..."
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_New Search _Folder (FIXME)"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_New..."
+msgstr "_Uus"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Subscriptions"
+msgstr "Kaustade tellimused"
+
+#: ../ui/evolution-mail-list.xml.h:1
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Muuda kausta omadusi"
+
+#: ../ui/evolution-mail-list.xml.h:2
 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:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopeerib valitud sõnumi(d) lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3
-#: ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Tõstab valitud sõnumi(d) lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "_Tühjenda"
 
-#: ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "Peida _valitud sõnumid"
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Group By _Threads"
+msgstr ""
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide _Deleted Messages"
 msgstr "Peida _kustutatud sõnumid"
 
-#: ui/evolution-mail-list.xml.h: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"
+#: ../ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Märgi kõik _loetuks"
-
-#: ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Märgib kõik peitmata sõnumid loetuks"
+#: ../ui/evolution-mail-list.xml.h:10
+#, fuzzy
+msgid "Mark Me_ssages as Read"
+msgstr "_Märgi sõnum loetuks peale"
 
-#: 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:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab sõnumid lõikepuhvrist"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
-#: ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "Vali _teemalõim"
+#: ../ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Permanently remove this folder"
+msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Select _All Messages"
+msgstr "Valib kõik peitmata sõnumid"
+
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Valib kõik sõnumid, mis hetkel ei ole valitud"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valib kõik valitud sõnumiga samas jutulõngas olevad sõnumid"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Valib kõik peitmata sõnumid"
 
-#: ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "_Näita peidetud sõnumeid"
+#: ../ui/evolution-mail-list.xml.h:18
+#, fuzzy
+msgid "Show _Messages"
+msgstr "_Sõnumid"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Toob ajutiselt peidetud sõnumid peidust välja"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Viib kõik loetud sõnumid ajutiselt peitu"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Viib valitud sõnumid ajutiselt peitu"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Esitab sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-list.xml.h:25
-msgid "_Folder"
-msgstr "_Kaust"
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Un_read Messages"
+msgstr "Lugemata sõnumeid:"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverdi valik"
+#: ../ui/evolution-mail-list.xml.h:25
+#, fuzzy
+msgid "_All"
+msgstr "_Alarm"
 
-#: ui/evolution-mail-list.xml.h:28
-msgid "_Threaded Message List"
-msgstr "_Esita sõnumeid jutulõngadena"
+#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#, fuzzy
+msgid "_Message"
+msgstr "_Sõnumid"
+
+#: ../ui/evolution-mail-list.xml.h:30
+#, fuzzy
+msgid "_Selected Messages"
+msgstr "Peida _valitud sõnumid"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "_Rakenda filtreid"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Saatja lisamine aadressiraamatusse"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "All Message _Headers"
+msgstr "Sõnumi päis"
+
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "Rakendab filtreerimisreeglid valitud sõnumitele"
 
-#: ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr "_Redigeerimisrežiim"
+#: ../ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Check for _Junk"
+msgstr "Kontrollin uusi sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Compose _New Message"
+msgstr "Koosta _uus sõnum"
+
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Koostab vastuse kõigile valitud sõnumi adressaatidele"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Koostab vastuse valitud sõnumi postiloendisse"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Koostab vastuse valitud sõnumi koostajale"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopeerib valitud sõnumi teise kausta"
 
-#: ui/evolution-mail-message.xml.h:12
-msgid "Create _vFolder From Message"
-msgstr "Loo _vKaust selle sõnumi alusel"
+#: ../ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create R_ule"
+msgstr "Kausta loomine"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages from this sender"
 msgstr "Loob reegli filtreerimaks selle saatja poolt saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Loob reegli filtreerimaks nendele adressaatidele saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Loob reegli filtreerimaks sellese postiloendisse saadetud sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages with this subject"
 msgstr "Loob reegli filtreerimaks selle teemaga sõnumeid"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for these recipients"
 msgstr "Loo vKaust nende adressaatide jaoks"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this mailing list"
 msgstr "Loo vKaust selle postiloendi jaoks"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a vFolder for this sender"
 msgstr "Loo vKaust selle saatja jaoks"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a vFolder for this subject"
 msgstr "Loo vKaust selle teema jaoks"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Vähendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Kuvab järgmise tähtsa sõnumi"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Kuvab järgmise sõnumi"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Kuvab järgmise lugemata sõnumi"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Kuvab järgmise lugemata jutulõnga"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Kuvab eelmise tähtsa sõnumi"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Kuvab eelmise sõnumi"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Kuvab eelmise lugemata sõnumi"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "F_orward As..."
-msgstr "E_dasta kohandatud vormingus..."
-
-#: ui/evolution-mail-message.xml.h:33
-msgid "Filter _Junk"
-msgstr "_Rämpsu filtreerimine"
-
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja järgi"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide järgi"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filter _teema järgi"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Valitud sõnumitest rämpsu filtreerimine"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Märgib valitud sõnumi(d) jälgimiseks"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "_Jälgi..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laeb HTML-vormingus sõnumi pildid"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Saadab valitud sõnumi kellelegi edasi (saadetava sõnumi sees)"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Saadab valitud sõnumi kellelegi edasi (tsitaadina)"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Saadab valitud sõnumi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Saadab valitud sõnumi kellelegi edasi (manusena)"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Suurendab teksti suurust"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Load _Images"
-msgstr "_Lae pildid"
-
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mar_k as Read"
+#: ../ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mar_k as"
 msgstr "_Märgi loetuks"
 
-#: ui/evolution-mail-message.xml.h:51
-msgid "Mark as I_mportant"
-msgstr "Märgi _tähtsaks"
-
-#: ui/evolution-mail-message.xml.h:52
-msgid "Mark as U_nread"
-msgstr "Märgi kui l_ugemata"
-
-#: ui/evolution-mail-message.xml.h:53
-msgid "Mark as Unimp_ortant"
-msgstr "Märgi vähetä_htsaks"
-
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Märgib valitud sõnum(id) loetuks"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Märgib valitud sõnum(id) tähtsaks"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Märgib valitud sõnumi(d) rämpsuks"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Märgib valitud sõnumi(d) mitterämpsuks"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Märgib valitud sõnumi(d) lugemata sõnumi(te)ks"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Märgib valitud sõnumi(d) vähetähtsaks"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Märgib valitud sõnumid kustutatuks"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Message Source"
+msgstr "Sõnumite säilitamine"
+
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Liiguta"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Tõstab valitud sõnumi(d) teise kausta"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Jä_rgmine tähtis kiri"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "Järgmine _lõim"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Järgmine _lugemata sõnum"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ei ole rämps"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open a window for composing a mail message"
+msgstr "Avab sõnumi koostamiseks uue akna"
+
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Avab valitud sõnumi sõnumiredaktoris"
 
-#: ui/evolution-mail-message.xml.h:72
-msgid "Original Si_ze"
-msgstr "_Algne suurus"
-
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "_Eelmine lugemata kiri"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Postita _vastus"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr "_Eelmine tähtis sõnum"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Preview the message to be printed"
 msgstr "Trükitava sõnumi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Print this message"
 msgstr "Trükib valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr "Ümber_suunamine"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Valitud sõnumite edastamine kellelegi"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ui/evolution-mail-message.xml.h:90
-msgid "S_earch in Message..."
-msgstr "_Otsi sõnumist..."
-
-#: ui/evolution-mail-message.xml.h:91
-msgid "S_maller"
-msgstr "_Väiksem"
-
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Save the message as a text file"
 msgstr "Salvestab sõnumi tekstifaili"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud sõnumi sisust"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "Set up the page settings for your current printer"
-msgstr "Lehekülje sätted aktiivse printeri jaoks"
+#: ../ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "Select _All Text"
+msgstr "Vali kogu tekst"
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "Show Email _Source"
-msgstr "_Näita e-post lähtekoodi"
+#: ../ui/evolution-mail-message.xml.h:86
+#, fuzzy
+msgid "Select all the text in a message"
+msgstr "Valib kõik peitmata sõnumid"
 
-#: ui/evolution-mail-message.xml.h:96
-msgid "Show Full _Headers"
-msgstr "Näita kõiki _päiseid"
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Set up the page settings for your current printer"
+msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:88
 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:98
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Show message in the normal style"
 msgstr "Näitab sõnumit tavalise stiiliga"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show message with all email headers"
 msgstr "Näitab sõnumit koos kõigi päistega"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show the raw email source of the message"
 msgstr "Näitab sõnumit töötlemata kujul"
 
-#: ui/evolution-mail-message.xml.h:101
-msgid "Text Si_ze"
-msgstr "Teksti _suurus"
-
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Un-delete the selected messages"
 msgstr "Taastab valitud sõnumi"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Attached"
-msgstr "_Manustatud"
+#: ../ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "Uni_mportant"
+msgstr "Tähtis"
 
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Create Filter From Message"
-msgstr "_Loo sõnumi baasil filter"
+#: ../ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "vKaust _postiloendi järgi..."
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "VFolder on Recipients..."
+msgstr "vKaust _adressaatide järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "VFolder on S_ubject..."
+msgstr "vKaust _teema järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "VFolder on Sen_der..."
+msgstr "vKaust _saatja järgi..."
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Zoom _Out"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Caret Mode"
+msgstr "_Redigeerimisrežiim"
+
+#: ../ui/evolution-mail-message.xml.h:102
+#, fuzzy
+msgid "_Delete Message"
+msgstr "Peida _kustutatud sõnumid"
+
+#: ../ui/evolution-mail-message.xml.h:104
+#, fuzzy
+msgid "_Find in Message..."
+msgstr "Otsing sõnumist"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "Samal _joonel"
+#: ../ui/evolution-mail-message.xml.h:107
+#, fuzzy
+msgid "_Important"
+msgstr "Tähtis"
 
-#: ui/evolution-mail-message.xml.h:113
-msgid "_Larger"
-msgstr "_Suurem"
+#: ../ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Junk"
+msgstr "Rämpspost"
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Message Display"
-msgstr "_Sõnumi kuvamine"
+#: ../ui/evolution-mail-message.xml.h:109
+#, fuzzy
+msgid "_Load Images"
+msgstr "_Lae pildid"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:117
-msgid "_Normal Display"
+#: ../ui/evolution-mail-message.xml.h:113
+#, fuzzy
+msgid "_Normal Size"
 msgstr "_Tavaline kuva"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Open Message"
-msgstr "_Ava sõnum"
+#: ../ui/evolution-mail-message.xml.h:114
+#, fuzzy
+msgid "_Not Junk"
+msgstr "Ei ole rämps"
+
+#: ../ui/evolution-mail-message.xml.h:115
+#, fuzzy
+msgid "_Open in New Window"
+msgstr "Uues _aknas avamine"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:122
-msgid "_Quoted"
-msgstr "_Tsiteeritud"
-
-#: ui/evolution-mail-message.xml.h:125
-#: ui/evolution.xml.h:48
-msgid "_Tools"
-msgstr "T_ööriistad"
-
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Undelete"
-msgstr "_Taasta"
+#: ../ui/evolution-mail-message.xml.h:118
+#, fuzzy
+msgid "_Read"
+msgstr "Loetud"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "vFolder on Mailing _List..."
-msgstr "vKaust _postiloendi järgi..."
+#: ../ui/evolution-mail-message.xml.h:120
+#, fuzzy
+msgid "_Save Message..."
+msgstr "Sõnumi salvestamine..."
 
-#: ui/evolution-mail-message.xml.h:128
-msgid "vFolder on Se_nder..."
-msgstr "vKaust _saatja järgi..."
+#: ../ui/evolution-mail-message.xml.h:121
+#, fuzzy
+msgid "_Undelete Message"
+msgstr "_Järgmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:129
-msgid "vFolder on _Recipients..."
-msgstr "vKaust _adressaatide järgi..."
+#: ../ui/evolution-mail-message.xml.h:122
+#, fuzzy
+msgid "_Unread"
+msgstr "Märgi _mitteloetuks"
 
-#: ui/evolution-mail-message.xml.h:130
-msgid "vFolder on _Subject..."
-msgstr "vKaust _teema järgi..."
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Zoom In"
+msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3
-#: ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Sulge"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:5
+#: ../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:3
-#: ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: 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.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Fail"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 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:3
+msgid "Check to get delivery notification when your message is read"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Delete all but signature"
 msgstr "Kustuta kõik peale allkirja"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with PGP"
 msgstr "Krüpti sõnum PGPga"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+#: ../ui/evolution-message-composer.xml.h:8
+#, fuzzy
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
 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:9
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
 msgstr "Ava fail"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr "PGP krüptimine"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr "PGP allkiri"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Request read receipt"
+msgstr "Nõutav osaleja"
+
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "S/MIME krüptimine"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "S/MIME allkiri"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Salvesta kui"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Salvesta _mustand"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Salvesta käesolev fail"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Salvesta käesolev fail teise nime all"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Salvesta käesolev fail teise kausta"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Saada sõnum HTML formaadis"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Send this message"
 msgstr "Saadab selle sõnumi"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Näita / peida manused"
-
-#: ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Manuste _näitamine"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Manuste näitamine"
-
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Sign this message with your PGP key"
 msgstr "Allkirjastab sõnumi sinu PGP võtme abil"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allkirjastab sõnumi sinu S/MIME allkirjasertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Lülitab pimekoopia välja näitamise sisse või välja"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the CC field is displayed"
 msgstr "Lülitab koopiavälja näitamise sisse või välja"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Lülitab vasta-kellele välja näitamise sisse või välja"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "_Attachment..."
 msgstr "_Manus..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr "_Salakoopia (Bcc) väli"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr "_Koopia (Cc) väli"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Delete all"
 msgstr "_Kustuta kõik"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr "_Kellelt (From) väli"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Lisa"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "_Open..."
 msgstr "_Ava..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Post-To Field"
 msgstr "_Saada-kellele väli"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele väli"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Salvesta"
-
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Security"
 msgstr "_Turvalisus"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_To Field"
 msgstr "_Vasta-kellele (To) väli"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Sulge"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Salvesta ja _sulge"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Salvestab aktiivne fail ja sulge aken"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lisab kausta sinu tellitud kaustade nimekirja"
 
-#: ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "Ka_ust"
-
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Värskenda ülesannete nimekirja"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Värskenda kaustade nimekirja"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eemaldab kausta sinu tellitud kaustade nimekirjast"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Telli"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Lõpeta tellimus"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverdi valik"
+
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopeerib valitud ülesande"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Lõikab valitud ülesande"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Kustutab lõpetatud ülesanded"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Kustutab valitud ülesanded"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Märgib valitud ülesanded lõpetatuks"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Asetab lõikepuhvrist ülesande"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Trükib ülesannete nimekirja"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Vaata valitud ülesannet"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Evolutionist..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Muudab Evolutioni seadeid "
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Muuda tööriistariba nähtavalolekut"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "Loob uue akna, mis kuvab seda kausta"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "E_xit"
-msgstr "_Välju"
-
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
 msgstr "Evolutioni _KKK"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Väljub programmist"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Unusta _paroolid"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Unustab meeldejäetud paroolid, vajadusel küsitakse paroolid uuesti."
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Peida akna nupud"
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "_Ikoonid ja tekst"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Impordib andmeid teistest programmidest"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ui/evolution.xml.h:21
-msgid "Pi_lot Settings..."
-msgstr "P_ilot'i sätted..."
-
-#: ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "_Eelistused"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Saada / võta vastu"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Saadab ära järjekorras olevad sõnumid ja tõmbab ära uued sõnumid"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Seab Pilot'i seadeid"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Näitab teavet Evolution'i kohta"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Lülitab autonoomse reziimi sisse või välja"
 
-#: ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Tööriistariba"
 
-#: ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "Tööriistariba _stiil"
 
-#: ui/evolution.xml.h:33
-msgid "Window B_uttons"
-msgstr "Akna _nupud"
-
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Evolutionist lähemalt..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Close Window"
+msgstr "Sulgeb akna"
+
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Abi"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Peida nupud"
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Ainult _ikoonid"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Kiirviide"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Quit"
+msgstr "_Tsiteeritud"
+
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Saada / võta vastu"
 
-#: ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:42
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:43
+msgid "_Synchronization Options..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Ainult _tekst"
 
-#: ui/evolution.xml.h:50
-msgid "_Window"
-msgstr "_Aken"
+#: ../ui/evolution.xml.h:45
+msgid "_Tools"
+msgstr "T_ööriistad"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Firma järgi"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Aadressikaardid"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Telefonide loend"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "_Nädala vaade"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Päeva vaade"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "_Loeteluvaade"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Kuu vaade"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Töönädala vaade"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "Saadetud _sõnumite kaustana"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "_Oleku järgi"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "_Saatja järgi"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "_Teema järgi"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "_Jälgimise sildi järgi"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Sõnumid"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "_Tähtajaga"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "_Staatusega"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Ajavööndid</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Valik</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Ajavööndi valimine"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
 msgstr "Ajavöönd valikukast"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 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"
 "Parema hiirenupuga saab kaarti vähendada."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Salvesta kohandatud vaade..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1099
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-calendar.c:177
-#: widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "Eelmine nupp"
 
-#: widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Kuu kalender"
 
-#: widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Praegu"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Kellaaeg peab olema sisestatud %s formaadis"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "balti"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "hiina"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "kreeka"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "heebrea"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "jaapani"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "korea"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "türgi"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "lääne-euroopa"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 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:93
+#: ../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"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "visuaalne"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 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"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Sisesta kasutatav märgistik"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Muu..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "Kuupäev ja kellaaeg"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:351
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Kuupäeva nupp"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr "Valikukast aja valimiseks"
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr "Aja valikukast"
 
-#: widgets/misc/e-error.c:84
-#: widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
-msgid "Evolution Error"
-msgstr "Evolutioni viga"
-
-#: widgets/misc/e-error.c:86
-#: widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
-msgid "Evolution Warning"
-msgstr "Evolutioni hoiatus"
-
-#: widgets/misc/e-error.c:124
-msgid "Evolution Information"
-msgstr "Evolutioni info"
-
-#: widgets/misc/e-error.c:126
-msgid "Evolution Query"
-msgstr "Evolutioni küsimus"
-
-#. setup a dummy error
-#: widgets/misc/e-error.c:438
-#, 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>"
-
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laiendatud"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Kas laiendaja on laiendatud või mitte"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Laiendaja sildi tekst"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 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"
+#: ../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"
 msgstr ""
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Sildividin"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikaatorivahe"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Otsingud"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 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
-msgid "_Advanced..."
-msgstr "_Täpsemalt..."
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "_Advanced Search..."
+msgstr "Laiendatud otsing"
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Vali pilt"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
 msgstr "Maailmakaart"
 
-#: widgets/misc/e-map.c:649
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
+#: ../widgets/misc/e-map.c:649
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
 msgstr ""
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr ""
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Privaatkirjete sünkroniseerimine"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: widgets/misc/e-search-bar.c:343
+#: ../widgets/misc/e-search-bar.c:345
 #, fuzzy
 msgid "Search Text Entry"
 msgstr "Otsinguredaktor"
 
-#: widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:554
-#: widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Otsingu tüüp"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "Elemendi (id_ID)"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "Alamelemendi (ID)"
 
-#: widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-send-options.c:505
+#: ../widgets/misc/e-send-options.c:515
 #, fuzzy
 msgid "When de_leted:"
 msgstr "%d kustutatut"
 
-#: widgets/misc/e-send-options.glade.h:1
+#: ../widgets/misc/e-send-options.glade.h:1
 #, fuzzy
 msgid "<b>Delivery Options</b>"
 msgstr "<b>Saatmise valikud</b>"
 
-#: widgets/misc/e-send-options.glade.h:2
+#: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>Vastused</b>"
 
-#: widgets/misc/e-send-options.glade.h:3
+#: ../widgets/misc/e-send-options.glade.h:3
 #, fuzzy
 msgid "<b>Return Notification</b>"
 msgstr "<b>Autentimine</b>"
 
-#: widgets/misc/e-send-options.glade.h:4
+#: ../widgets/misc/e-send-options.glade.h:4
 #, fuzzy
 msgid "<b>Status Tracking</b>"
 msgstr "<b>Otsimine</b>"
 
-#: widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "C_lassification"
 msgstr "_Liigitamine"
 
-#: widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:7
 #, fuzzy
 msgid "Creat_e a sent item to track information"
-msgstr "CMS Vastuvõtja teavet ei saa luua"
+msgstr "CMS Vastuvõtja teavet pole võimalik luua"
 
-#: widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:8
 #, fuzzy
 msgid "Deli_vered and opened"
 msgstr "Vastused ja eelnenud"
 
-#: widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:9
 #, fuzzy
 msgid "Gene_ral Options"
 msgstr "Üldine"
 
-#: widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:12
-msgid ""
-"None\n"
-"Mail Receipt\n"
-msgstr ""
-
-#: widgets/misc/e-send-options.glade.h:15
+#: ../widgets/misc/e-send-options.glade.h:12
 #, fuzzy
 msgid ""
 "Public\n"
@@ -17738,16 +18167,17 @@ msgid ""
 "Confidential\n"
 msgstr "Salajane"
 
-#: widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:16
 #, fuzzy
 msgid "R_eply requested"
 msgstr "_Vastamise stiil:"
 
-#: widgets/misc/e-send-options.glade.h:21
-msgid "Sta_tus  Tracking"
+#: ../widgets/misc/e-send-options.glade.h:18
+#, fuzzy
+msgid "Sta_tus Tracking"
 msgstr "_Oleku jälgimine"
 
-#: widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -17755,1439 +18185,2157 @@ msgid ""
 "Low"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:23
 #, fuzzy
 msgid "W_ithin"
 msgstr "Laius"
 
-#: widgets/misc/e-send-options.glade.h:27
-msgid "When acce_pted: "
+#: ../widgets/misc/e-send-options.glade.h:24
+#, fuzzy
+msgid "When acce_pted:"
 msgstr "Kui _nõustutakse:"
 
-#: widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:25
 #, fuzzy
 msgid "When co_mpleted:"
 msgstr "_Lõpetamise kuupäev:"
 
-#: widgets/misc/e-send-options.glade.h:29
-msgid "When decli_ned:    "
+#: ../widgets/misc/e-send-options.glade.h:26
+#, fuzzy
+msgid "When decli_ned:"
 msgstr "Kui k_eeldutakse:"
 
-#: widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Pärast:"
 
-#: widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_Kogu teave"
 
-#: widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Viivita kohaletoimetamisega"
 
-#: widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Kohale toimetatud"
 
-#: widgets/misc/e-send-options.glade.h:35
-msgid "_Set expiration  date"
+#: ../widgets/misc/e-send-options.glade.h:32
+#, fuzzy
+msgid "_Set expiration date"
 msgstr "_Määra aegumistähtaeg"
 
-#: widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Kuni:"
 
-#: widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr ""
 
-#: widgets/misc/e-send-options.glade.h:38
-msgid "_When opened:     "
-msgstr ""
-
-#. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
-msgid "File exists \"{0}\"."
-msgstr "Fail \"{0}\" on juba olemas."
-
-#. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
-msgid "Do you wish to overwrite it?"
-msgstr "Kas sa soovid seda üle kirjutada?"
-
-#. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
-msgid "Cannot save file \"{0}\"."
-msgstr "Faili \"{0}\" pole võimalik salvestada."
-
-#. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
-msgid "Cannot open file \"{0}\"."
-msgstr "Faili \"{0}\" ei saa avada."
+#: ../widgets/misc/e-send-options.glade.h:35
+#, fuzzy
+msgid "_When opened:"
+msgstr "_Lõpetamise kuupäev:"
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#: widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
 msgstr "URL'i avamiseks kliki siin"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Jäta see parool meelde"
-#~ msgid "_Remember this password for the remainder of this session"
-#~ msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
-#~ msgid "Mark as _Unread"
-#~ msgstr "Märgi _mitteloetuks"
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Lisa saatja _aadressiraamatusse"
-#~ msgid "Appl_y Filters"
-#~ msgstr "Rakenda _filtrid"
-#~ msgid "F_ilter Junk"
-#~ msgstr "_Rämpsu filtreerimine"
-#~ msgid "have "
-#~ msgstr "omab"
-#~ msgid "has "
-#~ msgstr "omab"
-#~ msgid " cards"
-#~ msgstr " kaarti"
-#~ msgid " card"
-#~ msgstr " kaart"
-#~ msgid "alarm "
-#~ msgstr "alarm "
-#~ msgid "time-zone "
-#~ msgstr "ajavöönd"
-#~ msgid "meeting "
-#~ msgstr "koosolek"
-#~ msgid ", %d events"
-#~ msgstr ", %d sündmust"
-#~ msgid "work week view :"
-#~ msgstr "töönädala vaade :"
-#~ msgid "day view :"
-#~ msgstr "päeva vaade :"
-#~ msgid "month view :"
-#~ msgstr "kuu vaade :"
-#~ msgid "week view :"
-#~ msgstr "nädala vaade :"
-#~ msgid ")"
-#~ msgstr ")"
-#~ msgid "Position of the vertical pane in main view."
-#~ msgstr "Vertikaalpaani asukoht põhivaates."
-#~ 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 "Address:"
-#~ msgstr "Aadress:"
-#~ msgid "Calendar:"
-#~ msgstr "Kalender:"
-#~ msgid "PO Box:"
-#~ msgstr "Sidejaoskonna postkast:"
-#~ msgid "State/Province:"
-#~ msgstr "Maakond/Provints:"
-#~ msgid "Title:"
-#~ msgstr "Tiitel:"
-#~ msgid "This contact belongs to these categories:"
-#~ msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
-#~ msgid "Edit Contact Info"
-#~ msgstr "Muuda kontakti andmeid"
-#~ msgid "Add to Contacts"
-#~ msgstr "Lisa kontaktide hulka"
-#~ msgid "Days that are work days"
-#~ msgstr "Päevad, mis on tööpäevad"
-#~ msgid "Default timezone for meetings"
-#~ msgstr "Vaikimisi ajavöönd koosolekute jaoks"
-#~ msgid "Position of the horizontal pane in the month view"
-#~ msgstr "Horisontaalpaani asukoht kuuvaates"
-#~ msgid "Position of the vertical pane"
-#~ msgstr "Vertikaalpaani asukoht"
-#~ msgid "Show where events end in week and month views"
-#~ msgstr "Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
-#~ msgid "Whether to ask for confirmation when folder is expunged"
-#~ msgstr "Kas küsida nõusolekut kausta puhastamisel"
-#~ msgid "<span weight=\"bold\">Basics</span>"
-#~ msgstr "<span weight=\"bold\">Põhiline</span>"
-#~ msgid "<span weight=\"bold\">Date and Time</span>"
-#~ msgstr "<span weight=\"bold\">Kuupäev ja aeg</span>"
-#~ msgid "Free/Busy Editor"
-#~ msgstr "Vaba/Hõivatud teabe redaktor"
-#~ msgid "Print Setup"
-#~ msgstr "Trükkimise seaded"
-#~ msgid "Signing is not supported by this cipher"
-#~ msgstr "See šiffer ei toeta allkirjastamist"
-#~ msgid "Signing message"
-#~ msgstr "Sõnumi signeerimine"
-#~ msgid "Verifying is not supported by this cipher"
-#~ msgstr "See šiffer ei toeta kontrolli"
-#~ msgid "Verifying message"
-#~ msgstr "Sõnumi verifitseerimine"
-#~ msgid "Encryption is not supported by this cipher"
-#~ msgstr "See šiffer ei toeta krüptimist"
-#~ msgid "Encrypting message"
-#~ msgstr "Sõnumi krüptimine"
-#~ msgid "Decryption is not supported by this cipher"
-#~ msgstr "See šiffer ei toeta dekrüptimist"
-#~ msgid "Decrypting message"
-#~ msgstr "Sõnumi dekrüptimine"
-#~ msgid "You may not import keys with this cipher"
-#~ msgstr "Sa ei tohi importida selle šifriga võtmeid"
-#~ msgid "You may not export keys with this cipher"
-#~ msgstr "Sa ei tohi eksportida selle šifriga võtmeid"
-#~ msgid ""
-#~ "Could not write log entry: %s\n"
-#~ "Further operations on this server will not be replayed when you\n"
-#~ "reconnect to the network."
-#~ msgstr ""
-#~ "Ei olnud võimalik kirjutada logisse kirjet: %s\n"
-#~ "Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
-#~ "taastad ühenduse võrguga."
-#~ msgid ""
-#~ "Could not open `%s':\n"
-#~ "%s\n"
-#~ "Changes made to this folder will not be resynchronized."
-#~ msgstr ""
-#~ "Ei ole võimalik avada `%s':\n"
-#~ "%s\n"
-#~ "Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
-#~ msgid "Resynchronizing with server"
-#~ msgstr "Taassünkroniseeritakse serveriga"
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr "Selle operatsiooni täitmiseks pead olema võrku ühendatud"
-#~ msgid "Failed to create pipe to '%s': %s"
-#~ msgstr "Tõrge toru loomisel -> '%s': %s"
-#~ msgid "Failed to create child process '%s': %s"
-#~ msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
-#~ msgid "Invalid message stream received from %s: %s"
-#~ msgstr "Vastu võetud vigane sõnum %s'lt: %s"
-#~ msgid "Syncing folders"
-#~ msgstr "Kaustade sünkroniseerimine"
-#~ msgid "Error parsing filter: %s: %s"
-#~ msgstr "Viga filtri analüüsil: %s: %s"
-#~ msgid "Error executing filter: %s: %s"
-#~ msgstr "Viga filtri täitmisel: %s: %s"
-#~ msgid "Unable to open spool folder"
-#~ msgstr "Puhverkausta pole võimalik avada"
-#~ msgid "Unable to process spool folder"
-#~ msgstr "Puhverkausta pole võimalik töödelda"
-#~ msgid "Getting message %d (%d%%)"
-#~ msgstr "Võetakse vastu teadet %d (%d%%)"
-#~ msgid "Cannot open message"
-#~ msgstr "Sõnumit ei saa avada"
-#~ msgid "Failed on message %d"
-#~ msgstr "Tõrge sõnumi %d juures"
-#~ msgid "Syncing folder"
-#~ msgstr "Kausta sünkroniseerimine"
-#~ msgid "Getting message %d of %d"
-#~ msgstr "Tõmban %d. sõnumit %dst"
-#~ msgid "Failed at message %d of %d"
-#~ msgstr "Tõrge sõnumi %d juures (kokku sõnumeid: %d)"
-#~ msgid "Failed to retrieve message"
-#~ msgstr "Tõrge sõnumi vastuvõtmisel"
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
-#~ msgid "Error executing filter search: %s: %s"
-#~ msgstr "Viga filterotsingu täitmisel: %s: %s"
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "Toetamata operatsioon: lisa sõnum: %s"
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
-#~ msgid "Unsupported operation: search by uids: for %s"
-#~ msgstr "Toetamata operatsioon: otsing UID järgi: %s"
-#~ msgid "Moving messages"
-#~ msgstr "Sõnumite liigutamine"
-#~ msgid "Copying messages"
-#~ msgstr "Sõnumite kopeerimine"
-#~ msgid "Learning junk"
-#~ msgstr "Rämpsposti tundmaõppimine"
-#~ msgid "Learning non-junk"
-#~ msgstr "Mitte-rämpsposti tundmaõppimine"
-#~ msgid "Filtering new message(s)"
-#~ msgstr "Uute sõnumite filtreerimine"
-#~ msgid ""
-#~ "Cannot parse search expression: %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
-#~ "%s"
-#~ msgid ""
-#~ "Error executing search expression: %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Viga otsinguavaldise täitmisel: %s:\n"
-#~ "%s"
-#~ msgid "(match-all) requires a single bool result"
-#~ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "Täidetakse päringut tundmatul päisel: %s"
-#~ msgid ""
-#~ "Unexpected GnuPG status message encountered:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ootamatu GnuPG olekusõnum:\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "Failed to parse gpg userid hint."
-#~ msgstr "Tõrge gpg kasutaja ID vihje analüüsimisel."
-#~ msgid "Failed to parse gpg passphrase request."
-#~ msgstr "Tõrge gpg paroolipäringu analüüsimisel."
-#~ msgid ""
-#~ "You need a passphrase to unlock the key for\n"
-#~ "user: \"%s\""
-#~ msgstr "Sul on kasutaja \"%s\" võtme lahtilukustamiseks vaja parooli"
-#~ msgid "Failed to unlock secret key: 3 bad passphrases given."
-#~ msgstr "Tõrge salajase võtme avamisel: sisestati 3 valet parooli."
-#~ msgid "Unexpected response from GnuPG: %s"
-#~ msgstr "Ootamatu vastus GnuPG'lt: %s"
-#~ msgid "Failed to encrypt: No valid recipients specified."
-#~ msgstr "Tõrge sõnumi krüptimisel: Saajate aadressid on määramata."
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tõrge GPG töötlemisel %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Tõrge %s GPG töötlemisel: %s\n"
-#~ msgid "Could not generate signing data: %s"
-#~ msgstr "Signeerimisandmete genereerimine ei õnnestunud: %s"
-#~ msgid "Failed to execute gpg: %s"
-#~ msgstr "gpg käivitamine nurjus: %s"
-#~ msgid "Failed to execute gpg."
-#~ msgstr "Tõrge gpg käivitamisel."
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "See on sõnumi digitaalselt allkirjastatud osa"
-#~ msgid "Cannot verify message signature: Incorrect message format"
-#~ msgstr "Ei saa kontrollida sõnumi signatuuri: Sõnum on vigaselt vormindatud"
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "Ei saa kontrollida sõnumi signatuuri: ajutise faili loomine nurjus: %s"
-#~ msgid "This is a digitally encrypted message part"
-#~ msgstr "See on sõnumi digitaalselt krüptitud osa"
-#~ msgid "Failed to decrypt MIME part: protocol error"
-#~ msgstr "Tõrge MIME osa dekrüptimisel: protokolli viga"
-#~ msgid "Encrypted content"
-#~ msgstr "Krüpteeritud sisu"
-#~ msgid "Could not create lock file for %s: %s"
-#~ msgstr "Ei suuda luua lukufaili %s jaoks: %s"
-#~ msgid "Timed out trying to get lock file on %s. Try again later."
-#~ msgstr ""
-#~ "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
-#~ msgid "Failed to get lock using fcntl(2): %s"
-#~ msgstr "Tõrge fcntl(2) abil lukustamisel: %s"
-#~ msgid "Failed to get lock using flock(2): %s"
-#~ msgstr "Tõrge flock(2) abil lukustamisel: %s"
-#~ msgid "Cannot build locking helper pipe: %s"
-#~ msgstr "Ei suuda luua lukustamisabilise toru: %s"
-#~ msgid "Could not lock '%s': protocol error with lock-helper"
-#~ msgstr ""
-#~ "'%s' ei lukustamine ei õnnestunud, protokolli viga lukustamisabilises"
-#~ msgid "Could not lock '%s'"
-#~ msgstr "Ei saa lukustada '%s'"
-#~ msgid "Could not open mail file %s: %s"
-#~ msgstr "Sõnumifaili %s ei saa avada: %s"
-#~ msgid "Could not open temporary mail file %s: %s"
-#~ msgstr "Ei saa avada ajutist sõnumifaili %s: %s"
-#~ msgid "Failed to store mail in temp file %s: %s"
-#~ msgstr "Tõrge sõnumi salvestamisel ajutisse faili %s: %s"
-#~ msgid "Could not create pipe: %s"
-#~ msgstr "Soklit ei saa luua: %s"
-#~ msgid "Could not fork: %s"
-#~ msgstr "Ei saa forkida: %s"
-#~ msgid "Movemail program failed: %s"
-#~ msgstr "Tõrge Movemail programmis: %s"
-#~ msgid "(Unknown error)"
-#~ msgstr "(tundmatu viga)"
-#~ msgid "Error reading mail file: %s"
-#~ msgstr "Viga sõnumifaili lugemisel: %s"
-#~ msgid "Error writing mail temp file: %s"
-#~ msgstr "Viga ajutise sõnumifaili kirjutamisel: %s"
-#~ msgid "Error copying mail temp file: %s"
-#~ msgstr "Viga ajutise sõnumifaili kopeerimisel: %s"
-#~ msgid "parse error"
-#~ msgstr "analüüsimisviga"
-#~ msgid "cannot create thread"
-#~ msgstr "lõime ei saa luua"
-#~ msgid "Resolving: %s"
-#~ msgstr "Lahendan: %s"
-#~ msgid "Host lookup failed"
-#~ msgstr "Hostinime lahendamine nurjus"
-#~ msgid "Host lookup failed: %s: %s"
-#~ msgstr "Hostinime lahendamine nurjus: %s: %s"
-#~ msgid "Resolving address"
-#~ msgstr "Aadressi lahendamine"
-#~ msgid "Name lookup failed"
-#~ msgstr "Tõrge nime lahendamisel"
-#~ msgid "Name lookup failed: %s"
-#~ msgstr "Tõrge nime lahendamisel: %s"
-#~ msgid "Could not load %s: Module loading not supported on this system."
-#~ msgstr "Ei saa laadida %s: süsteem ei toeta moodulite laadimist."
-#~ msgid "Could not load %s: %s"
-#~ msgstr "Ei saa laadida '%s': %s"
-#~ msgid "Could not load %s: No initialization code in module."
-#~ msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
-#~ msgid "Anonymous"
-#~ msgstr "Anonüümne"
-#~ msgid "This option will connect to the server using an anonymous login."
-#~ msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
-#~ msgid "Authentication failed."
-#~ msgstr "Autentimine nurjus."
-#~ msgid ""
-#~ "Invalid email address trace information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ebakorrektne e-posti aadressi jälitusinfo:\n"
-#~ "%s"
-#~ msgid ""
-#~ "Invalid trace information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Vigane jälitusinfo:\n"
-#~ "%s"
-#~ msgid "CRAM-MD5"
-#~ msgstr "CRAM-MD5"
-#~ 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 "DIGEST-MD5"
-#~ msgstr "DIGEST-MD5"
-#~ 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 "Server challenge too long (>2048 octets)\n"
-#~ msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
-#~ msgid "Server challenge invalid\n"
-#~ msgstr "Vigane serveri kutsung\n"
-#~ msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-#~ msgstr "Serveri kutsung sisaldas vigast \"Quality of Protection\" lipikut\n"
-#~ msgid "Server response did not contain authorization data\n"
-#~ msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
-#~ msgid "Server response contained incomplete authorization data\n"
-#~ msgstr "Serveri vastus sisaldas puudulikku autoriseerimisinfot\n"
-#~ msgid "Server response does not match\n"
-#~ msgstr "Serveri vastus oli vigane\n"
-#~ msgid "GSSAPI"
-#~ msgstr "GSSAPI"
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 5 authentication."
-#~ msgstr ""
-#~ "See valik loob ühenduse serverisse kasutades Kerberos 5 autentimist."
-#~ msgid "The consistency checks performed on the input_token failed."
-#~ msgstr "Tõrge input_token'i kooskõlalisuse kontrollimisel."
-#~ msgid "The consistency checks performed on the credential failed."
-#~ msgstr "Tõrge volituste kooskõlalisuse kontrollimisel."
-#~ msgid "The referenced credentials have expired."
-#~ msgstr "Osutatud volitused on aegunud."
-#~ msgid "Bad authentication response from server."
-#~ msgstr "Serverilt saadi vigane autentimise vastus."
-#~ msgid "Unsupported security layer."
-#~ msgstr "Toetamata turvakiht."
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kerberose piletit ei saa hankida:\n"
-#~ "%s"
-#~ msgid "Login"
-#~ msgstr "Kasutajanimi"
-#~ msgid "This option will connect to the server using a simple password."
-#~ msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
-#~ msgid "Unknown authentication state."
-#~ msgstr "Teadmata autentimisseisund"
-#~ msgid "NTLM / SPA"
-#~ msgstr "NTLM / SPA"
-#~ msgid ""
-#~ "This option will connect to a Windows-based server using NTLM / Secure "
-#~ "Password Authentication."
-#~ msgstr ""
-#~ "See valik loob ühenduse Windowsil baseeruvasse serverisse kasutades "
-#~ "NTLM / Secure Password Authentication autentimist."
-#~ msgid "POP before SMTP"
-#~ msgstr "POP enne SMTPd"
-#~ msgid "This option will authorise a POP connection before attempting SMTP"
-#~ msgstr "See valik lubab POP ühenduse enne SMTP ühenduse üritamist"
-#~ msgid "POP Source URI"
-#~ msgstr "POP allika URI"
-#~ msgid "Regular expression compilation failed: %s: %s"
-#~ msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
-#~ msgid "URL '%s' needs a username component"
-#~ msgstr "URL '%s' vajab kasutajanime osa"
-#~ msgid "URL '%s' needs a host component"
-#~ msgstr "URL '%s' vajab hosti osa"
-#~ msgid "URL '%s' needs a path component"
-#~ msgstr "URL '%s' vajab kataloogitee osa"
-#~ msgid ""
-#~ "Could not create directory %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ei suuda luua kataloogi %s:\n"
-#~ "%s"
-#~ msgid "Cannot find certificate for '%s'"
-#~ msgstr "Ei leia sertifikaato '%s' jaoks"
-#~ msgid "Cannot create CMS message"
-#~ msgstr "CMS sõnumit ei saa luua"
-#~ msgid "Cannot create CMS signed data"
-#~ msgstr "CMS sõnumi signeeritud andmeid ei saa luua"
-#~ msgid "Cannot attach CMS signed data"
-#~ msgstr "CMS signeeritud andmeid ei saa manustada"
-#~ msgid "Cannot attach CMS data"
-#~ msgstr "CMS andmeid ei saa manustada"
-#~ msgid "Cannot create CMS Signer information"
-#~ msgstr "CMS Signeerija teavet ei saa luua"
-#~ msgid "Cannot find certificate chain"
-#~ msgstr "Sertifikaadiahelat ei leitud"
-#~ msgid "Cannot add CMS Signing time"
-#~ msgstr "CMS Signeerimise aega ei saa lisada"
-#~ msgid "Encryption certificate for '%s' does not exist"
-#~ msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas"
-#~ msgid "Cannot add SMIMEEncKeyPrefs attribute"
-#~ msgstr "Attribuuti SMIMEEncKeyPrefs ei saa lisada"
-#~ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-#~ msgstr "Attribuuti MS SMIMEEncKeyPrefs ei saa lisada"
-#~ msgid "Cannot add encryption certificate"
-#~ msgstr "Krüptimissertifikaati ei saa lisada"
-#~ msgid "Cannot add CMS Signer information"
-#~ msgstr "CMS Signeerija teavet ei saa lisada"
-#~ msgid "Failed to add data to CMS encoder"
-#~ msgstr "Tõrge andmete lisamisel CMS kodeerijasse"
-#~ msgid "Failed to encode data"
-#~ msgstr "Tõrge andmete kodeerimisel"
-#~ msgid "Unverified"
-#~ msgstr "Määramata"
-#~ msgid "Good signature"
-#~ msgstr "Hea allkiri"
-#~ msgid "Bad signature"
-#~ msgstr "Halb allkiri"
-#~ msgid "Signing certificate not found"
-#~ msgstr "Allkirjastamissertifikaati ei leitud"
-#~ msgid "Signing certificate not trusted"
-#~ msgstr "Signeerimissertifikaat ei ole usaldusväärne"
-#~ msgid "Signature algorithm unknown"
-#~ msgstr "Tundmatu signeerimisalgoritm"
-#~ msgid "Signature algorithm unsupported"
-#~ msgstr "Toetamata signeerimisalgoritm"
-#~ msgid "Processing error"
-#~ msgstr "Vea töötlemine"
-#~ msgid "Digests missing from enveloped data"
-#~ msgstr "Andmeümbrikus puudub sõnumilühend"
-#~ msgid "Cannot calculate digests"
-#~ msgstr "Sõnumilühendeid pole võimalik arvutada"
-#~ msgid "Cannot set message digests"
-#~ msgstr "Sõnumilühendit pole võimalik määrata"
-#~ msgid "Certificate import failed"
-#~ msgstr "Tõrge sertifikaadi importimisel"
-#~ msgid "Cannot find signature digests"
-#~ msgstr "Ei leia signatuurilühendit"
-#~ msgid "Signer: %s <%s>: %s\n"
-#~ msgstr "Allkirjastaja: %s <%s>: %s\n"
-#~ msgid "Decoder failed"
-#~ msgstr "Tõrge dekodeerimisel"
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "Ei leia sertifikaati `%s' jaoks"
-#~ msgid "Cannot create CMS Message"
-#~ msgstr "CMS sõnumit ei saa luua"
-#~ msgid "Cannot create CMS Enveloped data"
-#~ msgstr "CMS Ümbriku andmeid ei saa luua"
-#~ msgid "Cannot attach CMS Enveloped data"
-#~ msgstr "CMS Ümbriku andmeid ei saa manustada"
-#~ msgid "Cannot attach CMS data object"
-#~ msgstr "CMS andmeobjekti ei saa manustada"
-#~ msgid "Cannot add CMS Recipient information"
-#~ msgstr "CMS Vastuvõtja teavet ei saa lisada"
-#~ msgid "Failed to add data to encoder"
-#~ msgstr "Tõrge andmete lisamisel enkooderile"
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Tõrge dekodeerimisel, viga %d"
-#~ msgid "S/MIME Decrypt: No encrypted content found"
-#~ msgstr "S/MIME dekrüptimine: Krüptitud sisu ei leitud"
-#~ msgid "import keys: unimplemented"
-#~ msgstr "võtmete importimine: pole veel teostatud"
-#~ msgid "export keys: unimplemented"
-#~ msgstr "võtmete eksportimine: pole veel teostatud"
-#~ msgid "Cannot create folder `%s': folder exists"
-#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
-#~ msgid "Cannot create folder: %s: folder exists"
-#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas"
-#~ msgid "Cannot delete folder: %s: Invalid operation"
-#~ msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
-#~ msgid "Cannot rename folder: %s: Invalid operation"
-#~ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
-#~ msgid "Trash"
-#~ msgstr "Prügikast"
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "Ei saa dekrüptida sertifikaadi signatuuri"
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "Väljaandja avalikku võtit ei saa dekodeerida"
-#~ msgid "Certificate signature failure"
-#~ msgstr "Sertifikaadi signatuuri tõrge"
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "Sertifikaadi tühistusnimekirja (CRL) tõrge"
-#~ msgid "Certificate not yet valid"
-#~ msgstr "Sertifikaat ei ole veel kehtiv"
-#~ msgid "Certificate has expired"
-#~ msgstr "Sertifikaat on aegunud"
-#~ msgid "CRL not yet valid"
-#~ msgstr "CRL ei ole veel kehtiv"
-#~ msgid "CRL has expired"
-#~ msgstr "CRL on aegunud."
-#~ msgid "Error in CRL"
-#~ msgstr "Viga CRL'is"
-#~ msgid "Out of memory"
-#~ msgstr "Mälu puudujääk"
-#~ msgid "Certificate chain too long"
-#~ msgstr "Sertifitseerimisahel on liiga pikk"
-#~ msgid "Certificate Revoked"
-#~ msgstr "Sertifikaat on tühistatud"
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "Vigane sertifitseerimiskeskus"
-#~ msgid "Path length exceeded"
-#~ msgstr "Otsingutee pikkus ületatud"
-#~ msgid "Certificate untrusted"
-#~ msgstr "Sertifikaat ei ole usaldatav"
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "AKID/SKID mittesobivus"
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "Kasutusala ei sisalda sertifikaatide signeerimist"
-#~ msgid "Error in application verification"
-#~ msgstr "Viga rakenduse verifitseerimisel"
-#~ msgid ""
-#~ "Issuer:            %s\n"
-#~ "Subject:           %s\n"
-#~ "Fingerprint:       %s\n"
-#~ "Signature:         %s"
-#~ msgstr ""
-#~ "Väljastaja:            %s\n"
-#~ "Teema:           %s\n"
-#~ "Sõrmejälg:       %s\n"
-#~ "Signatuur:       %s"
-#~ msgid "GOOD"
-#~ msgstr "HEA"
-#~ msgid "BAD"
-#~ msgstr "HALB"
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "Halb sertifikaat %s isikult:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Kas soovid seda siiski vastu võtta?"
-#~ msgid ""
-#~ "SSL Certificate check for %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept?"
-#~ msgstr ""
-#~ "SSL sertifikaadi kontrollimine %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Kas soovida vastu võtta?"
-#~ msgid ""
-#~ "Certificate problem: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Probleem sertifikaadiga: %s\n"
-#~ "Väljastaja: %s"
-#~ msgid ""
-#~ "Certificate expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Sertifikaat on aegunud: %s\n"
-#~ "Väljastaja: %s"
-#~ msgid ""
-#~ "Certificate revocation list expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Sertifikaatide tühistusnimekiri on aegunud: %s\n"
-#~ "Väljaandja: %s"
-#~ msgid "Could not parse URL `%s'"
-#~ msgstr "URL'i `%s' ei saa töödelda"
-#~ msgid "Error storing `%s': %s"
-#~ msgstr "Viga `%s' salvestamisel: %s"
-#~ msgid "No such message %s in %s"
-#~ msgstr "Sõnumit %s ei ole %s seas"
-#~ msgid "Cannot copy or move messages into a Virtual Folder"
-#~ msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
-#~ msgid "Cannot delete folder: %s: No such folder"
-#~ msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
-#~ msgid "Cannot rename folder: %s: No such folder"
-#~ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
-#~ msgid "Cannot copy messages to the Trash folder"
-#~ msgstr "Sõnumeid ei saa kopeerida Prügi kausta"
-#~ msgid "Cannot copy messages to the Junk folder"
-#~ msgstr "Sõnumeid ei saa kopeerida Rämpsu kausta"
-#~ msgid "Checking for new mail"
-#~ msgstr "Kontrollin uusi sõnumeid"
-#~ msgid "Check for new messages in all folders"
-#~ msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
-#~ msgid "Apply filters to new messages in Inbox on this server"
-#~ msgstr ""
-#~ "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
-#~ "sõnumitele "
-#~ msgid "Check new messages for Junk contents"
-#~ msgstr "Kontrolli, kas uued sõnumid on rämpspost"
-#~ msgid "Only check for Junk messages in the INBOX folder"
-#~ msgstr "Rämpssõnumeid kontrollitakse ainult sisendkaustas"
-#~ msgid "Automatically synchronize account locally"
-#~ msgstr "Automaatne konto kohalik sünkroniseerimine"
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Aadressiraamat ja kalender"
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Turvalise ühenduse (SSL) kasutamine"
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell Groupwise"
-#~ msgid "For accessing Novell Groupwise servers"
-#~ msgstr "Novell Groupwise serveri kasutamiseks"
-#~ msgid "Password"
-#~ msgstr "Parool"
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "Tõrge käsu saatmisel IMAP serverisse %s: %s"
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "Ootamatu vastus IMAP serverilt %s: %s"
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "Ootamatu tervitus IMAP serverilt: %s"
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "Ühendus IMAP4 serverisse %s suleti ootamatult: %s"
-#~ msgid "Cannot access folder `%s': %s"
-#~ msgstr "Kaustale `%s' ei pääse ligi: %s"
-#~ msgid "Cannot expunge folder `%s': Unknown"
-#~ msgstr "Kausta `%s' ei saa tühjendada: Tundmatu"
-#~ msgid "Cannot expunge folder `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa tühjendada: Puudulik käsk"
-#~ msgid "User cancelled"
-#~ msgstr "Kasutaja tühistas"
-#~ msgid "Cannot get message %s: %s"
-#~ msgstr "Sõnumit %s ei saadud: %s"
-#~ msgid "This message is not available in offline mode."
-#~ msgstr "See sõnum ei ole autonoomses režiimis kättesaadav."
-#~ msgid "Cannot get message %s from folder `%s': No such message"
-#~ msgstr "Ei saa võtta sõnumit %s kaustast `%s': sellist sõnumit ei ole"
-#~ msgid "Cannot get message %s from folder `%s': Bad command"
-#~ msgstr "Ei saa võtta sõnumit %s kaustast `%s': Vigane käsk"
-#~ msgid "Cannot append messages to IMAP folders in offline mode."
-#~ msgstr "IMAP kausta ei saa autonoomses režiimis sõnumeid lisada."
-#~ msgid "Cannot append message to folder `%s': Unknown error"
-#~ msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
-#~ msgid "Cannot append message to folder `%s': Bad command"
-#~ msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-#~ msgid "Cannot move messages to or from IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid liigutada."
-#~ msgid "Cannot copy messages to or from IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta vahel sõnumeid kopeerida."
-#~ msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
-#~ msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-#~ msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-#~ msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
-#~ msgid "Folders"
-#~ msgstr "Kaustad"
-#~ msgid "Show only subscribed folders"
-#~ msgstr "Näita ainult tellitud kaustu"
-#~ msgid "Override server-supplied folder namespace"
-#~ msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
-#~ msgid "Namespace"
-#~ msgstr "Nimeruum"
-#~ msgid "Apply filters to new messages in INBOX on this server"
-#~ msgstr "Rakenda filtreid kõikidele sisendkausta uutele sõnumitele"
-#~ msgid "Automatically synchronize remote mail locally"
-#~ msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
-#~ msgid "IMAPv4rev1"
-#~ msgstr "IMAPv4rev1"
-#~ msgid "IMAP server %s"
-#~ msgstr "IMAP server %s"
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "Ei saa ühenduda hosti %s: %s"
-#~ msgid "SSL unavailable"
-#~ msgstr "SSL ei ole saadaval"
-#~ msgid "Connection cancelled"
-#~ msgstr "Ühendus katkestatud"
-#~ msgid "Failed to connect to IMAP server %s in secure mode: %s"
-#~ msgstr "Tõrge turvalisel ühendumisel IMAP serveriga %s: %s"
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr "IMAP serverisse %s ei saa autentimistüüpi %s kasutades autentida"
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta luua."
-#~ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-#~ msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
-#~ msgid ""
-#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
-#~ msgstr "Kausta nimi \"%s\" on lubamatu kuna see sisaldab \"%c\" kirjamärki"
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta kustutada."
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
-#~ msgid "Cannot rename folder `%s' to `%s': Special folder"
-#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: kaust on eritähenduslik"
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta ümber nimetada."
-#~ msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Vigane kirjakasti nimi"
-#~ msgid "Cannot rename folder `%s' to `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa ümber nimetada `%s'-ks: Puudulik käsk"
-#~ msgid "Bad command"
-#~ msgstr "Puudulik käsk"
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta tellida."
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "Autonoomses olekus ei saa IMAP kausta tellimisest loobuda."
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr "Kausta `%s' tellimisest ei saa loobuda: Vigane kirjakasti nimi"
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Kaustast `%s' ei saa loobuda: Puudulik käsk"
-#~ msgid "Scanning for changed messages"
-#~ msgstr "Kontrollin muudetud sõnumite olemasolu"
-#~ msgid "Fetching envelopes for new messages"
-#~ msgstr "Uute sõnumite ümbrikute vastuvõtmine"
-#~ msgid "No data"
-#~ msgstr "Andmeid pole"
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "IMAP server %s katkestas ootamatult ühenduse: %s"
-#~ msgid "Operation cancelled"
-#~ msgstr "Operatsioon katekstatud"
-#~ msgid "Server unexpectedly disconnected: %s"
-#~ msgstr "Server katkestas ootamatult: %s"
-#~ msgid ""
-#~ "Alert from IMAP server %s@%s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Häire IMAP serverilt %s@%s:\n"
-#~ "%s"
-#~ msgid "Unexpected response from IMAP server: %s"
-#~ msgstr "Ootamatu vastus IMAP serverilt: %s"
-#~ msgid "IMAP command failed: %s"
-#~ msgstr "IMAPi käsk nurjus: %s"
-#~ msgid "Server response ended too soon."
-#~ msgstr "Serveri vastus lõppes liiga vara."
-#~ msgid "IMAP server response did not contain %s information"
-#~ msgstr "IMAP serveri vastus ei sisalda %s teavet"
-#~ msgid "Unexpected OK response from IMAP server: %s"
-#~ msgstr "Ootamatu OK vastus IMAP serverilt: %s"
-#~ msgid "Could not create directory %s: %s"
-#~ msgstr "Kataloogi %s ei saa luua: %s"
-#~ msgid "Could not load summary for %s"
-#~ msgstr "%s kokkuvõtet ei saa laadida"
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "Kaust hävitati ja taasloodi serveris."
-#~ msgid "Unable to retrieve message: %s"
-#~ msgstr "Sõnumite ei saa vastu võtta: %s"
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Sõnumit %s ei saadud: \n"
-#~ "  %s"
-#~ msgid "No such message"
-#~ msgstr "Sõnumit ei leitud"
-#~ msgid "This message is not currently available"
-#~ 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"
-#~ msgid "Could not find message body in FETCH response."
-#~ msgstr "Ei leia sõnumi sisu FETCH vastuses."
-#~ msgid "Could not open cache directory: %s"
-#~ msgstr "Puhvermälu kausta ei saa avada: %s "
-#~ msgid "Failed to cache message %s: %s"
-#~ msgstr "Tõrge sõnumi %s puhverdamisel: %s"
-#~ msgid "Failed to cache %s: %s"
-#~ msgstr "Tõrge %s puhverdamisel: %s"
-#~ msgid "C_heck for new messages in all folders"
-#~ msgstr "_Kontrolli uusi sõnumeid kõikides kaustades"
-#~ msgid "Connection to Server"
-#~ msgstr "Ühendus serveriga"
-#~ msgid "_Use custom command to connect to server"
-#~ msgstr "_Proxyserveriga ühendumiseks kasutatakse kohandatud käsku"
-#~ msgid "_Show only subscribed folders"
-#~ msgstr "_Näita ainult tellitud kaustu"
-#~ msgid "O_verride server-supplied folder namespace"
-#~ msgstr "Kasuta serveri pakutava kaustade _nimeruumi asemel enda oma"
-#~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr "Rakenda _filtreid kõikidele Sisendkasti uutele sõnumitele"
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "Uute sõnumite _rämpspostikontroll"
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr "Rämpssõnumeid kontrollitakse _ainult sisendkaustas"
-#~ msgid "Automatically synchroni_ze remote mail locally"
-#~ msgstr "Automaatne kohaliku posti _sünkroniseerimine kaugpostiga"
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-#~ msgid "For reading and storing mail on IMAP servers."
-#~ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
-#~ msgid "STARTTLS not supported"
-#~ msgstr "STARTTLS ei ole toetatud."
-#~ msgid "IMAP server %s does not support requested authentication type %s"
-#~ msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
-#~ msgid "No support for authentication type %s"
-#~ msgstr "Autentimistüübi %s tugi puudub"
-#~ msgid "%sPlease enter the IMAP password for %s@%s"
-#~ msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
-#~ msgid "You didn't enter a password."
-#~ msgstr "Sa ei sisestanud parooli."
-#~ msgid ""
-#~ "Unable to authenticate to IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ei saa autentimida IMAP serverisse.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgid "No such folder %s"
-#~ msgstr "Kausta %s ei leitud"
-#~ msgid "Cannot create folder `%s': folder exists."
-#~ msgstr "Kausta `%s' ei saa luua: kaust on juba olemas."
-#~ msgid "Unknown parent folder: %s"
-#~ msgstr "Tundmatu ülemkaust: %s"
-#~ msgid "Message storage"
-#~ msgstr "Sõnumite säilitamine"
-#~ msgid "IMAP+"
-#~ msgstr "IMAP+"
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! 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"
-#~ "\n"
-#~ " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
-#~ msgid "Could not connect to %s (port %s): %s"
-#~ msgstr "Ei saa ühenduda %s (port: %s): %s"
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "Ei saa luua ühendust POP serveriga %s"
-#~ msgid "Index message body data"
-#~ msgstr "Sõnumite sisu indekseerimine"
-#~ msgid "~%s (%s)"
-#~ msgstr "~%s (%s)"
-#~ msgid "mailbox:%s (%s)"
-#~ msgstr "postkast:%s (%s)"
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-#~ msgid "Use the `.folders' folder summary file (exmh)"
-#~ msgstr "Kasuta `.folders' kaustakokkuvõttefaili (exmh)"
-#~ msgid "MH-format mail directories"
-#~ msgstr "MH-vormingus postikataloogid"
-#~ msgid "For storing local mail in MH-like mail directories."
-#~ msgstr "Kohalikku posti hoitakse MH vorminguga kataloogides."
-#~ msgid "Local delivery"
-#~ msgstr "Kohalik postijagaja"
-#~ 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 ja "
-#~ "tõstetakse Evolution'i poolt hallatavatesse kaustadesse."
-#~ msgid "Apply filters to new messages in INBOX"
-#~ msgstr "Rakenda filtreid Sisendkasti uutele sõnumitele"
-#~ msgid "Maildir-format mail directories"
-#~ msgstr "\"Maildir\" vormingus postikataloog"
-#~ msgid "For storing local mail in maildir directories."
-#~ msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
-#~ msgid "Store status headers in Elm/Pine/Mutt format"
-#~ msgstr "Salvesta olekupäised Elm/Pine/Mutt vormingus"
-#~ msgid "Standard Unix mbox spool or directory"
-#~ msgstr "Standardne Unix'i \"mbox\" puhverfail või -kataloog"
-#~ 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 salvestatakse standardsetes välistes \"mbox"
-#~ "\" vorminguga puhverfailides. Võib kasutada ka juhul, kui soovitakse "
-#~ "kasutada programmide Elm, Pine või Mutt postikaustu."
-#~ msgid "Store root %s is not an absolute path"
-#~ msgstr "Hoidla juurikas %s ei ole absoluutne tee"
-#~ msgid "Cannot get folder: %s: %s"
-#~ msgstr "Kausta `%s' ei saadud: %s"
-#~ msgid "Local mail file %s"
-#~ msgstr "Kohaliku posti fail %s"
-#~ msgid "Could not rename folder %s to %s: %s"
-#~ msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
-#~ msgid "Could not rename '%s': %s"
-#~ msgstr "Ei saa ümber nimetada '%s': %s"
-#~ msgid "Could not delete folder summary file `%s': %s"
-#~ msgstr "Kausta kokkuvõttefaili `%s' ei saa kustutada: %s"
-#~ msgid "Could not delete folder index file `%s': %s"
-#~ msgstr "Kausta indeksfaili `%s' ei saa kustutada: %s"
-#~ msgid "Could not delete folder meta file `%s': %s"
-#~ msgstr "Kausta üldistusfaili `%s' ei saa kustutada: %s"
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
-#~ msgid "Unable to add message to summary: unknown reason"
-#~ msgstr "Sõnumite ei saa lisada kokkuvõttesse: tundmatu põhjus"
-#~ msgid "Maildir append message cancelled"
-#~ msgstr "Sõnumi lisamine maildir kausta katkestati"
-#~ msgid "Cannot append message to maildir folder: %s: %s"
-#~ msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
-#~ msgid ""
-#~ "Cannot get message: %s from folder %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Ei saa kätte sõnumit %s kaustast %s\n"
-#~ "  %s"
-#~ msgid "Invalid message contents"
-#~ msgstr "Vigane sõnumi sisu"
-#~ msgid "Cannot get folder `%s': %s"
-#~ msgstr "Kausta `%s' ei saadud: %s"
-#~ msgid "Cannot get folder `%s': folder does not exist."
-#~ msgstr "Kausta `%s' ei saadud: seda ei ole olemas."
-#~ msgid "Cannot create folder `%s': %s"
-#~ msgstr "Kausta `%s' ei saa luua: %s"
-#~ msgid "Cannot get folder `%s': not a maildir directory."
-#~ msgstr "Kausta `%s' ei saadud: see ei ole maildir kataloog."
-#~ msgid "Could not delete folder `%s': %s"
-#~ msgstr "Kausta `%s' ei saa kustutada: %s"
-#~ msgid "not a maildir directory"
-#~ msgstr "ei ole maildir vormingus kataloog"
-#~ msgid "Could not scan folder `%s': %s"
-#~ msgstr "Kausta `%s' ei saa läbi vaadata: %s"
-#~ msgid "Cannot open maildir directory path: %s: %s"
-#~ msgstr "Maildir kataloogi ei saa avada %s: %s"
-#~ msgid "Checking folder consistency"
-#~ msgstr "Kausta kooskõlalisuse kontrollimine"
-#~ msgid "Checking for new messages"
-#~ msgstr "Uute sõnumite kontrollimine"
-#~ msgid "Storing folder"
-#~ msgstr "Kausta salvestamine"
-#~ msgid "Cannot create folder lock on %s: %s"
-#~ msgstr "%s lukustamine nurjus: %s"
-#~ msgid "Cannot open mailbox: %s: %s\n"
-#~ msgstr "Ei saa avada kirjakasti: %s: %s\n"
-#~ msgid "Mail append cancelled"
-#~ msgstr "E-posti lisamine katkestati"
-#~ msgid "Cannot append message to mbox file: %s: %s"
-#~ msgstr "Sõnumit ei saa mbox faili lisada: %s: %s"
-#~ msgid "The folder appears to be irrecoverably corrupted."
-#~ msgstr "Kaust tundub olevad parandamatult rikutud."
-#~ msgid "Message construction failed."
-#~ msgstr "Tõrge sõnumi kokkupanekul."
-#~ msgid "Cannot create a folder by this name."
-#~ msgstr "Sellise nimega kausta ei saa luua."
-#~ msgid "Cannot get folder `%s': not a regular file."
-#~ msgstr "Kausta `%s' ei saadud: see ei ole tavaline fail."
-#~ msgid ""
-#~ "Could not delete folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kataloogi `%s' ei saa kustutada:\n"
-#~ "%s"
-#~ msgid "`%s' is not a regular file."
-#~ msgstr "`%s' ei ole tavaline fail."
-#~ msgid "Folder `%s' is not empty. Not deleted."
-#~ msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
-#~ msgid "Cannot create directory `%s': %s."
-#~ msgstr "Kataloogi %s ei saa luua: %s"
-#~ msgid "Cannot create folder: %s: %s"
-#~ msgstr "Kausta %s ei saa luua: %s"
-#~ msgid "Folder already exists"
-#~ msgstr "Kaust on juba olemas"
-#~ msgid "The new folder name is illegal."
-#~ msgstr "Uus kaustanimi on lubamatu!"
-#~ msgid "Could not rename `%s': `%s': %s"
-#~ msgstr "Ei saa ümber nimetada '%s': `%s': %s"
-#~ msgid "Could not rename '%s' to %s: %s"
-#~ msgstr "Kausta '%s' ei saa ümber nimetada '%s'-ks: %s"
-#~ msgid "Could not open folder: %s: %s"
-#~ msgstr "Kausta ei saa avada: %s: %s"
-#~ msgid "Fatal mail parser error near position %ld in folder %s"
-#~ msgstr "Pöördumatu postianalüüsija viga positsioonil %ld kaustad %s"
-#~ msgid "Cannot check folder: %s: %s"
-#~ msgstr "Kausta ei saa kontrollida: %s: %s"
-#~ msgid "Could not open file: %s: %s"
-#~ msgstr "Faili %s ei saa avada: %s"
-#~ msgid "Cannot open temporary mailbox: %s"
-#~ msgstr "Ajutist kirjakasti ei saa avada: %s"
-#~ msgid "Could not close source folder %s: %s"
-#~ msgstr "Lähtekausta ei saa sulgeda %s: %s"
-#~ msgid "Could not close temp folder: %s"
-#~ msgstr "Ajutist kausta ei saa sulgeda: %s"
-#~ msgid "Could not rename folder: %s"
-#~ msgstr "Kataloogi ei saa ümber nimetada: %s"
-#~ msgid "Summary and folder mismatch, even after a sync"
-#~ msgstr "Kokkuvõtte ja kausta ebavõrdlus, isegi peale sünkroniseerimist"
-#~ msgid "Unknown error: %s"
-#~ msgstr "Tundmatu viga: %s"
-#~ msgid "Could not store folder: %s"
-#~ msgstr "Kausta ei saa salvestada: %s"
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
-#~ msgid "Writing to tmp mailbox failed: %s: %s"
-#~ msgstr "Tõrge ajutisse kirjakasti kirjutamisel: %s: %s"
-#~ msgid "MH append message cancelled"
-#~ msgstr "MH sõnumi lisamine katkestatud"
-#~ msgid "Cannot append message to mh folder: %s: %s"
-#~ msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
-#~ msgid "Could not create folder `%s': %s"
-#~ msgstr "Kataloogi `%s' ei saa luua: %s"
-#~ msgid "Cannot get folder `%s': not a directory."
-#~ msgstr "Kausta `%s' ei saa lugeda: see ei ole kataloog."
-#~ msgid "Cannot open MH directory path: %s: %s"
-#~ msgstr "Ei saa avada MH kataloogi: %s: %s"
-#~ msgid "Spool `%s' cannot be opened: %s"
-#~ msgstr "Puhvrit `%s' ei saa avada: %s"
-#~ msgid "Spool `%s' is not a regular file or directory"
-#~ msgstr "Puhver '%s' pole tavaline fail ega kataloog"
-#~ msgid "Folder `%s/%s' does not exist."
-#~ msgstr "Kausta `%s/%s' ei ole olemas."
-#~ msgid ""
-#~ "Could not open folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kausta `%s' ei saa avada:\n"
-#~ "%s"
-#~ msgid "Folder `%s' does not exist."
-#~ msgstr "Kataloogi '%s' pole olema."
-#~ msgid ""
-#~ "Could not create folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kausta `%s' ei saa luua:\n"
-#~ "%s"
-#~ msgid "`%s' is not a mailbox file."
-#~ msgstr "`%s' ei ole kirjakasti fail."
-#~ msgid "Spool mail file %s"
-#~ msgstr "E-posti puhverfail %s"
-#~ msgid "Spool folders cannot be renamed"
-#~ msgstr "Puhverkaustu ei saa ümber nimetada"
-#~ msgid "Spool folders cannot be deleted"
-#~ msgstr "Puhverkaustu ei saa kustutada"
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Palun sisesta NNTP parool %s@%s jaoks"
-#~ msgid "Server rejected username"
-#~ msgstr "Server keeldus kasutajanime vastu võtmast"
-#~ msgid "Failed to send username to server"
-#~ msgstr "Tõrge kasutajanime saatmisel serverile"
-#~ msgid "Server rejected username/password"
-#~ msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
-#~ msgid "Internal error: uid in invalid format: %s"
-#~ msgstr "Sisemine viga: uid on vigases vormingus: %s"
-#~ msgid "Posting failed: %s"
-#~ msgstr "Postitamine nurjus: %s"
-#~ msgid "You cannot copy messages from a NNTP folder!"
-#~ msgstr "Sõnumeid ei saa NNTP kaustast kopeerida!"
-#~ msgid "Could not get group list from server."
-#~ msgstr "Gruppide nimekirja serverist ei saadud."
-#~ msgid ""
-#~ "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-#~ msgstr "Kaustanimede näitamine lühendatult (comp.os.linux asemel c.o.linux)"
-#~ msgid "In the subscription dialog, show relative folder names"
-#~ msgstr "Kaustade tellimisdialoogis näita kaustade suhtnimesid"
-#~ msgid "USENET news"
-#~ msgstr "USENETi uudised"
-#~ msgid "This is a provider for reading from and posting toUSENET newsgroups."
-#~ msgstr ""
-#~ "Selle kaudu on võimalik lugeda ja kirjutada USENET'i uudistegruppidesse."
-#~ msgid "NNTP server %s returned error code %d: %s"
-#~ msgstr "NNTP server %s tagastas veakoodi %d: %s"
-#~ msgid "USENET News via %s"
-#~ msgstr "USENETi uudised üle %s"
-#~ msgid ""
-#~ "Error retrieving newsgroups:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Viga uudistegrupi vastuvõtmisel:\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "Authentication requested but no username provided"
-#~ msgstr "Nõutakse autentimist kuid kasutajanime ei ole sisestatud"
-#~ msgid "Cannot authenticate to server: %s"
-#~ msgstr "Ei saa autentida serverisse: %s"
-#~ msgid "NNTP Command failed: %s"
-#~ msgstr "Tõrge NNTP käsu täitmisel: %s"
-#~ msgid "Not connected."
-#~ msgstr "Ühendamata."
-#~ msgid "No such folder: %s"
-#~ msgstr "Kausta ei leitud: %s"
-#~ msgid "%s: Scanning new messages"
-#~ msgstr "%s: uute kirjade skannimine"
-#~ msgid "Operation failed: %s"
-#~ msgstr "Tõrge toimingu läbiviimisel: %s"
-#~ msgid "Retrieving POP summary"
-#~ msgstr "Võtan vastu POP kokkuvõtet"
-#~ msgid "Cannot get POP summary: %s"
-#~ msgstr "Ei saa võtta POP kokkuvõtet: %s"
-#~ msgid "Expunging deleted messages"
-#~ msgstr "Hävitan kustutatud sõnumid"
-#~ msgid "No message with uid %s"
-#~ msgstr "Sõnumit uid'iga %s ei ole"
-#~ msgid "Retrieving POP message %d"
-#~ msgstr "POP sõnumi %d vastuvõtt"
-#~ msgid "Delete after %s day(s)"
-#~ msgstr "Kustuta %s päeva möödumisel"
-#~ msgid "Disable support for all POP3 extensions"
-#~ msgstr "Keela kõigi POP3 laienduste toetus"
-#~ msgid "POP"
-#~ msgstr "POP"
-#~ msgid "For connecting to and downloading mail from POP servers."
-#~ msgstr "E-posti laetakse alla POP serverist"
-#~ 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 "Failed to read a valid greeting from POP server %s"
-#~ msgstr "POP serverilt %s ei saa korrektset tervitust"
-#~ msgid "Failed to connect to POP server %s in secure mode: %s"
-#~ msgstr "Tõrge turvalisel ühendumisel POP serverisse %s: %s"
-#~ msgid "STLS not supported"
-#~ msgstr "STLS ei ole toetatud."
-#~ msgid "Could not connect to POP server %s"
-#~ msgstr "Ei saa luua ühendust POP serveriga %s"
-#~ msgid "SASL `%s' Login failed for POP server %s: %s"
-#~ msgstr "Tõrge SASL `%s' sisselogimisel POP serverisse %s: %s"
-#~ msgid "Cannot login to POP server %s: SASL Protocol error"
-#~ msgstr "POP serverisse %s ei saa sisse logida: SASL protokolli viga"
-#~ msgid "Failed to authenticate on POP server %s: %s"
-#~ msgstr "Tõrge autentimisel POP serverisse %s: %s"
-#~ msgid "%sPlease enter the POP password for %s on host %s"
-#~ msgstr "%sPalun sisesta kasutaja %s POP parool hostile %s"
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending password: %s"
-#~ msgstr ""
-#~ "Ei saa luua ühendust POP serveriga %s.\n"
-#~ "Viga parooli saatmisel: %s"
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "Ei saa luua ühendust POP serveriga %s.\n"
-#~ "Viga kasutajanime saatmisel: %s"
-#~ msgid "No such folder `%s'."
-#~ msgstr "Kausta '%s' ei ole olemas."
-#~ msgid "Sendmail"
-#~ msgstr "Sendmail"
-#~ 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."
-#~ msgid "Could not parse recipient list"
-#~ msgstr "Saajate nimekirja ei õnnestu analüüsida"
-#~ msgid "Could not create pipe to sendmail: %s: mail not sent"
-#~ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
-#~ msgid "Could not fork sendmail: %s: mail not sent"
-#~ msgstr ""
-#~ "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
-#~ msgid "Could not send message: %s"
-#~ msgstr "Sõnumit ei saa saata: %s"
-#~ msgid "sendmail exited with signal %s: mail not sent."
-#~ msgstr "sendmail lõpetas töö signaaliga %s: sõnumit ei saadetud."
-#~ msgid "Could not execute %s: mail not sent."
-#~ msgstr "Ei saa käivitada %s: sõnumit ei saadetud."
-#~ msgid "sendmail exited with status %d: mail not sent."
-#~ msgstr "sendmail lõpetas töö staatusega %d: sõnumit ei saadetud."
-#~ msgid "sendmail"
-#~ msgstr "sendmail"
-#~ msgid "Mail delivery via the sendmail program"
-#~ msgstr "Sõnumite trantsport sendmail programmiga"
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-#~ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-#~ msgstr ""
-#~ "E-posti saatmiseks SMTP protokolli kaudu välisele mailhub serverile."
-#~ msgid "Syntax error, command unrecognized"
-#~ msgstr "Viga süntaksis, tundmatu käsk"
-#~ msgid "Syntax error in parameters or arguments"
-#~ msgstr "Süntaksi viga parameetrites või argumentides"
-#~ msgid "Command not implemented"
-#~ msgstr "Käsku ei ole veel teostatud"
-#~ msgid "Command parameter not implemented"
-#~ msgstr "Käsu parameeter ei ole veel teostatud"
-#~ msgid "Help message"
-#~ msgstr "Abiteade"
-#~ msgid "Service ready"
-#~ msgstr "Teenus on valmis"
-#~ msgid "Service closing transmission channel"
-#~ msgstr "Teenus sulgeb ülekandekanali"
-#~ msgid "Service not available, closing transmission channel"
-#~ msgstr "Teenus ei ole saadaval, sulgen ülekandekanali"
-#~ msgid "Requested mail action okay, completed"
-#~ msgstr "Nõutud kirjategevus korras, lõpetatud"
-#~ msgid "Requested mail action not taken: mailbox unavailable"
-#~ msgstr "Nõutud kirjategevust ei tehtud: kirjakast ei ole saadaval"
-#~ msgid "Requested action not taken: mailbox unavailable"
-#~ msgstr "Nõutud tegevust ei tehtud: kirjakast ei ole saadaval"
-#~ msgid "Requested action aborted: error in processing"
-#~ msgstr "Nõutud tegevus nurjatud: viga töötlemisel"
-#~ msgid "Requested action not taken: mailbox name not allowed"
-#~ msgstr "Nõutud toimingut ei teostatud: kirjakasti nimi ei ole lubatud"
-#~ msgid "Transaction failed"
-#~ msgstr "Tõrge transaktsiooni läbiviimisel"
-#~ msgid "Authentication mechanism is too weak"
-#~ msgstr "Autentimismehhanism on liiga nõrk"
-#~ msgid "Temporary authentication failure"
-#~ msgstr "Ajutine autentimise tõrge"
-#~ msgid "Authentication required"
-#~ msgstr "Autentimine on vajalik"
-#~ msgid "Welcome response error"
-#~ msgstr "Tervitusvastuse viga"
-#~ msgid "Failed to connect to SMTP server %s in secure mode: %s"
-#~ msgstr "Tõrge turvalisel ühendumisel SMTP serverisse %s: %s"
-#~ msgid "STARTTLS command failed: %s"
-#~ msgstr "Tõrge STARTTLS käsu täitmisel: %s"
-#~ msgid "STARTTLS command failed"
-#~ msgstr "Tõrge STARTTLS käsu täitmisel"
-#~ msgid "SMTP server %s does not support requested authentication type %s."
-#~ msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s."
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sPalun sisesta kasutaja %s SMTP parool hostile %s"
-#~ msgid ""
-#~ "Unable to authenticate to SMTP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Autentimine SMPT serverisse nurjus.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgid "SMTP server %s"
-#~ msgstr "SMTP server %s"
-#~ msgid "SMTP mail delivery via %s"
-#~ msgstr "SMTP posti saatmine %s kaudu"
-#~ msgid "Cannot send message: service not connected."
-#~ msgstr "Sõnumit ei saa saata: teenusega ei saa ühendust"
-#~ msgid "Cannot send message: sender address not valid."
-#~ msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
-#~ msgid "Sending message"
-#~ msgstr "Sõnumi saatmine"
-#~ msgid "Cannot send message: no recipients defined."
-#~ msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
-#~ msgid "Cannot send message: one or more invalid recipients"
-#~ msgstr "Sõnumit ei saa saata: saajate aadress või aadressid on vigased."
-#~ msgid "SMTP Greeting"
-#~ msgstr "SMTP Tervitus"
-#~ msgid "HELO command failed: %s"
-#~ msgstr "Tõrge HELO käsu täitmisel: %s"
-#~ msgid "HELO command failed"
-#~ msgstr "Tõrge HELO käsu täitmisel"
-#~ msgid "SMTP Authentication"
-#~ msgstr "SMTP autentimine"
-#~ msgid "Error creating SASL authentication object."
-#~ msgstr "Viga SASL autentimisobjekti loomise."
-#~ msgid "AUTH command failed: %s"
-#~ msgstr "Tõrge AUTH käsu täitmisel: %s"
-#~ msgid "AUTH command failed"
-#~ msgstr "Tõrge AUTH käsu täitmisel"
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "Halb autentimisvastus serverilt.\n"
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "Tõrge MAIL FROM käsu täitmisel: %s: sõnum jäi saatmata"
-#~ msgid "MAIL FROM command failed"
-#~ msgstr "Tõrge MAIL FROM käsu täitmisel"
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "Tõrge RCPT TO käsu täitmisel: %s: sõnum jäi saatmata"
-#~ msgid "RCPT TO <%s> failed"
-#~ msgstr "Tõrge RCPT TO <%s> käsu täitmisel"
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "Tõrge DATA käsu täitmisel: %s: sõnum jäi saatmata"
-#~ msgid "DATA command failed"
-#~ msgstr "Tõrge DATA käsu täitmisel"
-#~ msgid "RSET command failed: %s"
-#~ msgstr "Tõrge RSET käsu täitmisel: %s"
-#~ msgid "RSET command failed"
-#~ msgstr "Tõrge RSET käsu täitmisel"
-#~ msgid "QUIT command failed: %s"
-#~ msgstr "Tõrge QUIT käsu täitmisel: %s"
-#~ msgid "QUIT command failed"
-#~ msgstr "Tõrge QUIT käsu täitmisel"
-#~ msgid "VFolders"
-#~ msgstr "VKaustad"
-#~ msgid "Virtual _Folders"
-#~ msgstr "Virtuaalsed _kaustad"
-#~ 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 ""
-#~ "E-posti konto seadistamine on peaaegu lõppenud. Sinu poolt määratud "
-#~ "identiteet, siseneva ja väljuva posti serverid koondatakse ühe nime alla "
-#~ "ja sellest saab Evolution'i postikonto. Palun anna sellele kontole nimi. "
-#~ "Nime kasutatakse hiljem ainult kuvamise eesmärgil."
-#~ msgid "_Enable"
-#~ msgstr "_Lubamine"
-#~ msgid "Body does not contain"
-#~ msgstr "Sisu ei sisalda"
-#~ msgid "Body or subject contains"
-#~ msgstr "Sisu või teema sisaldab"
-#~ msgid "Subject does not contain"
-#~ msgstr "Teema ei sisalda"
-#~ msgid "Meetings"
-#~ msgstr "Koosolekud"
-#~ msgid "Contact list _owner"
-#~ msgstr "Võta postilendi _omanikuga ühendust"
-#~ msgid "Get list _archive"
-#~ msgstr "Hangi postilendi _arhiiv"
-#~ msgid "Get list _usage information"
-#~ msgstr "_Hangi postilendi kasutusteave"
-#~ msgid "Mailing _List"
-#~ msgstr "_Postiloend"
-#~ msgid "_Post message to list"
-#~ msgstr "_Sõnumi saatmine loendisse"
-#~ msgid "_Subscribe to list"
-#~ msgstr "_Telli postiloend"
-#~ msgid "_Un-subscribe to list"
-#~ msgstr "_Lõpeta postiloendi tellimus"
-#~ msgid "Ad_d"
-#~ msgstr "_Lisa"
-#~ msgid "Delet_e"
-#~ msgstr "_Kustuta"
-#~ msgid "Edi_t"
-#~ msgstr "_Redigeermine"
-#~ msgid "Button style"
-#~ msgstr "Nuppude stiil"
-#~ msgid "Create _Virtual Folder From Message"
-#~ msgstr "Loo sõnumi baasil _Virtuaalne Kaust"
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
+msgid "Save Appointment"
+msgstr "Salvesta sündmus"
+
+msgid "Appointment Title"
+msgstr "Sündmuse pealkiri"
+
+msgid "end-time"
+msgstr "lõppaeg"
+
+msgid "location"
+msgstr "asukoht"
+
+msgid "start-time"
+msgstr "algusaeg"
+
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba kuvamine (tõsta manused siia)"
+
+msgid "N"
+msgstr "Põ"
+
+msgid "S"
+msgstr "Lõ"
+
+msgid "W"
+msgstr "Lä"
+
+msgid "<b>If</b>"
+msgstr "<b>Kui</b>"
+
+msgid "Create New Folder"
+msgstr "Uue kausta loomine"
+
+#, fuzzy
+msgid "Copying `%s' to `%s'"
+msgstr "Sõnumite kopeerimine %s kausta"
+
+msgid "Rename the \"%s\" folder to:"
+msgstr "Nimeta kaust \"%s\" uue nimega:"
+
+msgid "Rename Folder"
+msgstr "Kataloogi ümbernimetamine"
+
+msgid "Folder names cannot contain '/'"
+msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
+
+msgid "_Print"
+msgstr "_Trüki"
+
+msgid "spamd port"
+msgstr "spamd port"
+
+msgid "_Load images if sender is in address book"
+msgstr "_Piltide laadimine, kui saatja on aadressiraamatus"
+
+msgid "{1}."
+msgstr "{1}."
+
+msgid "Mark  as default folder"
+msgstr "Märkida vaikimisi kaustaks"
+
+msgid "Manage Plugins..."
+msgstr "Halda pluginaid..."
+
+msgid "Invalid user"
+msgstr "Vigane kasutaja"
+
+msgid "Specify User"
+msgstr "Määra kasutaja"
+
+msgid "Closing connections..."
+msgstr "Sulgen ühendused..."
+
+msgid "Starting import"
+msgstr "Importimise alustamine"
+
+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"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
+"Kui sa praegu Evolution'i seadistusabilise sulged, lähevad kõik sisestatud "
+"andmed kaotsi. Sel juhul pead sa Evolution'i järgmisel käivitamisel uuesti "
+"ka seadistusabilise käivitama.\n"
+"\n"
+"Kas sa soovid seadistusabilist sulgeda?"
+
+msgid "Importing Files"
+msgstr "Impordi failid"
+
+msgid "Timezone "
+msgstr "Ajavöönd"
+
+msgid "Disable the mono plugin environment."
+msgstr "Mono pluginate keskkonna keelamine."
+
+msgid "Cannot start Evolution"
+msgstr "Ei saa käivitada Evolution'i"
+
+msgid "Post Ne_w Message"
+msgstr "_Uue sõnumi postitamine"
+
+msgid "S_ubscribe to Folders..."
+msgstr "_Kaustade tellimine..."
+
+msgid "_Filters..."
+msgstr "_Filtrid..."
+
+msgid "vFolder _Editor..."
+msgstr "vKausta _redaktor..."
+
+msgid "Hide _Read Messages"
+msgstr "Peida _loetud sõnumid"
+
+msgid "Mark All as _Read"
+msgstr "Märgi kõik _loetuks"
+
+msgid "Sh_ow Hidden Messages"
+msgstr "_Näita peidetud sõnumeid"
+
+msgid "_Folder"
+msgstr "_Kaust"
+
+msgid "_Threaded Message List"
+msgstr "_Esita sõnumeid jutulõngadena"
+
+msgid "Create _vFolder From Message"
+msgstr "Loo _vKaust selle sõnumi alusel"
+
+msgid "F_orward As..."
+msgstr "E_dasta kohandatud vormingus..."
+
+msgid "Filter _Junk"
+msgstr "_Rämpsu filtreerimine"
+
+msgid "Mark as I_mportant"
+msgstr "Märgi _tähtsaks"
+
+msgid "Mark as Unimp_ortant"
+msgstr "Märgi vähetä_htsaks"
+
+msgid "Original Si_ze"
+msgstr "_Algne suurus"
+
+msgid "S_earch in Message..."
+msgstr "_Otsi sõnumist..."
+
+msgid "S_maller"
+msgstr "_Väiksem"
+
+msgid "Show Email _Source"
+msgstr "_Näita e-post lähtekoodi"
+
+msgid "Show Full _Headers"
+msgstr "Näita kõiki _päiseid"
+
+msgid "Text Si_ze"
+msgstr "Teksti _suurus"
+
+msgid "_Attached"
+msgstr "_Manustatud"
+
+msgid "_Create Filter From Message"
+msgstr "_Loo sõnumi baasil filter"
+
+msgid "_Inline"
+msgstr "Samal _joonel"
+
+msgid "_Larger"
+msgstr "_Suurem"
+
+msgid "_Message Display"
+msgstr "_Sõnumi kuvamine"
+
+msgid "_Open Message"
+msgstr "_Ava sõnum"
+
+msgid "_Undelete"
+msgstr "_Taasta"
+
+msgid "Show / hide attachments"
+msgstr "Näita / peida manused"
+
+msgid "Show _attachments"
+msgstr "Manuste _näitamine"
+
+msgid "Show attachments"
+msgstr "Manuste näitamine"
+
+msgid "E_xit"
+msgstr "_Välju"
+
+msgid "Pi_lot Settings..."
+msgstr "P_ilot'i sätted..."
+
+msgid "Window B_uttons"
+msgstr "Akna _nupud"
+
+msgid "_Window"
+msgstr "_Aken"
+
+msgid "_Advanced..."
+msgstr "_Täpsemalt..."
+
+msgid "_Remember this password"
+msgstr "_Jäta see parool meelde"
+
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Jäta see parool meelde kuni selle sessiooni lõpuni"
+
+msgid "Add Sender to Address_book"
+msgstr "Lisa saatja _aadressiraamatusse"
+
+msgid "Appl_y Filters"
+msgstr "Rakenda _filtrid"
+
+msgid "F_ilter Junk"
+msgstr "_Rämpsu filtreerimine"
+
+msgid "have "
+msgstr "omab"
+
+msgid "has "
+msgstr "omab"
+
+msgid " cards"
+msgstr " kaarti"
+
+msgid " card"
+msgstr " kaart"
+
+msgid "alarm "
+msgstr "alarm "
+
+msgid "time-zone "
+msgstr "ajavöönd"
+
+msgid "meeting "
+msgstr "koosolek"
+
+msgid ", %d events"
+msgstr ", %d sündmust"
+
+msgid "work week view :"
+msgstr "töönädala vaade :"
+
+msgid "day view :"
+msgstr "päeva vaade :"
+
+msgid "month view :"
+msgstr "kuu vaade :"
+
+msgid "week view :"
+msgstr "nädala vaade :"
+
+msgid ")"
+msgstr ")"
+
+msgid "Position of the vertical pane in main view."
+msgstr "Vertikaalpaani asukoht põhivaates."
+
+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 "Address:"
+msgstr "Aadress:"
+
+msgid "Calendar:"
+msgstr "Kalender:"
+
+msgid "PO Box:"
+msgstr "Sidejaoskonna postkast:"
+
+msgid "State/Province:"
+msgstr "Maakond/Provints:"
+
+msgid "Title:"
+msgstr "Tiitel:"
+
+msgid "This contact belongs to these categories:"
+msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
+
+msgid "Edit Contact Info"
+msgstr "Muuda kontakti andmeid"
+
+msgid "Add to Contacts"
+msgstr "Lisa kontaktide hulka"
+
+msgid "Days that are work days"
+msgstr "Päevad, mis on tööpäevad"
+
+msgid "Default timezone for meetings"
+msgstr "Vaikimisi ajavöönd koosolekute jaoks"
+
+msgid "Position of the horizontal pane in the month view"
+msgstr "Horisontaalpaani asukoht kuuvaates"
+
+msgid "Position of the vertical pane"
+msgstr "Vertikaalpaani asukoht"
+
+msgid "Show where events end in week and month views"
+msgstr "Näita sündmuste lõpuaegu nädala ja kuu vaadetel"
+
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Kas küsida nõusolekut kausta puhastamisel"
+
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Põhiline</span>"
+
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Kuupäev ja aeg</span>"
+
+msgid "Free/Busy Editor"
+msgstr "Vaba/Hõivatud teabe redaktor"
+
+msgid "Print Setup"
+msgstr "Trükkimise seaded"
+
+msgid "Signing is not supported by this cipher"
+msgstr "See šiffer ei toeta allkirjastamist"
+
+msgid "Signing message"
+msgstr "Sõnumi signeerimine"
+
+msgid "Verifying is not supported by this cipher"
+msgstr "See šiffer ei toeta kontrolli"
+
+msgid "Verifying message"
+msgstr "Sõnumi verifitseerimine"
+
+msgid "Encryption is not supported by this cipher"
+msgstr "See šiffer ei toeta krüptimist"
+
+msgid "Encrypting message"
+msgstr "Sõnumi krüptimine"
+
+msgid "Decryption is not supported by this cipher"
+msgstr "See šiffer ei toeta dekrüptimist"
+
+msgid "Decrypting message"
+msgstr "Sõnumi dekrüptimine"
+
+msgid "You may not import keys with this cipher"
+msgstr "Sa ei tohi importida selle šifriga võtmeid"
+
+msgid "You may not export keys with this cipher"
+msgstr "Sa ei tohi eksportida selle šifriga võtmeid"
+
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+"Ei olnud võimalik kirjutada logisse kirjet: %s\n"
+"Tulevased operatsioonid selles serveris jäävad tegemata kui sa\n"
+"taastad ühenduse võrguga."
+
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"Ei ole võimalik avada `%s':\n"
+"%s\n"
+"Sellesse kausta tehtud muudatused jäävad sünkroniseerimata."
+
+msgid "Resynchronizing with server"
+msgstr "Taassünkroniseeritakse serveriga"
+
+msgid "You must be working online to complete this operation"
+msgstr "Selle operatsiooni täitmiseks pead olema võrku ühendatud"
+
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Tõrge toru loomisel -> '%s': %s"
+
+msgid "Failed to create child process '%s': %s"
+msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
+
+msgid "Invalid message stream received from %s: %s"
+msgstr "Vastu võetud vigane sõnum %s'lt: %s"
+
+msgid "Syncing folders"
+msgstr "Kaustade sünkroniseerimine"
+
+msgid "Error parsing filter: %s: %s"
+msgstr "Viga filtri analüüsil: %s: %s"
+
+msgid "Error executing filter: %s: %s"
+msgstr "Viga filtri täitmisel: %s: %s"
+
+msgid "Unable to open spool folder"
+msgstr "Puhverkausta pole võimalik avada"
+
+msgid "Unable to process spool folder"
+msgstr "Puhverkausta pole võimalik töödelda"
+
+msgid "Getting message %d (%d%%)"
+msgstr "Võetakse vastu teadet %d (%d%%)"
+
+msgid "Cannot open message"
+msgstr "Sõnumit pole võimalik avada"
+
+msgid "Failed on message %d"
+msgstr "Tõrge sõnumi %d juures"
+
+msgid "Syncing folder"
+msgstr "Kausta sünkroniseerimine"
+
+msgid "Getting message %d of %d"
+msgstr "Tõmban %d. sõnumit %dst"
+
+msgid "Failed at message %d of %d"
+msgstr "Tõrge sõnumi %d juures (kokku sõnumeid: %d)"
+
+msgid "Failed to retrieve message"
+msgstr "Tõrge sõnumi vastuvõtmisel"
+
+msgid "Failed to create create child process '%s': %s"
+msgstr "Tõrge alamprotsessi '%s' loomisel: %s"
+
+msgid "Error executing filter search: %s: %s"
+msgstr "Viga filterotsingu täitmisel: %s: %s"
+
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toetamata operatsioon: lisa sõnum: %s"
+
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
+
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toetamata operatsioon: otsing UID järgi: %s"
+
+msgid "Moving messages"
+msgstr "Sõnumite liigutamine"
+
+msgid "Copying messages"
+msgstr "Sõnumite kopeerimine"
+
+msgid "Learning junk"
+msgstr "Rämpsposti tundmaõppimine"
+
+msgid "Learning non-junk"
+msgstr "Mitte-rämpsposti tundmaõppimine"
+
+msgid "Filtering new message(s)"
+msgstr "Uute sõnumite filtreerimine"
+
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Otsinguavaldist ei ole võimalik analüüsida: %s\n"
+"%s"
+
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Viga otsinguavaldise täitmisel: %s:\n"
+"%s"
+
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
+
+msgid "Performing query on unknown header: %s"
+msgstr "Täidetakse päringut tundmatul päisel: %s"
+
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+"Ootamatu GnuPG olekusõnum:\n"
+"\n"
+"%s"
+
+msgid "Failed to parse gpg userid hint."
+msgstr "Tõrge gpg kasutaja ID vihje analüüsimisel."
+
+msgid "Failed to parse gpg passphrase request."
+msgstr "Tõrge gpg paroolipäringu analüüsimisel."
+
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr "Sul on kasutaja \"%s\" võtme lahtilukustamiseks vaja parooli"
+
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr "Tõrge salajase võtme avamisel: sisestati 3 valet parooli."
+
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Ootamatu vastus GnuPG'lt: %s"
+
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Tõrge sõnumi krüptimisel: Saajate aadressid on määramata."
+
+msgid ""
+"Failed to GPG %s: %s\n"
+"\n"
+"%s"
+msgstr ""
+"Tõrge GPG töötlemisel %s: %s\n"
+"\n"
+"%s"
+
+msgid "Failed to GPG %s: %s\n"
+msgstr "Tõrge %s GPG töötlemisel: %s\n"
+
+msgid "Could not generate signing data: %s"
+msgstr "Signeerimisandmete genereerimine ei õnnestunud: %s"
+
+msgid "Failed to execute gpg: %s"
+msgstr "gpg käivitamine nurjus: %s"
+
+msgid "Failed to execute gpg."
+msgstr "Tõrge gpg käivitamisel."
+
+msgid "This is a digitally signed message part"
+msgstr "See on sõnumi digitaalselt allkirjastatud osa"
+
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ei saa kontrollida sõnumi signatuuri: Sõnum on vigaselt vormindatud"
+
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Ei saa kontrollida sõnumi signatuuri: ajutise faili loomine nurjus: %s"
+
+msgid "This is a digitally encrypted message part"
+msgstr "See on sõnumi digitaalselt krüptitud osa"
+
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "Tõrge MIME osa dekrüptimisel: protokolli viga"
+
+msgid "Encrypted content"
+msgstr "Krüpteeritud sisu"
+
+msgid "Could not create lock file for %s: %s"
+msgstr "Ei suuda luua lukufaili %s jaoks: %s"
+
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
+
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Tõrge fcntl(2) abil lukustamisel: %s"
+
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Tõrge flock(2) abil lukustamisel: %s"
+
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ei suuda luua lukustamisabilise toru: %s"
+
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ei lukustamine ei õnnestunud, protokolli viga lukustamisabilises"
+
+msgid "Could not lock '%s'"
+msgstr "Ei saa lukustada '%s'"
+
+msgid "Could not open mail file %s: %s"
+msgstr "Sõnumifaili %s pole võimalik avada: %s"
+
+msgid "Could not open temporary mail file %s: %s"
+msgstr "Ei saa avada ajutist sõnumifaili %s: %s"
+
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Tõrge sõnumi salvestamisel ajutisse faili %s: %s"
+
+msgid "Could not create pipe: %s"
+msgstr "Soklit pole võimalik luua: %s"
+
+msgid "Could not fork: %s"
+msgstr "Ei saa forkida: %s"
+
+msgid "Movemail program failed: %s"
+msgstr "Tõrge Movemail programmis: %s"
+
+msgid "(Unknown error)"
+msgstr "(tundmatu viga)"
+
+msgid "Error reading mail file: %s"
+msgstr "Viga sõnumifaili lugemisel: %s"
+
+msgid "Error writing mail temp file: %s"
+msgstr "Viga ajutise sõnumifaili kirjutamisel: %s"
+
+msgid "Error copying mail temp file: %s"
+msgstr "Viga ajutise sõnumifaili kopeerimisel: %s"
+
+msgid "parse error"
+msgstr "analüüsimisviga"
+
+msgid "cannot create thread"
+msgstr "lõime pole võimalik luua"
+
+msgid "Resolving: %s"
+msgstr "Lahendan: %s"
+
+msgid "Host lookup failed"
+msgstr "Hostinime lahendamine nurjus"
+
+msgid "Host lookup failed: %s: %s"
+msgstr "Hostinime lahendamine nurjus: %s: %s"
+
+msgid "Resolving address"
+msgstr "Aadressi lahendamine"
+
+msgid "Name lookup failed"
+msgstr "Tõrge nime lahendamisel"
+
+msgid "Name lookup failed: %s"
+msgstr "Tõrge nime lahendamisel: %s"
+
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Ei saa laadida %s: süsteem ei toeta moodulite laadimist."
+
+msgid "Could not load %s: %s"
+msgstr "Ei saa laadida '%s': %s"
+
+msgid "Could not load %s: No initialization code in module."
+msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
+
+msgid "Anonymous"
+msgstr "Anonüümne"
+
+msgid "This option will connect to the server using an anonymous login."
+msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
+
+msgid "Authentication failed."
+msgstr "Autentimine nurjus."
+
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"Ebakorrektne e-posti aadressi jälitusinfo:\n"
+"%s"
+
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Vigane jälitusinfo:\n"
+"%s"
+
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+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 "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+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 "Server challenge too long (>2048 octets)\n"
+msgstr "Serveri kutsung liiga pikk (>2048 oktetti)\n"
+
+msgid "Server challenge invalid\n"
+msgstr "Vigane serveri kutsung\n"
+
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr "Serveri kutsung sisaldas vigast \"Quality of Protection\" lipikut\n"
+
+msgid "Server response did not contain authorization data\n"
+msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
+
+msgid "Server response contained incomplete authorization data\n"
+msgstr "Serveri vastus sisaldas puudulikku autoriseerimisinfot\n"
+
+msgid "Server response does not match\n"
+msgstr "Serveri vastus oli vigane\n"
+
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "See valik loob ühenduse serverisse kasutades Kerberos 5 autentimist."
+
+msgid "The consistency checks performed on the input_token failed."
+msgstr "Tõrge input_token'i kooskõlalisuse kontrollimisel."
+
+msgid "The consistency checks performed on the credential failed."
+msgstr "Tõrge volituste kooskõlalisuse kontrollimisel."
+
+msgid "The referenced credentials have expired."
+msgstr "Osutatud volitused on aegunud."
+
+msgid "Bad authentication response from server."
+msgstr "Serverilt saadi vigane autentimise vastus."
+
+msgid "Unsupported security layer."
+msgstr "Toetamata turvakiht."
+
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberose piletit pole võimalik hankida:\n"
+"%s"
+
+msgid "Login"
+msgstr "Kasutajanimi"
+
+msgid "This option will connect to the server using a simple password."
+msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
+
+msgid "Unknown authentication state."
+msgstr "Teadmata autentimisseisund"
+
+msgid "NTLM / SPA"
+msgstr "NTLM / SPA"
+
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"See valik loob ühenduse Windowsil baseeruvasse serverisse kasutades NTLM / "
+"Secure Password Authentication autentimist."
+
+msgid "POP before SMTP"
+msgstr "POP enne SMTPd"
+
+msgid "This option will authorise a POP connection before attempting SMTP"
+msgstr "See valik lubab POP ühenduse enne SMTP ühenduse üritamist"
+
+msgid "POP Source URI"
+msgstr "POP allika URI"
+
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
+
+msgid "URL '%s' needs a username component"
+msgstr "URL '%s' vajab kasutajanime osa"
+
+msgid "URL '%s' needs a host component"
+msgstr "URL '%s' vajab hosti osa"
+
+msgid "URL '%s' needs a path component"
+msgstr "URL '%s' vajab kataloogitee osa"
+
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"Ei suuda luua kataloogi %s:\n"
+"%s"
+
+msgid "Cannot find certificate for '%s'"
+msgstr "Ei leia sertifikaato '%s' jaoks"
+
+msgid "Cannot create CMS message"
+msgstr "CMS sõnumit pole võimalik luua"
+
+msgid "Cannot create CMS signed data"
+msgstr "CMS sõnumi signeeritud andmeid pole võimalik luua"
+
+msgid "Cannot attach CMS signed data"
+msgstr "CMS signeeritud andmeid pole võimalik manustada"
+
+msgid "Cannot attach CMS data"
+msgstr "CMS andmeid pole võimalik manustada"
+
+msgid "Cannot create CMS Signer information"
+msgstr "CMS Signeerija teavet pole võimalik luua"
+
+msgid "Cannot find certificate chain"
+msgstr "Sertifikaadiahelat ei leitud"
+
+msgid "Cannot add CMS Signing time"
+msgstr "CMS Signeerimise aega pole võimalik lisada"
+
+msgid "Encryption certificate for '%s' does not exist"
+msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas"
+
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr "Attribuuti SMIMEEncKeyPrefs pole võimalik lisada"
+
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr "Attribuuti MS SMIMEEncKeyPrefs pole võimalik lisada"
+
+msgid "Cannot add encryption certificate"
+msgstr "Krüptimissertifikaati pole võimalik lisada"
+
+msgid "Cannot add CMS Signer information"
+msgstr "CMS Signeerija teavet pole võimalik lisada"
+
+msgid "Failed to add data to CMS encoder"
+msgstr "Tõrge andmete lisamisel CMS kodeerijasse"
+
+msgid "Failed to encode data"
+msgstr "Tõrge andmete kodeerimisel"
+
+msgid "Unverified"
+msgstr "Määramata"
+
+msgid "Good signature"
+msgstr "Hea allkiri"
+
+msgid "Bad signature"
+msgstr "Halb allkiri"
+
+msgid "Signing certificate not found"
+msgstr "Allkirjastamissertifikaati ei leitud"
+
+msgid "Signing certificate not trusted"
+msgstr "Signeerimissertifikaat ei ole usaldusväärne"
+
+msgid "Signature algorithm unknown"
+msgstr "Tundmatu signeerimisalgoritm"
+
+msgid "Signature algorithm unsupported"
+msgstr "Toetamata signeerimisalgoritm"
+
+msgid "Processing error"
+msgstr "Vea töötlemine"
+
+msgid "Digests missing from enveloped data"
+msgstr "Andmeümbrikus puudub sõnumilühend"
+
+msgid "Cannot calculate digests"
+msgstr "Sõnumilühendeid pole võimalik arvutada"
+
+msgid "Cannot set message digests"
+msgstr "Sõnumilühendit pole võimalik määrata"
+
+msgid "Certificate import failed"
+msgstr "Tõrge sertifikaadi importimisel"
+
+msgid "Cannot find signature digests"
+msgstr "Ei leia signatuurilühendit"
+
+msgid "Signer: %s <%s>: %s\n"
+msgstr "Allkirjastaja: %s <%s>: %s\n"
+
+msgid "Decoder failed"
+msgstr "Tõrge dekodeerimisel"
+
+msgid "Cannot find certificate for `%s'"
+msgstr "Ei leia sertifikaati `%s' jaoks"
+
+msgid "Cannot create CMS Message"
+msgstr "CMS sõnumit pole võimalik luua"
+
+msgid "Cannot create CMS Enveloped data"
+msgstr "CMS Ümbriku andmeid pole võimalik luua"
+
+msgid "Cannot attach CMS Enveloped data"
+msgstr "CMS Ümbriku andmeid pole võimalik manustada"
+
+msgid "Cannot attach CMS data object"
+msgstr "CMS andmeobjekti pole võimalik manustada"
+
+msgid "Cannot add CMS Recipient information"
+msgstr "CMS Vastuvõtja teavet pole võimalik lisada"
+
+msgid "Failed to add data to encoder"
+msgstr "Tõrge andmete lisamisel enkooderile"
+
+msgid "Decoder failed, error %d"
+msgstr "Tõrge dekodeerimisel, viga %d"
+
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr "S/MIME dekrüptimine: Krüptitud sisu ei leitud"
+
+msgid "import keys: unimplemented"
+msgstr "võtmete importimine: pole veel teostatud"
+
+msgid "export keys: unimplemented"
+msgstr "võtmete eksportimine: pole veel teostatud"
+
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Kausta `%s' pole võimalik luua: kaust on juba olemas"
+
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Kausta `%s' pole võimalik luua: kaust on juba olemas"
+
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
+
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
+
+msgid "Trash"
+msgstr "Prügikast"
+
+msgid "Unable to decrypt certificate signature"
+msgstr "Ei saa dekrüptida sertifikaadi signatuuri"
+
+msgid "Unable to decode issuer's public key"
+msgstr "Väljaandja avalikku võtit pole võimalik dekodeerida"
+
+msgid "Certificate signature failure"
+msgstr "Sertifikaadi signatuuri tõrge"
+
+msgid "Certificate Revocation List signature failure"
+msgstr "Sertifikaadi tühistusnimekirja (CRL) tõrge"
+
+msgid "Certificate not yet valid"
+msgstr "Sertifikaat ei ole veel kehtiv"
+
+msgid "Certificate has expired"
+msgstr "Sertifikaat on aegunud"
+
+msgid "CRL not yet valid"
+msgstr "CRL ei ole veel kehtiv"
+
+msgid "CRL has expired"
+msgstr "CRL on aegunud."
+
+msgid "Error in CRL"
+msgstr "Viga CRL'is"
+
+msgid "Out of memory"
+msgstr "Mälu puudujääk"
+
+msgid "Certificate chain too long"
+msgstr "Sertifitseerimisahel on liiga pikk"
+
+msgid "Certificate Revoked"
+msgstr "Sertifikaat on tühistatud"
+
+msgid "Invalid Certificate Authority (CA)"
+msgstr "Vigane sertifitseerimiskeskus"
+
+msgid "Path length exceeded"
+msgstr "Otsingutee pikkus ületatud"
+
+msgid "Certificate untrusted"
+msgstr "Sertifikaat ei ole usaldatav"
+
+msgid "AKID/SKID mismatch"
+msgstr "AKID/SKID mittesobivus"
+
+msgid "Key usage does not support certificate signing"
+msgstr "Kasutusala ei sisalda sertifikaatide signeerimist"
+
+msgid "Error in application verification"
+msgstr "Viga rakenduse verifitseerimisel"
+
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+"Väljastaja:            %s\n"
+"Teema:           %s\n"
+"Sõrmejälg:       %s\n"
+"Signatuur:       %s"
+
+msgid "GOOD"
+msgstr "HEA"
+
+msgid "BAD"
+msgstr "HALB"
+
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Halb sertifikaat %s isikult:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Kas soovid seda siiski vastu võtta?"
+
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"SSL sertifikaadi kontrollimine %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Kas soovida vastu võtta?"
+
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+"Probleem sertifikaadiga: %s\n"
+"Väljastaja: %s"
+
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Sertifikaat on aegunud: %s\n"
+"Väljastaja: %s"
+
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+"Sertifikaatide tühistusnimekiri on aegunud: %s\n"
+"Väljaandja: %s"
+
+msgid "Could not parse URL `%s'"
+msgstr "URL'i `%s' pole võimalik töödelda"
+
+msgid "Error storing `%s': %s"
+msgstr "Viga `%s' salvestamisel: %s"
+
+msgid "No such message %s in %s"
+msgstr "Sõnumit %s ei ole %s seas"
+
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Sõnumeid pole võimalik kopeerida või liigutaad Virtuaalkausta"
+
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
+
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
+
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Sõnumeid pole võimalik kopeerida Prügi kausta"
+
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Sõnumeid pole võimalik kopeerida Rämpsu kausta"
+
+msgid "Check for new messages in all folders"
+msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
+
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr ""
+"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
+"sõnumitele "
+
+msgid "Check new messages for Junk contents"
+msgstr "Kontrolli, kas uued sõnumid on rämpspost"
+
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Rämpssõnumeid kontrollitakse ainult sisendkaustas"
+
+msgid "Automatically synchronize account locally"
+msgstr "Automaatne konto kohalik sünkroniseerimine"
+
+msgid "Address Book and Calendar"
+msgstr "Aadressiraamat ja kalender"
+
+msgid "Use Secure Connection (SSL)"
+msgstr "Turvalise ühenduse (SSL) kasutamine"
+
+msgid "Novell GroupWise"
+msgstr "Novell Groupwise"
+
+msgid "For accessing Novell Groupwise servers"
+msgstr "Novell Groupwise serveri kasutamiseks"
+
+msgid "Password"
+msgstr "Parool"
+
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Tõrge käsu saatmisel IMAP serverisse %s: %s"
+
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ootamatu vastus IMAP serverilt %s: %s"
+
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ootamatu tervitus IMAP serverilt: %s"
+
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' pole võimalik valida: Vigane kirjakasti nimi"
+
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik valida: Puudulik käsk"
+
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Ühendus IMAP4 serverisse %s suleti ootamatult: %s"
+
+msgid "Cannot access folder `%s': %s"
+msgstr "Kaustale `%s' ei pääse ligi: %s"
+
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kausta `%s' pole võimalik tühjendada: Tundmatu"
+
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik tühjendada: Puudulik käsk"
+
+msgid "User cancelled"
+msgstr "Kasutaja tühistas"
+
+msgid "Cannot get message %s: %s"
+msgstr "Sõnumit %s ei saadud: %s"
+
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Ei saa võtta sõnumit %s kaustast `%s': sellist sõnumit ei ole"
+
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Ei saa võtta sõnumit %s kaustast `%s': Vigane käsk"
+
+msgid "Cannot append messages to IMAP folders in offline mode."
+msgstr "IMAP kausta pole võimalik autonoomses režiimis sõnumeid lisada."
+
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Sõnumeid pole võimalik lisada `%s' kausta: Tundmatu viga"
+
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Sõnumeid pole võimalik lisada `%s' kausta: Puudulik käsk"
+
+msgid "Cannot move messages to or from IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta vahel sõnumeid liigutada."
+
+msgid "Cannot copy messages to or from IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta vahel sõnumeid kopeerida."
+
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid pole võimalik liigutada kaustast `%s' `%s' kausta: Tundmatu"
+
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid pole võimalik kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Sõnumeid pole võimalik liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Sõnumeid pole võimalik kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
+
+msgid "Folders"
+msgstr "Kaustad"
+
+msgid "Show only subscribed folders"
+msgstr "Näita ainult tellitud kaustu"
+
+msgid "Override server-supplied folder namespace"
+msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
+
+msgid "Namespace"
+msgstr "Nimeruum"
+
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Rakenda filtreid kõikidele sisendkausta uutele sõnumitele"
+
+msgid "Automatically synchronize remote mail locally"
+msgstr "Automaatne kohaliku posti sünkroniseerimine kaugpostiga"
+
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+msgid "Could not connect to %s: %s"
+msgstr "Ei saa ühenduda hosti %s: %s"
+
+msgid "SSL unavailable"
+msgstr "SSL ei ole saadaval"
+
+msgid "Connection cancelled"
+msgstr "Ühendus katkestatud"
+
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Tõrge turvalisel ühendumisel IMAP serveriga %s: %s"
+
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"IMAP serverisse %s pole võimalik autentimistüüpi %s kasutades autentida"
+
+msgid "Cannot create IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta luua."
+
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
+
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Kausta nimi \"%s\" on lubamatu kuna see sisaldab \"%c\" kirjamärki"
+
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' pole võimalik luua: Vigane kirjakasti nimi"
+
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik luua: Puudulik käsk"
+
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kausta `%s' pole võimalik kustutada: Spetsiaalkaust"
+
+msgid "Cannot delete IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta kustutada."
+
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' pole võimalik kustutada: Vigane kirjakasti nimi"
+
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik kustutada: Puudulik käsk"
+
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr ""
+"Kausta `%s' pole võimalik ümber nimetada `%s'-ks: kaust on eritähenduslik"
+
+msgid "Cannot rename IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta ümber nimetada."
+
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr ""
+"Kausta `%s' pole võimalik ümber nimetada `%s'-ks: Vigane kirjakasti nimi"
+
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik ümber nimetada `%s'-ks: Puudulik käsk"
+
+msgid "Bad command"
+msgstr "Puudulik käsk"
+
+msgid "Cannot subscribe to IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta tellida."
+
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' pole võimalik tellida: Vigane kirjakasti nimi name"
+
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kausta `%s' pole võimalik tellida: Puudulik käsk"
+
+msgid "Cannot unsubscribe from IMAP folders in offline mode."
+msgstr "Autonoomses olekus pole võimalik IMAP kausta tellimisest loobuda."
+
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' tellimisest pole võimalik loobuda: Vigane kirjakasti nimi"
+
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kaustast `%s' pole võimalik loobuda: Puudulik käsk"
+
+msgid "Scanning for changed messages"
+msgstr "Kontrollin muudetud sõnumite olemasolu"
+
+msgid "Fetching envelopes for new messages"
+msgstr "Uute sõnumite ümbrikute vastuvõtmine"
+
+msgid "No data"
+msgstr "Andmeid pole"
+
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s katkestas ootamatult ühenduse: %s"
+
+msgid "Operation cancelled"
+msgstr "Operatsioon katekstatud"
+
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server katkestas ootamatult: %s"
+
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr ""
+"Häire IMAP serverilt %s@%s:\n"
+"%s"
+
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+msgid "IMAP command failed: %s"
+msgstr "IMAPi käsk nurjus: %s"
+
+msgid "Server response ended too soon."
+msgstr "Serveri vastus lõppes liiga vara."
+
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP serveri vastus ei sisalda %s teavet"
+
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "Ootamatu OK vastus IMAP serverilt: %s"
+
+msgid "Could not create directory %s: %s"
+msgstr "Kataloogi %s pole võimalik luua: %s"
+
+msgid "Could not load summary for %s"
+msgstr "%s kokkuvõtet pole võimalik laadida"
+
+msgid "Folder was destroyed and recreated on server."
+msgstr "Kaust hävitati ja taasloodi serveris."
+
+msgid "Unable to retrieve message: %s"
+msgstr "Sõnumit pole võimalik vastu võtta: %s"
+
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Sõnumit %s ei saadud: \n"
+"  %s"
+
+msgid "This message is not currently available"
+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"
+
+msgid "Could not find message body in FETCH response."
+msgstr "Ei leia sõnumi sisu FETCH vastuses."
+
+msgid "Could not open cache directory: %s"
+msgstr "Puhvermälu kausta pole võimalik avada: %s "
+
+msgid "Failed to cache message %s: %s"
+msgstr "Tõrge sõnumi %s puhverdamisel: %s"
+
+msgid "Failed to cache %s: %s"
+msgstr "Tõrge %s puhverdamisel: %s"
+
+msgid "C_heck for new messages in all folders"
+msgstr "_Kontrolli uusi sõnumeid kõikides kaustades"
+
+msgid "Connection to Server"
+msgstr "Ühendus serveriga"
+
+msgid "_Use custom command to connect to server"
+msgstr "_Proxyserveriga ühendumiseks kasutatakse kohandatud käsku"
+
+msgid "_Show only subscribed folders"
+msgstr "_Näita ainult tellitud kaustu"
+
+msgid "O_verride server-supplied folder namespace"
+msgstr "Kasuta serveri pakutava kaustade _nimeruumi asemel enda oma"
+
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "Rakenda _filtreid kõikidele Sisendkasti uutele sõnumitele"
+
+msgid "Check new messages for _Junk contents"
+msgstr "Uute sõnumite _rämpspostikontroll"
+
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "Rämpssõnumeid kontrollitakse _ainult sisendkaustas"
+
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "Automaatne kohaliku posti _sünkroniseerimine kaugpostiga"
+
+msgid "IMAP"
+msgstr "IMAP"
+
+msgid "For reading and storing mail on IMAP servers."
+msgstr "E-posti loetakse ja hoitakse IMAP serveris."
+
+msgid "STARTTLS not supported"
+msgstr "STARTTLS ei ole toetatud."
+
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
+
+msgid "No support for authentication type %s"
+msgstr "Autentimistüübi %s tugi puudub"
+
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
+
+msgid "You didn't enter a password."
+msgstr "Sa ei sisestanud parooli."
+
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Ei saa autentimida IMAP serverisse.\n"
+"%s\n"
+"\n"
+
+msgid "No such folder %s"
+msgstr "Kausta %s ei leitud"
+
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Kausta `%s' pole võimalik luua: kaust on juba olemas."
+
+msgid "Unknown parent folder: %s"
+msgstr "Tundmatu ülemkaust: %s"
+
+msgid "IMAP+"
+msgstr "IMAP+"
+
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! 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"
+"\n"
+" !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
+
+msgid "Could not connect to %s (port %s): %s"
+msgstr "Ei saa ühenduda %s (port: %s): %s"
+
+msgid "Could not connect to POP server on %s"
+msgstr "Ei saa luua ühendust POP serveriga %s"
+
+msgid "Index message body data"
+msgstr "Sõnumite sisu indekseerimine"
+
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
+
+msgid "mailbox:%s (%s)"
+msgstr "postkast:%s (%s)"
+
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr "Kasuta `.folders' kaustakokkuvõttefaili (exmh)"
+
+msgid "MH-format mail directories"
+msgstr "MH-vormingus postikataloogid"
+
+msgid "For storing local mail in MH-like mail directories."
+msgstr "Kohalikku posti hoitakse MH vorminguga kataloogides."
+
+msgid "Local delivery"
+msgstr "Kohalik postijagaja"
+
+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 ja "
+"tõstetakse Evolution'i poolt hallatavatesse kaustadesse."
+
+msgid "Apply filters to new messages in INBOX"
+msgstr "Rakenda filtreid Sisendkasti uutele sõnumitele"
+
+msgid "Maildir-format mail directories"
+msgstr "\"Maildir\" vormingus postikataloog"
+
+msgid "For storing local mail in maildir directories."
+msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
+
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr "Salvesta olekupäised Elm/Pine/Mutt vormingus"
+
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standardne Unix'i \"mbox\" puhverfail või -kataloog"
+
+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 salvestatakse standardsetes välistes \"mbox\" "
+"vorminguga puhverfailides. Võib kasutada ka juhul, kui soovitakse kasutada "
+"programmide Elm, Pine või Mutt postikaustu."
+
+msgid "Store root %s is not an absolute path"
+msgstr "Hoidla juurikas %s ei ole absoluutne tee"
+
+msgid "Cannot get folder: %s: %s"
+msgstr "Kausta `%s' ei saadud: %s"
+
+msgid "Local mail file %s"
+msgstr "Kohaliku posti fail %s"
+
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kausta %s pole võimalik ümber nimetada %s-ks: %s"
+
+msgid "Could not rename '%s': %s"
+msgstr "Ei saa ümber nimetada '%s': %s"
+
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Kausta kokkuvõttefaili `%s' pole võimalik kustutada: %s"
+
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kausta indeksfaili `%s' pole võimalik kustutada: %s"
+
+msgid "Could not delete folder meta file `%s': %s"
+msgstr "Kausta üldistusfaili `%s' pole võimalik kustutada: %s"
+
+msgid "Could not save summary: %s: %s"
+msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
+
+msgid "Unable to add message to summary: unknown reason"
+msgstr "Sõnumit pole võimalik lisada kokkuvõttesse: tundmatu põhjus"
+
+msgid "Maildir append message cancelled"
+msgstr "Sõnumi lisamine maildir kausta katkestati"
+
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
+
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
+
+msgid "Invalid message contents"
+msgstr "Vigane sõnumi sisu"
+
+msgid "Cannot get folder `%s': %s"
+msgstr "Kausta `%s' ei saadud: %s"
+
+msgid "Cannot get folder `%s': folder does not exist."
+msgstr "Kausta `%s' ei saadud: seda ei ole olemas."
+
+msgid "Cannot create folder `%s': %s"
+msgstr "Kausta `%s' pole võimalik luua: %s"
+
+msgid "Cannot get folder `%s': not a maildir directory."
+msgstr "Kausta `%s' ei saadud: see ei ole maildir kataloog."
+
+msgid "Could not delete folder `%s': %s"
+msgstr "Kausta `%s' pole võimalik kustutada: %s"
+
+msgid "not a maildir directory"
+msgstr "ei ole maildir vormingus kataloog"
+
+msgid "Could not scan folder `%s': %s"
+msgstr "Kausta `%s' pole võimalik läbi vaadata: %s"
+
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Maildir kataloogi pole võimalik avada %s: %s"
+
+msgid "Checking folder consistency"
+msgstr "Kausta kooskõlalisuse kontrollimine"
+
+msgid "Checking for new messages"
+msgstr "Uute sõnumite kontrollimine"
+
+msgid "Storing folder"
+msgstr "Kausta salvestamine"
+
+msgid "Cannot create folder lock on %s: %s"
+msgstr "%s lukustamine nurjus: %s"
+
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Ei saa avada kirjakasti: %s: %s\n"
+
+msgid "Mail append cancelled"
+msgstr "E-posti lisamine katkestati"
+
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Sõnumit pole võimalik mbox faili lisada: %s: %s"
+
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Kaust tundub olevad parandamatult rikutud."
+
+msgid "Message construction failed."
+msgstr "Tõrge sõnumi kokkupanekul."
+
+msgid "Cannot create a folder by this name."
+msgstr "Sellise nimega kausta pole võimalik luua."
+
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Kausta `%s' ei saadud: see ei ole tavaline fail."
+
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+"Kataloogi `%s' pole võimalik kustutada:\n"
+"%s"
+
+msgid "`%s' is not a regular file."
+msgstr "`%s' ei ole tavaline fail."
+
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
+
+msgid "Cannot create directory `%s': %s."
+msgstr "Kataloogi %s pole võimalik luua: %s"
+
+msgid "Cannot create folder: %s: %s"
+msgstr "Kausta %s pole võimalik luua: %s"
+
+msgid "Folder already exists"
+msgstr "Kaust on juba olemas"
+
+msgid "The new folder name is illegal."
+msgstr "Uus kaustanimi on lubamatu!"
+
+msgid "Could not rename `%s': `%s': %s"
+msgstr "Ei saa ümber nimetada '%s': `%s': %s"
+
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Kausta '%s' pole võimalik ümber nimetada '%s'-ks: %s"
+
+msgid "Could not open folder: %s: %s"
+msgstr "Kausta pole võimalik avada: %s: %s"
+
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Pöördumatu postianalüüsija viga positsioonil %ld kaustad %s"
+
+msgid "Cannot check folder: %s: %s"
+msgstr "Kausta pole võimalik kontrollida: %s: %s"
+
+msgid "Could not open file: %s: %s"
+msgstr "Faili %s pole võimalik avada: %s"
+
+msgid "Cannot open temporary mailbox: %s"
+msgstr "Ajutist kirjakasti pole võimalik avada: %s"
+
+msgid "Could not close source folder %s: %s"
+msgstr "Lähtekausta pole võimalik sulgeda %s: %s"
+
+msgid "Could not close temp folder: %s"
+msgstr "Ajutist kausta pole võimalik sulgeda: %s"
+
+msgid "Could not rename folder: %s"
+msgstr "Kataloogi pole võimalik ümber nimetada: %s"
+
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Kokkuvõtte ja kausta ebavõrdlus, isegi peale sünkroniseerimist"
+
+msgid "Unknown error: %s"
+msgstr "Tundmatu viga: %s"
+
+msgid "Could not store folder: %s"
+msgstr "Kausta pole võimalik salvestada: %s"
+
+msgid "Error writing to temp mailbox: %s"
+msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
+
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Tõrge ajutisse kirjakasti kirjutamisel: %s: %s"
+
+msgid "MH append message cancelled"
+msgstr "MH sõnumi lisamine katkestatud"
+
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Sõnumi lisamine mh vormingus kausta nurjus: %s: %s"
+
+msgid "Could not create folder `%s': %s"
+msgstr "Kataloogi `%s' pole võimalik luua: %s"
+
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Kausta `%s' pole võimalik lugeda: see ei ole kataloog."
+
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Ei saa avada MH kataloogi: %s: %s"
+
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Puhvrit `%s' pole võimalik avada: %s"
+
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Puhver '%s' pole tavaline fail ega kataloog"
+
+msgid "Folder `%s/%s' does not exist."
+msgstr "Kausta `%s/%s' ei ole olemas."
+
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kausta `%s' pole võimalik avada:\n"
+"%s"
+
+msgid "Folder `%s' does not exist."
+msgstr "Kataloogi '%s' pole olema."
+
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kausta `%s' pole võimalik luua:\n"
+"%s"
+
+msgid "`%s' is not a mailbox file."
+msgstr "`%s' ei ole kirjakasti fail."
+
+msgid "Spool mail file %s"
+msgstr "E-posti puhverfail %s"
+
+msgid "Spool folders cannot be renamed"
+msgstr "Puhverkaustu pole võimalik ümber nimetada"
+
+msgid "Spool folders cannot be deleted"
+msgstr "Puhverkaustu pole võimalik kustutada"
+
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Palun sisesta NNTP parool %s@%s jaoks"
+
+msgid "Server rejected username"
+msgstr "Server keeldus kasutajanime vastu võtmast"
+
+msgid "Failed to send username to server"
+msgstr "Tõrge kasutajanime saatmisel serverile"
+
+msgid "Server rejected username/password"
+msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
+
+msgid "Internal error: uid in invalid format: %s"
+msgstr "Sisemine viga: uid on vigases vormingus: %s"
+
+msgid "Posting failed: %s"
+msgstr "Postitamine nurjus: %s"
+
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "Sõnumeid pole võimalik NNTP kaustast kopeerida!"
+
+msgid "Could not get group list from server."
+msgstr "Gruppide nimekirja serverist ei saadud."
+
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "Kaustanimede näitamine lühendatult (comp.os.linux asemel c.o.linux)"
+
+msgid "In the subscription dialog, show relative folder names"
+msgstr "Kaustade tellimisdialoogis näita kaustade suhtnimesid"
+
+msgid "USENET news"
+msgstr "USENETi uudised"
+
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+"Selle kaudu on võimalik lugeda ja kirjutada USENET'i uudistegruppidesse."
+
+msgid "NNTP server %s returned error code %d: %s"
+msgstr "NNTP server %s tagastas veakoodi %d: %s"
+
+msgid "USENET News via %s"
+msgstr "USENETi uudised üle %s"
+
+msgid ""
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"Viga uudistegrupi vastuvõtmisel:\n"
+"\n"
+"%s"
+
+msgid "Authentication requested but no username provided"
+msgstr "Nõutakse autentimist kuid kasutajanime ei ole sisestatud"
+
+msgid "Cannot authenticate to server: %s"
+msgstr "Ei saa autentida serverisse: %s"
+
+msgid "NNTP Command failed: %s"
+msgstr "Tõrge NNTP käsu täitmisel: %s"
+
+msgid "Not connected."
+msgstr "Ühendamata."
+
+msgid "No such folder: %s"
+msgstr "Kausta ei leitud: %s"
+
+msgid "%s: Scanning new messages"
+msgstr "%s: uute kirjade skannimine"
+
+msgid "Operation failed: %s"
+msgstr "Tõrge toimingu läbiviimisel: %s"
+
+msgid "Retrieving POP summary"
+msgstr "Võtan vastu POP kokkuvõtet"
+
+msgid "Cannot get POP summary: %s"
+msgstr "Ei saa võtta POP kokkuvõtet: %s"
+
+msgid "Expunging deleted messages"
+msgstr "Hävitan kustutatud sõnumid"
+
+msgid "No message with uid %s"
+msgstr "Sõnumit uid'iga %s ei ole"
+
+msgid "Retrieving POP message %d"
+msgstr "POP sõnumi %d vastuvõtt"
+
+msgid "Delete after %s day(s)"
+msgstr "Kustuta %s päeva möödumisel"
+
+msgid "Disable support for all POP3 extensions"
+msgstr "Keela kõigi POP3 laienduste toetus"
+
+msgid "POP"
+msgstr "POP"
+
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "E-posti laetakse alla POP serverist"
+
+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 "Failed to read a valid greeting from POP server %s"
+msgstr "POP serverilt %s pole võimalik korrektset tervitust"
+
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr "Tõrge turvalisel ühendumisel POP serverisse %s: %s"
+
+msgid "STLS not supported"
+msgstr "STLS ei ole toetatud."
+
+msgid "Could not connect to POP server %s"
+msgstr "Ei saa luua ühendust POP serveriga %s"
+
+msgid "SASL `%s' Login failed for POP server %s: %s"
+msgstr "Tõrge SASL `%s' sisselogimisel POP serverisse %s: %s"
+
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr "POP serverisse %s pole võimalik sisse logida: SASL protokolli viga"
+
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Tõrge autentimisel POP serverisse %s: %s"
+
+msgid "%sPlease enter the POP password for %s on host %s"
+msgstr "%sPalun sisesta kasutaja %s POP parool hostile %s"
+
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
+msgstr ""
+"Ei saa luua ühendust POP serveriga %s.\n"
+"Viga parooli saatmisel: %s"
+
+msgid "No such folder `%s'."
+msgstr "Kausta '%s' ei ole olemas."
+
+msgid "Sendmail"
+msgstr "Sendmail"
+
+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."
+
+msgid "Could not parse recipient list"
+msgstr "Saajate nimekirja ei õnnestu analüüsida"
+
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
+
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+
+msgid "Could not send message: %s"
+msgstr "Sõnumit pole võimalik saata: %s"
+
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr "sendmail lõpetas töö signaaliga %s: sõnumit ei saadetud."
+
+msgid "Could not execute %s: mail not sent."
+msgstr "Ei saa käivitada %s: sõnumit ei saadetud."
+
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "sendmail lõpetas töö staatusega %d: sõnumit ei saadetud."
+
+msgid "sendmail"
+msgstr "sendmail"
+
+msgid "Mail delivery via the sendmail program"
+msgstr "Sõnumite trantsport sendmail programmiga"
+
+msgid "SMTP"
+msgstr "SMTP"
+
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "E-posti saatmiseks SMTP protokolli kaudu välisele mailhub serverile."
+
+msgid "Syntax error, command unrecognized"
+msgstr "Viga süntaksis, tundmatu käsk"
+
+msgid "Syntax error in parameters or arguments"
+msgstr "Süntaksi viga parameetrites või argumentides"
+
+msgid "Command not implemented"
+msgstr "Käsku ei ole veel teostatud"
+
+msgid "Command parameter not implemented"
+msgstr "Käsu parameeter ei ole veel teostatud"
+
+msgid "Help message"
+msgstr "Abiteade"
+
+msgid "Service ready"
+msgstr "Teenus on valmis"
+
+msgid "Service closing transmission channel"
+msgstr "Teenus sulgeb ülekandekanali"
+
+msgid "Service not available, closing transmission channel"
+msgstr "Teenus ei ole saadaval, sulgen ülekandekanali"
+
+msgid "Requested mail action okay, completed"
+msgstr "Nõutud kirjategevus korras, lõpetatud"
+
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "Nõutud kirjategevust ei tehtud: kirjakast ei ole saadaval"
+
+msgid "Requested action not taken: mailbox unavailable"
+msgstr "Nõutud tegevust ei tehtud: kirjakast ei ole saadaval"
+
+msgid "Requested action aborted: error in processing"
+msgstr "Nõutud tegevus nurjatud: viga töötlemisel"
+
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr "Nõutud toimingut ei teostatud: kirjakasti nimi ei ole lubatud"
+
+msgid "Transaction failed"
+msgstr "Tõrge transaktsiooni läbiviimisel"
+
+msgid "Authentication mechanism is too weak"
+msgstr "Autentimismehhanism on liiga nõrk"
+
+msgid "Temporary authentication failure"
+msgstr "Ajutine autentimise tõrge"
+
+msgid "Authentication required"
+msgstr "Autentimine on vajalik"
+
+msgid "Welcome response error"
+msgstr "Tervitusvastuse viga"
+
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Tõrge turvalisel ühendumisel SMTP serverisse %s: %s"
+
+msgid "STARTTLS command failed: %s"
+msgstr "Tõrge STARTTLS käsu täitmisel: %s"
+
+msgid "STARTTLS command failed"
+msgstr "Tõrge STARTTLS käsu täitmisel"
+
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s."
+
+msgid "%sPlease enter the SMTP password for %s on host %s"
+msgstr "%sPalun sisesta kasutaja %s SMTP parool hostile %s"
+
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Autentimine SMPT serverisse nurjus.\n"
+"%s\n"
+"\n"
+
+msgid "SMTP server %s"
+msgstr "SMTP server %s"
+
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP posti saatmine %s kaudu"
+
+msgid "Cannot send message: service not connected."
+msgstr "Sõnumit pole võimalik saata: teenusega ei saa ühendust"
+
+msgid "Cannot send message: sender address not valid."
+msgstr "Ei saa saata sõnumit: saatja aadress on vigane"
+
+msgid "Sending message"
+msgstr "Sõnumi saatmine"
+
+msgid "Cannot send message: no recipients defined."
+msgstr "Ei saa saata sõnumit: saajate aadressid on määramata."
+
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Sõnumit pole võimalik saata: saajate aadress või aadressid on vigased."
+
+msgid "SMTP Greeting"
+msgstr "SMTP Tervitus"
+
+msgid "HELO command failed: %s"
+msgstr "Tõrge HELO käsu täitmisel: %s"
+
+msgid "HELO command failed"
+msgstr "Tõrge HELO käsu täitmisel"
+
+msgid "SMTP Authentication"
+msgstr "SMTP autentimine"
+
+msgid "Error creating SASL authentication object."
+msgstr "Viga SASL autentimisobjekti loomise."
+
+msgid "AUTH command failed: %s"
+msgstr "Tõrge AUTH käsu täitmisel: %s"
+
+msgid "AUTH command failed"
+msgstr "Tõrge AUTH käsu täitmisel"
+
+msgid "Bad authentication response from server.\n"
+msgstr "Halb autentimisvastus serverilt.\n"
+
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "Tõrge MAIL FROM käsu täitmisel: %s: sõnum jäi saatmata"
+
+msgid "MAIL FROM command failed"
+msgstr "Tõrge MAIL FROM käsu täitmisel"
+
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "Tõrge RCPT TO käsu täitmisel: %s: sõnum jäi saatmata"
+
+msgid "RCPT TO <%s> failed"
+msgstr "Tõrge RCPT TO <%s> käsu täitmisel"
+
+msgid "DATA command failed: %s: mail not sent"
+msgstr "Tõrge DATA käsu täitmisel: %s: sõnum jäi saatmata"
+
+msgid "DATA command failed"
+msgstr "Tõrge DATA käsu täitmisel"
+
+msgid "RSET command failed: %s"
+msgstr "Tõrge RSET käsu täitmisel: %s"
+
+msgid "RSET command failed"
+msgstr "Tõrge RSET käsu täitmisel"
+
+msgid "QUIT command failed: %s"
+msgstr "Tõrge QUIT käsu täitmisel: %s"
+
+msgid "QUIT command failed"
+msgstr "Tõrge QUIT käsu täitmisel"
+
+msgid "VFolders"
+msgstr "VKaustad"
+
+msgid "Virtual _Folders"
+msgstr "Virtuaalsed _kaustad"
+
+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 ""
+"E-posti konto seadistamine on peaaegu lõppenud. Sinu poolt määratud "
+"identiteet, siseneva ja väljuva posti serverid koondatakse ühe nime alla ja "
+"sellest saab Evolution'i postikonto. Palun anna sellele kontole nimi. Nime "
+"kasutatakse hiljem ainult kuvamise eesmärgil."
+
+msgid "_Enable"
+msgstr "_Lubamine"
+
+msgid "Body does not contain"
+msgstr "Sisu ei sisalda"
+
+msgid "Body or subject contains"
+msgstr "Sisu või teema sisaldab"
+
+msgid "Subject does not contain"
+msgstr "Teema ei sisalda"
+
+msgid "Meetings"
+msgstr "Koosolekud"
+
+msgid "Ad_d"
+msgstr "_Lisa"
+
+msgid "Delet_e"
+msgstr "_Kustuta"
+
+msgid "Edi_t"
+msgstr "_Redigeermine"
+
+msgid "Button style"
+msgstr "Nuppude stiil"
 
+msgid "Create _Virtual Folder From Message"
+msgstr "Loo sõnumi baasil _Virtuaalne Kaust"