I like monkeys - Federico

svn path=/trunk/; revision=6981

1 files changed, 1803 insertions, 1727 deletions

diff --git a/po/fi.po b/po/fi.po
index b97f0158d0..db97c4fb91 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-14 14:38+0300\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-11-14 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -263,10 +263,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1012
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1092
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
@@ -385,28 +385,28 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:207
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:220
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:579
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:580
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:613
 #: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -427,105 +427,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "Työ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "Työ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Yritys"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Koti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Koti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: mail/mail-config.glade.h:18
-msgid "Other"
-msgstr "Muu"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Muu faksi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "Ensisijainen sähköposti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "Sähköposti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "Sähköposti 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
@@ -539,7 +445,7 @@ msgid "_Add"
 msgstr "_Lisää"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -554,12 +460,11 @@ msgstr "Uusi puhelintyyppi"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Lisää"
 
@@ -599,6 +504,11 @@ msgstr ""
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Ensisijainen sähköposti"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
@@ -612,7 +522,7 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegoriat"
 
@@ -629,7 +539,7 @@ msgid "_Address..."
 msgstr "_Osoite..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -674,44 +584,145 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Yksityiskohdat"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Työ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Työ 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Yritys"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Koti"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Koti 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Muu"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Muu faksi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Sähköposti 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Sähköposti 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:7
+#, fuzzy
+msgid "Canada"
+msgstr "Kalenteri"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Etsi"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Osavaltio/Provinssi:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -763,25 +774,24 @@ msgstr "_Sukunimi:"
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -790,30 +800,30 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -823,66 +833,178 @@ msgstr "Ulkoiset hakemistot"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP-palvelin:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Nimi:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Portin numero:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Etsi..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Vastaanottajat"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Valitse nimet"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Valitse nimi luettelosta"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Etsi"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "window2"
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "Ke"
+
+#: po/tmp/alphabet.glade.h:12
+#, fuzzy
+msgid "f"
+msgstr "Jos"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+#, fuzzy
+msgid "i"
+msgstr "on"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "Ok"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "Ma"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Pe"
+
+#: po/tmp/alphabet.glade.h:25
+#, fuzzy
+msgid "s"
+msgstr "on"
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "Su"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr ""
@@ -900,197 +1022,190 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Etsi"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Ala:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Mitat:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Kirjasin..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Kirjasinlajit"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Alatunniste:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Ylätunniste:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Ylä-/Alatunniste"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Korkeus:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Vaaka"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Vasen:"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Reunukset"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Sarakkeiden määrä:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Asetukset"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Suunta"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sivu"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Sivun asetukset:"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Paperi"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Paperilähde:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Pysty"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Esikatselu:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Peilikuvareunukset"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Oikea:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Varjostus"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Koko:"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Tyylin nimi:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Ylä:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Leveys:"
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1099,13 +1214,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1117,8 +1232,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1162,46 +1277,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Avaa kalenteri"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Tallenna kalenteri"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
@@ -1233,7 +1348,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1242,51 +1357,50 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -1304,382 +1418,467 @@ msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "05 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalenterin asetukset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Päivän loppu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Perjantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Maanantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Muistuta kaikista tapaamisista"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Näytä tapaamisten lopetusajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Näytä viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Päivän alku:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Torstai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "työviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuuttia niitä ennen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekuntia."
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/task-editor-dialog.glade.h:6
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
-msgid "No summary"
-msgstr ""
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Luokitus"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Peruuta"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
-#, c-format
-msgid "Task - %s"
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "Poistettu"
+
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Journal entry - %s"
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "Korkeus:"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "% Comp_lete:"
+#: po/tmp/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Low"
+msgstr "nyt"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
+msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "C_lassification:"
-msgstr "_Luokitus"
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Date Completed:"
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tehtävä"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "_Kontaktit..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
-#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
-#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Poista"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
-#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
-#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Muokkaa tätä tapaamista..."
 
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Poista tämä tapaaminen"
 
-#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Tee tästä tapaamisesta siirrettävä"
 
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1690,249 +1889,198 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:310
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
+msgstr "_Koko päivän kestävä tapahtuma"
 
-#: calendar/gui/event-editor.c:365
-msgid "on"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "päivä"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr ""
 
-#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Maanantai"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor.c:391
-msgid "Tuesday"
-msgstr "Tiistai"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Päivää"
 
-#: calendar/gui/event-editor.c:392
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Joka"
 
-#: calendar/gui/event-editor.c:393
-msgid "Thursday"
-msgstr "Torstai"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Poikkeukset"
 
-#: calendar/gui/event-editor.c:394
-msgid "Friday"
-msgstr "Perjantai"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Tuntia"
 
-#: calendar/gui/event-editor.c:395
-msgid "Saturday"
-msgstr "Lauantai"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr ""
 
-#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sunnuntai"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuuttia"
 
-#: calendar/gui/event-editor.c:514
-msgid "on the"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Muuta"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:521
-msgid "th"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/event-editor.c:675
-msgid "occurrences"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Y_ksityinen"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Y_leinen"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:792
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Aika"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_Loppumisaika:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "_Koko päivän kestävä tapahtuma"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "Y_leinen"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Y_ksityinen"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuuttia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "Tuntia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Päivää"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "_Loppumisaika:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Appointment Basics"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_Alkamispäivä:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Recurrence Rule"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Simple recurrence"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Joka"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
+#: calendar/gui/event-editor.c:407
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "forever"
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "päivä"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "Poikkeukset"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "Muuta"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "label21"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "Preview"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -2145,30 +2293,6 @@ msgstr ""
 msgid "ago"
 msgstr "sitten"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Yhteenveto:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
 #: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
 #: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
@@ -2403,185 +2527,93 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:864
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr ""
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr ""
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr ""
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr ""
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr ""
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr ""
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr ""
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr ""
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr ""
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr ""
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr ""
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr ""
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr ""
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr ""
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr ""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr ""
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr ""
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
 msgstr ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
-msgid "SMTWTFS"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-lock.c:253
 #, c-format
-msgid "Could not check mail file %s: %s"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#: camel/camel-movemail.c:99
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "VIrhe luettaessa viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa väliaikaista viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen väliaikaistiedostoon %s epäonnistui: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
@@ -2614,6 +2646,10 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2629,22 +2665,22 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2668,6 +2704,20 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2678,16 +2728,20 @@ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
@@ -2697,7 +2751,7 @@ msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2746,203 +2800,284 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
-#, c-format
-msgid "Cannot get message: %s"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Kansiota `%s' ei ole olemassa."
+msgid "Local mail file %s"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
 #, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
+msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
 #, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ei ole tavallinen tiedosto."
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Kirjoita viesti"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+#, fuzzy
+msgid "Invalid message contents"
+msgstr "Lähetä _viesti kontaktille..."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not delete folder `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
+msgid "Folder `%s' does not exist."
+msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
 #, c-format
-msgid "Local mail file %s"
-msgstr "Paikallinen viestitiedosto %s"
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-folder.c:195
 #, c-format
-msgid "Could not open summary %s"
+msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-folder.c:251
 #, c-format
-msgid "Cannot open temporary mailbox: %s"
+msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-store.c:101
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid ""
+"Could not open file `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
-msgid "Cannot copy data to output file: %s"
+msgid ""
+"Could not create file `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
+msgid "`%s' is not a regular file."
+msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Unknown error: %s"
-msgstr "Tuntematon virhe: %s"
-
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Cannot append message to mh folder: %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-folder.c:405
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:112
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
-msgid "`%s' is not a directory."
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
-msgid "Could not delete folder `%s': %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
-msgid "Could not rename folder `%s': %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:194
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr ""
+msgid "Unknown error: %s"
+msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:214
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
-msgid "Local mail directory %s"
+msgid "`%s' is not a directory."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:41
@@ -2962,7 +3097,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr ""
@@ -3012,16 +3147,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Viestiä ei saatu POP-palvelimelta %s: %s"
@@ -3094,7 +3229,7 @@ msgid ""
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -3184,51 +3319,50 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:397
-#: ui/evolution-message-composer.xml.h:8
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Liitä tiedosto"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Poista"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:599
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Lähettäjä:"
 
@@ -3240,7 +3374,7 @@ msgstr ""
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Vastaanottaja:"
 
@@ -3248,7 +3382,7 @@ msgstr "Vastaanottaja:"
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr ""
 
@@ -3266,7 +3400,7 @@ msgid ""
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Aihe:"
 
@@ -3274,45 +3408,45 @@ msgstr "Aihe:"
 msgid "Enter the subject of the mail"
 msgstr "Anna sähköpostin aihe"
 
-#: composer/e-msg-composer.c:426
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:593
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:624
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:646
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Tallennetaan muutokset..."
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:689
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:733 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:739
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3322,27 +3456,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:761
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:887
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:897
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:917
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epäonnistui."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3350,15 +3484,15 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittää sen?"
 
-#: composer/e-msg-composer.c:960
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1337
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1411
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3366,6 +3500,11 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Etsi"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "vuotta"
@@ -3444,8 +3583,8 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr ""
 
@@ -3453,7 +3592,16 @@ msgstr ""
 msgid "Edit Filter Rule"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:10
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr ""
 
@@ -3476,26 +3624,31 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
@@ -3507,229 +3660,224 @@ msgstr "Säännön nimi: "
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "kaikki ehdot täytetään"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "mikään ehdoista täyttyy"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Lisää ehto"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Poista ehto"
 
-#: filter/filter.glade.h:9 mail/folder-browser.c:463
-#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Viesti lähetetty"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Viesti lähetetty"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Kokeile asetuksia"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Lähde"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "La"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "jälkeen"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "ennen"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "sisältää"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr ""
 
@@ -3753,128 +3901,131 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Evolutionin sähköpostin yhteenvetokomponentin alustus epäonnistui."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr ""
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:18
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Tallenna"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Aihe sisältää"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Aihe ei sisällä"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:458 mail/folder-browser.c:541
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Avaa"
 
-#: mail/folder-browser.c:464 mail/mail-view.c:163
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:28
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Tallenna _nimellä..."
+
+#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:34
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "Siirrä kansioon..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "Palauta"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:481
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
@@ -3894,7 +4045,7 @@ msgstr "Aihe on %s"
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr ""
@@ -3941,15 +4092,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Siirrä viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3957,22 +4108,73 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejä."
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Tallenna nimellä..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Tallenna nimellä..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:824
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:871
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epäonnistui"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config-druid.glade.h:6
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "Muokkaa lähdettä"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3982,59 +4184,63 @@ msgstr ""
 "myös halutessasi antaa organisaatiosi nimen, sekä tiedostonimen, josta "
 "allekirjoituksesi luetaan."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Koko nimi:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Allekirjoitustiedosto"
 
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Käyttäjänimi:"
 
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Polku:"
 
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Todentaminen:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Etsi tuettuja tyyppejä..."
 
-#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Älä poista viestejä palvelimelta"
 
-#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Kokeile asetuksia"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4043,11 +4249,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4056,731 +4262,547 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Lisää lähde"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Muokkaa lähdettä"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Lisää uutispalvelin"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Muokkaa uutispalvelinta"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Kokeillaan: \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Koeyhteys epäonnistui: \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Yhdistäminen onnistui!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Accounts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Add Optional Fields..."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Additional Identity Fields"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication"
-msgstr "Todentaminen"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Browse..."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:16
-msgid "Congratulations, your mail configuration is complete."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:22
-msgid "Default"
-msgstr "Oletus"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Done"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Edit Mail Configuration Settings"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Email Address:"
-msgstr "Sähköpostiosoite:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "News"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Optional"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Optional Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Password:"
-msgstr "Salasana:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:48
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Preferred type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Receiving Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Reply-to:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:57
-msgid "SMTP server requires authentication"
-msgstr "SMTP-palvelin vaati todennuksen"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Sending Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Server Type: "
-msgstr "Palvelintyyppi: "
-
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
-msgid "Sources"
-msgstr "Lähteet"
-
-#: mail/mail-config-druid.glade.h:68
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Your mail server supports the following types of authentication. Please"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Osoite"
 
-#: mail/mail-config.glade.h:11
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Merkitse viesti nähdyksi [ms]: "
 
-#: mail/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Uutispalvelimet"
 
-#: mail/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Lähetä viestit HTML-muodossa"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr ""
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr ""
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Lähteet"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Anna PGP/GPG-salasanasi"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Ei salasanaa."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP-ohjelmaa ei ole."
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-display.c:71
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:194
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Luodaan uutta kansiota"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:503
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Lähetetään \"%s\""
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Lähetetään viesti ilman aihetta"
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Lähetä \"%s\""
 
-#: mail/mail-ops.c:514
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Lähetä viesti ilman aihetta"
 
-#: mail/mail-ops.c:685
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:687
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:830
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:827 mail/mail-ops.c:833
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:966
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Siirretään viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopioidaan viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:971
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Siirrä viestejä kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopioi viestejä kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Siirretään"
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:1027
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1109
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Siirretään viestejä \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:1263
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1265
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1334 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(ei kuvausta)"
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1398
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1501
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Salattu viesti"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Salattu viesti"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1854
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkronoidaan \"%s\""
 
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronoi \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2151
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2247
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Siirretään viestejä \"%s\" -> \"%s\""
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Siirrä viestejä kansiosta \"%s\" kansioon \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Siirretään viestejä \"%s\" -> \"%s\""
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr ""
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -4788,82 +4810,82 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:237
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4874,54 +4896,70 @@ msgstr ""
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Poista tämä viesti"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:2045
-msgid "Rebuilding message view"
+#: mail/message-list.c:575
+msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:2047
-msgid "Rebuild message view"
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
+
+#. well, we could scan more children, build up a (more accurate) list, but this should do ok
+#: mail/message-list.c:858 mail/message-list.c:873
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "(tuntematon)"
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
 msgstr ""
 
-#: mail/message-thread.c:585
-msgid "Thread message list"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
 msgstr ""
 
 #: mail/subscribe-dialog.c:139
@@ -4958,38 +4996,38 @@ msgstr ""
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Tämä näyttäisi olevan ensimmäinen kerta kun käytät Evolutionia."
 
-#: shell/e-setup.c:184
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Paina \"OK\" asentaaksesi Evolutionin käyttäjäkohtaiset tiedostot kohteeseen"
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5000,14 +5038,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5015,7 +5053,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5064,45 +5102,40 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:1002 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr ""
-
-#: shell/e-shell-view.c:1006
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5176,64 +5209,65 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:128
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "_Näytä"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr ""
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Ei nimeä)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Ei virhettä"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
-msgid "_View"
-msgstr "_Näytä"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5255,7 +5289,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5263,1115 +5297,1118 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijärjestelmän alustus epäonnistui"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr ""
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Poista kontakti"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Etsi"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Etsi kontakti"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Uusi"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Pysäytä lataaminen"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Näytä kaikki"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Näytä kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "_Uusi kontakti"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Tulosta kontaktit..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Työkalut"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 päivää"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Muuta asetuksia"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Kalenteri"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalenterin asetukset..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Päivä"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Tulosta tämä kalenteri"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Näytä 1 päivä"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Näytä 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Näytä 1 viikko"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Näytä työviikko"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Viikko"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "_Uusi tapaaminen..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "_Avaa"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Tulosta tämä kalenteri"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Tallenna kalenteri _nimellä"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Poista..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Apua"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Lähetä _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Tallenna"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "T_oiminnot"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Sulje tämä tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "Apua"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "_Lähetä"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "Tallenna L_iitteet..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "_Tiedosto..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "_Kirjasin..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "_Uusi tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Etsi uudelleen"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Etsi uude_lleen"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Siirry seuraavaan kohtaan"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Siirry edelliseen kohtaan"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "_Seuraava"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Liitä"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Tulost_usasetukset"
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Tee kumottu toiminto uudelleen"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Korvaa merkkijono"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
 
-#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Etsi uudelleen samaa merkkijonoa"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Etsi merkkijonoa"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Merkitsee kaikki valituksi"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Kumoa edellinen toiminto"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Etsi..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Apua"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "Li_sää"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "L_iitä"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Korvaa..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Työkalupalkit"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Manage Subscriptions..."
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Kuvaus:"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Siirrä"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Viestin tulostuksen esikatselu..."
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Tulosta viesti..."
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Vastaa _Kaikille"
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Vastaa _Lähettäjälle"
 
-#: ui/evolution-mail.xml.h:39 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Muokkaa viestiä"
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:52 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Mail Configuration..."
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Tulosta viesti"
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Tallenna nimellä..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Lähde"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Liitä"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Bold"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "Liitä tiedosto viestiin tekstinä"
 
-#: ui/evolution-message-composer.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Liitä tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ui/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Tallenna nimellä..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Tallenna _kansioon..."
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Lähetä"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Lähetä _myöhemmin"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Lähetä _myöhemmin"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Lähetä viesti HTML-muodossa"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Lähetä viesti myöhemmin"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Lähetä viesti heti"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Lähetä viesti heti"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sets something as bold"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Näytä / piilota liitetiedostot"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Näytä _liitteet"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Näytä liitteet"
 
-#: ui/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "_Liitä tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Avaa..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr ""
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Tapaaminen"
 
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakti"
 
-#: ui/evolution.xml.h:26
-msgid "_Create New Folder..."
-msgstr "_Luo uusi kansio..."
-
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution.xml.h:30
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Asetukset"
 
-#: ui/evolution.xml.h:36
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+msgid "%A, %B %d, %Y"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -6448,13 +6485,6 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr ""
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6464,25 +6494,71 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Nyt"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Nyt"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Ryhmä %i"
+
+#~ msgid "Summary:"
+#~ msgstr "Yhteenveto:"
+
+#~ msgid "Preferences"
+#~ msgstr "Asetukset"
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Evolutionin sähköpostin yhteenvetokomponentin alustus epäonnistui."
+
+#~ msgid "Authentication"
+#~ msgstr "Todentaminen"
+
+#~ msgid "Default"
+#~ msgstr "Oletus"
+
+#~ msgid "Email Address:"
+#~ msgstr "Sähköpostiosoite:"
+
+#~ msgid "Full Name:"
+#~ msgstr "Koko nimi:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "SMTP server requires authentication"
+#~ msgstr "SMTP-palvelin vaati todennuksen"
+
+#~ msgid "Server Type: "
+#~ msgstr "Palvelintyyppi: "
+
+#~ msgid "_New Contact"
+#~ msgstr "_Uusi kontakti"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Uusi tapaaminen..."
+
+#~ msgid "_Open"
+#~ msgstr "_Avaa"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_Luo uusi kansio..."